diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
1255 files changed, 14999 insertions, 8656 deletions
diff --git a/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 2f2a0905d542..76fe58224839 100644 --- a/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.4"; + version = "5.5"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-flrVWsvGAdGVCZ1Ygy9z30w6aU8WAzpMLv+JbP2CKjE="; + sha256 = "sha256-C576lYTQd6mgJPBqFRN3Ty6WYeXcXlDZ5sRtDwOuKSo="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/nixpkgs/pkgs/development/libraries/CoinMP/default.nix b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix index d34b465f135a..25b9ba0fb574 100644 --- a/nixpkgs/pkgs/development/libraries/CoinMP/default.nix +++ b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix index 059ba65b25c4..3a2a048a860e 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix @@ -104,6 +104,11 @@ stdenv.mkDerivation rec { url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch"; sha256 = "1by16firaxyr0hjvn35whsgcmq6bl0nwhnpjf75grjzsw9qvwyia"; }) + (fetchpatch { + name = "CVE-2022-34568.patch"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/d7e00208738a0bc6af302723fe64908ac35b777b.patch"; + sha256 = "sha256-fuxXsqZW94/C8CKu9LakppCU4zHupj66O2MngQ4BO9o="; + }) ]; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index d1086de3718d..f73c5746cb71 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -22,10 +22,14 @@ , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , wayland , wayland-protocols +, wayland-scanner +, drmSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libdrm +, mesa , libxkbcommon , dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , dbus -, udevSupport ? false +, udevSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , udev , ibusSupport ? false , ibus @@ -55,19 +59,36 @@ with lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.20"; + version = "2.0.22"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-xWq6HXtbDn6Znkp2mMcLY6M5T/lwS19uHFfgwW8E3QY="; + sha256 = "sha256-/ny/MSeILj/HJZp1oMtYViAnLFF0XThSq53YeWBpfy4="; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config + patches = [ + # `sdl2-config --cflags` from Nixpkgs returns include path to just SDL2. + # On a normal distro this is enough for includes from all SDL2* packages to work, + # but on NixOS they're spread across different paths. + # This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly. + ./find-headers.patch + ]; + + postPatch = '' + # Fix running wayland-scanner for the build platform when cross-compiling. + # See comment here: https://github.com/libsdl-org/SDL/issues/4860#issuecomment-1119003545 + substituteInPlace configure \ + --replace '$(WAYLAND_SCANNER)' 'wayland-scanner' + ''; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; + nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; @@ -84,7 +105,8 @@ stdenv.mkDerivation rec { ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]; + ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] + ++ optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] ++ dlopenBuildInputs diff --git a/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch new file mode 100644 index 000000000000..4792679deb11 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch @@ -0,0 +1,34 @@ +diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in +index c570511fa..ca694f595 100644 +--- a/sdl2-config.cmake.in ++++ b/sdl2-config.cmake.in +@@ -7,7 +7,8 @@ set(includedir "@includedir@") + set(SDL2_PREFIX "${prefix}") + set(SDL2_EXEC_PREFIX "${exec_prefix}") + set(SDL2_LIBDIR "${libdir}") +-set(SDL2_INCLUDE_DIRS "${includedir}/SDL2") ++set(SDL2_INCLUDE_DIRS "${includedir}/SDL2" $ENV{SDL2_PATH}) ++separate_arguments(SDL2_INCLUDE_DIRS) + set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") + string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) + +diff --git a/sdl2-config.in b/sdl2-config.in +index 5a2aed292..7c55f0a28 100644 +--- a/sdl2-config.in ++++ b/sdl2-config.in +@@ -42,7 +42,11 @@ while test $# -gt 0; do + echo @SDL_VERSION@ + ;; + --cflags) +- echo -I@includedir@/SDL2 @SDL_CFLAGS@ ++ SDL_CFLAGS="" ++ for i in @includedir@/SDL2 $SDL2_PATH; do ++ SDL_CFLAGS="$SDL_CFLAGS -I$i" ++ done ++ echo $SDL_CFLAGS @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) + @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ +-- +2.33.1 + diff --git a/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix b/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix new file mode 100644 index 000000000000..0ec0aa312e83 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, SDL2 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "SDL_audiolib"; + version = "unstable-2022-04-17"; + + src = fetchFromGitHub { + owner = "realnc"; + repo = "SDL_audiolib"; + rev = "908214606387ef8e49aeacf89ce848fb36f694fc"; + sha256 = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + ]; + + cmakeFlags = [ + "-DUSE_RESAMP_SRC=OFF" + "-DUSE_RESAMP_SOXR=OFF" + "-DUSE_DEC_DRFLAC=OFF" + "-DUSE_DEC_OPENMPT=OFF" + "-DUSE_DEC_XMP=OFF" + "-DUSE_DEC_MODPLUG=OFF" + "-DUSE_DEC_MPG123=OFF" + "-DUSE_DEC_SNDFILE=OFF" + "-DUSE_DEC_LIBVORBIS=OFF" + "-DUSE_DEC_LIBOPUSFILE=OFF" + "-DUSE_DEC_MUSEPACK=OFF" + "-DUSE_DEC_FLUIDSYNTH=OFF" + "-DUSE_DEC_BASSMIDI=OFF" + "-DUSE_DEC_WILDMIDI=OFF" + "-DUSE_DEC_ADLMIDI=OFF" + ]; + + meta = with lib; { + description = "Audio decoding, resampling and mixing library for SDL"; + homepage = "https://github.com/realnc/SDL_audiolib"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix b/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix new file mode 100644 index 000000000000..2716b7d2954d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, SDL2 +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, openglSupport ? libGLSupported +, libGL +, libGLU +}: + +let + inherit (lib) optionals makeLibraryPath; + +in +stdenv.mkDerivation rec { + pname = "SDL_compat"; + version = "1.2.52"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "sdl12-compat"; + rev = "release-" + version; + hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + propagatedBuildInputs = [ SDL2 ] + ++ optionals openglSupport [ libGL libGLU ]; + + enableParallelBuilding = true; + + setupHook = ../SDL/setup-hook.sh; + + postFixup = '' + for lib in $out/lib/*.so* ; do + if [[ -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib" + fi + done + ''; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "A cross-platform multimedia library - build SDL 1.2 applications against 2.0"; + homepage = "https://www.libsdl.org/"; + license = licenses.zlib; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix index f5a3d8635531..442d289de791 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/sdlgfx/"; license = licenses.zlib; - maintainers = with maintainers; [ bjg ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/a52dec/default.nix b/nixpkgs/pkgs/development/libraries/a52dec/default.nix index 921e90e3025a..fdb309c634da 100644 --- a/nixpkgs/pkgs/development/libraries/a52dec/default.nix +++ b/nixpkgs/pkgs/development/libraries/a52dec/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "a52dec"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" + # Define inline as __attribute__ ((__always_inline__)) + "ac_cv_c_inline=yes" ]; makeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index efe9640af6fd..4bd7a67871f9 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -10,6 +10,7 @@ , systemd , coreutils , meson +, mesonEmulatorHook , dbus , ninja , python3 @@ -47,7 +48,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - dbus gettext gobject-introspection meson @@ -55,9 +55,14 @@ stdenv.mkDerivation rec { pkg-config python3 vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # meson.build:88:2: ERROR: Can not run test applications in this cross environment. + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection + dbus glib polkit systemd diff --git a/nixpkgs/pkgs/development/libraries/allegro/5.nix b/nixpkgs/pkgs/development/libraries/allegro/5.nix index 380cc1f7198e..6bb1a70b8650 100644 --- a/nixpkgs/pkgs/development/libraries/allegro/5.nix +++ b/nixpkgs/pkgs/development/libraries/allegro/5.nix @@ -9,18 +9,19 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.7.0"; + version = "5.2.8.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0="; + sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ texinfo libXext xorgproto libX11 libXpm libXt libXcursor - alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes diff --git a/nixpkgs/pkgs/development/libraries/allegro/default.nix b/nixpkgs/pkgs/development/libraries/allegro/default.nix index 6abf632806a4..d9c862443653 100644 --- a/nixpkgs/pkgs/development/libraries/allegro/default.nix +++ b/nixpkgs/pkgs/development/libraries/allegro/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { ./encoding.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor - alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL ]; diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 1001dc62673a..cafa505da621 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q1.3"; + version = "2022.Q2.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "UBvHWgC/s00XPn87DAmQ65NszFMoZSXwbrVG064HFng="; + sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aml/default.nix b/nixpkgs/pkgs/development/libraries/aml/default.nix index ef3ba58e7e25..392dae609c0b 100644 --- a/nixpkgs/pkgs/development/libraries/aml/default.nix +++ b/nixpkgs/pkgs/development/libraries/aml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aml"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1m911n3rd41ch4yk3k9k1lz29xp3h54k6jx122abq5kmngy9znqw"; + sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/amtk/default.nix b/nixpkgs/pkgs/development/libraries/amtk/default.nix index 5743a18c0fd0..ab8cbf617412 100644 --- a/nixpkgs/pkgs/development/libraries/amtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amtk/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , gtk3 , meson , ninja , pkg-config , gobject-introspection +, gtk-doc +, docbook-xsl-nons , gnome , dbus , xvfb-run @@ -12,11 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.3.1"; + version = "5.5.1"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm"; + sha256 = "7Ilt0BfiwUNoUuXmCXD80IML0SFI1XzBvcDZOCa925w="; }; nativeBuildInputs = [ @@ -25,6 +30,8 @@ stdenv.mkDerivation rec { pkg-config dbus gobject-introspection + gtk-doc + docbook-xsl-nons ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 9776e85b4350..fed3a94afdb6 100644 --- a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.4"; + version = "5.17.1"; src = fetchurl { - sha256 = "sha256-+OBNioEBQbOGpcnDlgtfAej+c0YfTJmxkeEV1JOEBwE="; + sha256 = "sha256-YX7CUQLMYiUubZsGzElnZq8RbJdSUlW8jEs+de6eAMg="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://activemq.apache.org/"; description = "Messaging and Integration Patterns server written in Java"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix b/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix index c58fb5bc240d..61187581e9aa 100644 --- a/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix +++ b/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "applet-window-buttons"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "psifidotos"; repo = "applet-window-buttons"; rev = version; - sha256 = "18h2g3jqzr88wkmws2iz71sgrz633zwkqvhn32sdi32sxxbrksgd"; + hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix index 9b07697a6a9a..56268146c5db 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -93,14 +93,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software metadata handling library"; - homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and can be consumed by other software. ''; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; license = licenses.lgpl21Plus; + mainProgram = "appstreamcli"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/nixpkgs/pkgs/development/libraries/apr-util/default.nix index 57bf47f3abf1..b9756e0e1a1a 100644 --- a/nixpkgs/pkgs/development/libraries/apr-util/default.nix +++ b/nixpkgs/pkgs/development/libraries/apr-util/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { substituteInPlace $f \ --replace "${expat.dev}/lib" "${expat.out}/lib" \ --replace "${db.dev}/lib" "${db.out}/lib" \ - --replace "${openssl.dev}/lib" "${openssl.out}/lib" + --replace "${openssl.dev}/lib" "${lib.getLib openssl}/lib" done # Give apr1 access to sed for runtime invocations. diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix index 2db69f8028c4..102703107c48 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix @@ -3,14 +3,14 @@ }: let - inherit ((import ./sources.nix).aqbanking) sha256 releaseId version; + inherit ((import ./sources.nix).aqbanking) hash releaseId version; in stdenv.mkDerivation rec { pname = "aqbanking"; inherit version; src = fetchurl { url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; # Set the include dir explicitly, this fixes a build error when building diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 527db0e2c1e6..e6b535ffe4cf 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -11,19 +11,19 @@ }: let - inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version; + inherit ((import ./sources.nix).gwenhywfar) hash releaseId version; in stdenv.mkDerivation rec { pname = "gwenhywfar"; inherit version; src = fetchurl { url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; configureFlags = [ "--with-openssl-includes=${openssl.dev}/include" - "--with-openssl-libs=${openssl.out}/lib" + "--with-openssl-libs=${lib.getLib openssl}/lib" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix index f483f232e37b..9190e1ad9b79 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }: let - inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; + inherit ((import ./sources.nix).libchipcard) hash releaseId version; in stdenv.mkDerivation rec { pname = "libchipcard"; inherit version; src = fetchurl { url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; @@ -17,8 +17,6 @@ in stdenv.mkDerivation rec { makeFlags = [ "crypttokenplugindir=$(out)/lib/gwenhywfar/plugins/ct" ]; - configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ]; - meta = with lib; { description = "Library for access to chipcards"; homepage = "https://www.aquamaniac.de/rdm/projects/libchipcard"; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix b/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix index 60f61324e650..2adea166da55 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix @@ -1,11 +1,22 @@ { - gwenhywfar.version = "5.6.0"; - gwenhywfar.sha256 = "1isbj4a7vdgagp3kkvx2pjcjy8lba6kzjr11fmr06aci1694dbsp"; - gwenhywfar.releaseId = "364"; - libchipcard.version = "5.0.4"; - libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; - libchipcard.releaseId = "158"; - aqbanking.version = "6.3.0"; - aqbanking.sha256 = "1k2mhdnk0jc0inq1hmp74m3y7azxrjm8r07x5k1pp4ic0yi5vs50"; - aqbanking.releaseId = "372"; + # https://www.aquamaniac.de/rdm/projects/gwenhywfar/files + gwenhywfar = { + version = "5.9.0"; + hash = "sha256-6Ix9M4Ojy75Gyzsimfcd+55vpWX1oWaLQpc5HIdLDhI="; + releaseId = "415"; + }; + + # https://www.aquamaniac.de/rdm/projects/libchipcard/files + libchipcard = { + version = "5.1.6"; + hash = "sha256-bAf1J0F/dWIHT5kBLaTRHrTbr9M/SeZrRCzNbjuM/SA="; + releaseId = "382"; + }; + + # https://www.aquamaniac.de/rdm/projects/aqbanking/files + aqbanking = { + version = "6.5.0"; + hash = "sha256-TS076ghulq2ntoGSBtTrQWjOt+Mtzppo3Gxuq8yetj4="; + releaseId = "435"; + }; } diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix index 67e621ad8597..dd7691762567 100644 --- a/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -1,90 +1,76 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool -, audit, glib, libusb1, libxml2 +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gi-docgen +, glib +, libxml2 +, gobject-introspection + +, enableGstPlugin ? true +, enableViewer ? true +, gst_all_1 +, gtk3 , wrapGAppsHook -, gstreamer ? null -, gst-plugins-base ? null -, gst-plugins-good ? null -, gst-plugins-bad ? null -, libnotify ? null -, gnome ? null -, gtk3 ? null + , enableUsb ? true +, libusb1 + , enablePacketSocket ? true -, enableViewer ? true -, enableGstPlugin ? true -, enableCppTest ? false , enableFastHeartbeat ? false -, enableAsan ? false }: -let - gstreamerAtLeastVersion1 = - lib.all - (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0") - [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; -in - assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; - assert enableViewer -> enableGstPlugin; - assert enableViewer -> libnotify != null; - assert enableViewer -> gnome != null; - assert enableViewer -> gtk3 != null; - assert enableViewer -> gstreamerAtLeastVersion1; - - stdenv.mkDerivation rec { - - pname = "aravis"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "AravisProject"; - repo = pname; - rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "18fnliks661kzc3g8v08hcaj18hjid8b180d6s9gwn0zgv4g374w"; - }; - - outputs = [ "bin" "dev" "out" "lib" ]; +assert enableGstPlugin -> gst_all_1 != null; +assert enableViewer -> enableGstPlugin; +assert enableViewer -> gtk3 != null; +assert enableViewer -> wrapGAppsHook != null; - nativeBuildInputs = [ - autoreconfHook - pkg-config - intltool - gtk-doc - ] ++ lib.optional enableViewer wrapGAppsHook; +stdenv.mkDerivation rec { + pname = "aravis"; + version = "0.8.22"; - buildInputs = - [ glib libxml2 ] - ++ lib.optional enableUsb libusb1 - ++ lib.optional enablePacketSocket audit - ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome.adwaita-icon-theme ]; + src = fetchFromGitHub { + owner = "AravisProject"; + repo = pname; + rev = version; + sha256 = "sha256-S9DmXjywxNr5Rpx605zip76vGKBSrUwyerqXlBm05VI="; + }; - preAutoreconf = "./autogen.sh"; + outputs = [ "bin" "dev" "out" "lib" ]; - configureFlags = - lib.optional enableUsb "--enable-usb" - ++ lib.optional enablePacketSocket "--enable-packet-socket" - ++ lib.optional enableViewer "--enable-viewer" - ++ lib.optional enableGstPlugin - (if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin") - ++ lib.optional enableCppTest "--enable-cpp-test" - ++ lib.optional enableFastHeartbeat "--enable-fast-heartbeat" - ++ lib.optional enableAsan "--enable-asan"; + nativeBuildInputs = [ + meson + ninja + pkg-config + gi-docgen + ] ++ lib.optional enableViewer wrapGAppsHook; - postPatch = '' - ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . - ''; + buildInputs = + [ glib libxml2 gobject-introspection ] + ++ lib.optional enableUsb libusb1 + ++ lib.optionals (enableViewer || enableGstPlugin) (with gst_all_1; [ gstreamer gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad ]) + ++ lib.optionals (enableViewer) [ gtk3 ]; - doCheck = true; + mesonFlags = [ + ] ++ lib.optional enableFastHeartbeat "-Dfast-heartbeat=enabled" + ++ lib.optional (!enableGstPlugin) "-Dgst-plugin=disabled" + ++ lib.optional (!enableViewer) "-Dviewer=disabled" + ++ lib.optional (!enableUsb) "-Dviewer=disabled" + ++ lib.optional (!enablePacketSocket) "-Dpacket-socket=disabled"; - meta = { - description = "Library for video acquisition using GenICam cameras"; - longDescription = '' - Implements the gigabit ethernet and USB3 protocols used by industrial cameras. - ''; - homepage = "https://aravisproject.github.io/docs/aravis-0.5"; - license = lib.licenses.lgpl2; - maintainers = []; - platforms = lib.platforms.unix; - }; - } + doCheck = true; + meta = { + description = "Library for video acquisition using GenICam cameras"; + longDescription = '' + Implements the gigabit ethernet and USB3 protocols used by industrial cameras. + ''; + # the documentation is the best working homepage that's not the Github repo + homepage = "https://aravisproject.github.io/docs/aravis-0.8"; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ tpw_rules ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/arb/default.nix b/nixpkgs/pkgs/development/libraries/arb/default.nix index dc160c37ad23..2ab8339b00a7 100644 --- a/nixpkgs/pkgs/development/libraries/arb/default.nix +++ b/nixpkgs/pkgs/development/libraries/arb/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "arb"; - version = "2.22.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "sha256-Xd3dy7zr4i3pULLFOYtedpS5Yj9Ljwyu6r4kfhRynmE="; + sha256 = "sha256-dt9PZ3Xfn60rhmnxYo7CEzNTEUN/wMVAXe8U5PzUO9U="; }; buildInputs = [ mpir gmp mpfr flint ]; diff --git a/nixpkgs/pkgs/development/libraries/argagg/0001-catch.diff b/nixpkgs/pkgs/development/libraries/argagg/0001-catch.diff new file mode 100644 index 000000000000..f99649d56812 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/argagg/0001-catch.diff @@ -0,0 +1,20 @@ +--- old/test/doctest.h 2019-03-05 18:04:06.143740733 +0300 ++++ new/test/doctest.h 2019-03-05 18:04:43.577284916 +0300 +@@ -1307,7 +1307,7 @@ + __FILE__, __LINE__, #expr, #as); \ + try { \ + expr; \ +- } catch(as) { \ ++ } catch(as e) { \ + _DOCTEST_RB.m_threw = true; \ + _DOCTEST_RB.m_threw_as = true; \ + } catch(...) { _DOCTEST_RB.m_threw = true; } \ +@@ -1332,7 +1332,7 @@ + #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS) + + #define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS) +-#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS) ++#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS) + #define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS) + + #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW) diff --git a/nixpkgs/pkgs/development/libraries/argagg/default.nix b/nixpkgs/pkgs/development/libraries/argagg/default.nix new file mode 100644 index 000000000000..7ff9eaac1e3e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/argagg/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "argagg"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "vietjtnguyen"; + repo = pname; + rev = version; + hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o="; + }; + + patches = [ + # Fix compilation of macro catch statement + ./0001-catch.diff + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + homepage = "https://github.com/vietjtnguyen/argagg"; + description = "Argument Aggregator"; + longDescription = '' + argagg is yet another C++ command line argument/option parser. It was + written as a simple and idiomatic alternative to other frameworks like + getopt, Boost program options, TCLAP, and others. The goal is to achieve + the majority of argument parsing needs in a simple manner with an easy to + use API. It operates as a single pass over all arguments, recognizing + flags prefixed by - (short) or -- (long) and aggregating them into easy to + access structures with lots of convenience functions. It defers processing + types until you access them, so the result structures end up just being + pointers into the original command line argument C-strings. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + badPlatforms = [ "aarch64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/argparse/default.nix b/nixpkgs/pkgs/development/libraries/argparse/default.nix new file mode 100644 index 000000000000..ac195e909c67 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/argparse/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "argparse"; + version = "2.6"; + + src = fetchFromGitHub { + owner = "p-ranav"; + repo = "argparse"; + rev = "v${version}"; + sha256 = "sha256-imLDuVbzkiE5hcQVarZGeNzNZE0/8LHMQqAiUYzPVks="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Argument Parser for Modern C++"; + homepage = "https://github.com/p-ranav/argparse"; + maintainers = with maintainers; [ _2gn ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/aribb25/default.nix b/nixpkgs/pkgs/development/libraries/aribb25/default.nix index 3e171d757973..743850c5fdc3 100644 --- a/nixpkgs/pkgs/development/libraries/aribb25/default.nix +++ b/nixpkgs/pkgs/development/libraries/aribb25/default.nix @@ -48,10 +48,11 @@ stdenv.mkDerivation rec { lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; meta = with lib; { - homepage = "https://code.videolan.org/videolan/aribb25"; description = "Sample implementation of the ARIB STD-B25 standard"; - platforms = platforms.all; + homepage = "https://code.videolan.org/videolan/aribb25"; license = licenses.isc; maintainers = with maintainers; [ midchildan ]; + mainProgram = "b25"; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 14400f8ebf95..6277ec4f87e3 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.8.2"; + version = "11.2.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-if3YmL9r/3X278OjAYF+Tt51K5qAkn+wfuNYsT41OSI="; + sha256 = "sha256-TC6XzmBwf8HzSPRPevDLbSRm0KrQ0OpL9dXcGA5sukE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arpa2common/default.nix b/nixpkgs/pkgs/development/libraries/arpa2common/default.nix index 7fcb2a945e8f..0ada354ce1e6 100644 --- a/nixpkgs/pkgs/development/libraries/arpa2common/default.nix +++ b/nixpkgs/pkgs/development/libraries/arpa2common/default.nix @@ -6,6 +6,7 @@ , arpa2cm , doxygen , e2fsprogs +, graphviz , lmdb , openssl , pkg-config @@ -14,19 +15,20 @@ stdenv.mkDerivation rec { pname = "arpa2common"; - version = "2.2.14"; + version = "2.2.18"; src = fetchFromGitLab { owner = "arpa2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LWsWoHRdLWRSF9JaEwrw+CXm5Azgh7zNeq0a8Z/hijQ="; + sha256 = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; }; nativeBuildInputs = [ cmake arpa2cm doxygen + graphviz pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 806df81a7080..d3b736fbe0f0 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -18,7 +18,7 @@ , google-cloud-cpp , grpc , gtest -, jemalloc +, libbacktrace , lz4 , minio , ninja @@ -55,46 +55,58 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "634739c664433cec366b4b9a81d1e1044a8c5eda"; - hash = "sha256-r1WVgJJsI7v485L6Qb+5i7kFO4Tvxyk1T0JBb4og6pg="; + rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; + hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "acd375eb86a81cd856476fca0f52ba6036a067ff"; - hash = "sha256-z/kmi+4dBO/dsVkJA4NgUoxl0pXi8RWIGvI8MGu/gcc="; + rev = "aafd3fc9df431c2625a514fb46626e5614f1d199"; + hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "7.0.0"; + version = "9.0.0"; src = fetchurl { - url = - "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-6PSbFJoV7O9OQPz6sbh8ETxrHuGGAFwWnlzfldMamd4="; + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + hash = "sha256-qaAz8KNJAomZj0WGgNGVec8HkRcXumWv3my4AHD3qbU="; }; sourceRoot = "apache-arrow-${version}/cpp"; - ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = jemalloc.src; + # versions are all taken from + # https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt + # jemalloc: arrow uses a custom prefix to prevent default allocator symbol + # collisions as well as custom build flags + ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = fetchurl { + url = "https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2"; + hash = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo="; + }; + + # mimalloc: arrow uses custom build flags for mimalloc ARROW_MIMALLOC_URL = fetchFromGitHub { - # From - # ./cpp/cmake_modules/ThirdpartyToolchain.cmake - # ./cpp/thirdparty/versions.txt owner = "microsoft"; repo = "mimalloc"; - rev = "v1.7.3"; - hash = "sha256-Ca877VitpWyKmZNHavqgewk/P+tyd2xHDNVqveKh87M="; + rev = "v2.0.6"; + hash = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc="; }; ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "aeec9c872c8b475dedd7781336710f2dd2666cb2"; - hash = "sha256-vWKdJkieKhaxyAJhijXUmD7NmNvMWd79PskQojulA1w="; + rev = "8.1.0"; + hash = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk="; + }; + + ARROW_SUBSTRAIT_URL = fetchFromGitHub { + owner = "substrait-io"; + repo = "substrait"; + rev = "v0.6.0"; + hash = "sha256-hxCBomL4Qg9cHLRg9ZiO9k+JVOZXn6f4ikPtK+V9tno="; }; patches = [ @@ -115,7 +127,10 @@ stdenv.mkDerivation rec { gflags glog gtest + libbacktrace lz4 + nlohmann_json # alternative JSON parser to rapidjson + protobuf # substrait requires protobuf rapidjson re2 snappy @@ -146,13 +161,15 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" "-DARROW_BUILD_TESTS=ON" + "-DARROW_BUILD_INTEGRATION=ON" + "-DARROW_BUILD_UTILITIES=ON" + "-DARROW_EXTRA_ERROR_CONTEXT=ON" "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent) + "-Dxsimd_SOURCE=AUTO" "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" @@ -168,8 +185,10 @@ stdenv.mkDerivation rec { # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" "-DARROW_USE_GLOG=ON" + "-DARROW_WITH_BACKTRACE=ON" "-DARROW_WITH_BROTLI=ON" "-DARROW_WITH_LZ4=ON" + "-DARROW_WITH_NLOHMANN_JSON=ON" "-DARROW_WITH_SNAPPY=ON" "-DARROW_WITH_UTF8PROC=ON" "-DARROW_WITH_ZLIB=ON" @@ -177,14 +196,15 @@ stdenv.mkDerivation rec { "-DARROW_MIMALLOC=ON" # Parquet options: "-DARROW_PARQUET=ON" + "-DARROW_SUBSTRAIT=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" + "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"; @@ -210,6 +230,7 @@ stdenv.mkDerivation rec { ]; in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; + __darwinAllowLocalNetworking = true; installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; installCheckPhase = let @@ -231,7 +252,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-language development platform for in-memory data"; - homepage = "https://arrow.apache.org/"; + homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; diff --git a/nixpkgs/pkgs/development/libraries/arrow-glib/default.nix b/nixpkgs/pkgs/development/libraries/arrow-glib/default.nix new file mode 100644 index 000000000000..9c396f89d11c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/arrow-glib/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, arrow-cpp +, fetchurl +, glib +, gobject-introspection +, lib +, meson +, ninja +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "arrow-glib"; + inherit (arrow-cpp) src version; + sourceRoot = "apache-arrow-${version}/c_glib"; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + arrow-cpp + glib + gobject-introspection + ]; + + meta = with lib; { + inherit (arrow-cpp.meta) license platforms; + description = "GLib bindings for Apache Arrow"; + homepage = "https://arrow.apache.org/docs/c_glib/"; + maintainers = with maintainers; [ amarshall ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/aspell/default.nix b/nixpkgs/pkgs/development/libraries/aspell/default.nix index 777bad1e5a53..b839092228b3 100644 --- a/nixpkgs/pkgs/development/libraries/aspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl +{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl, ncurses + + # for tests +, aspell, glibc, runCommand + , searchNixProfiles ? true }: @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ perl ]; - buildInputs = [ perl ]; + buildInputs = [ ncurses perl ]; doCheck = true; @@ -55,6 +59,19 @@ stdenv.mkDerivation rec { cp ${devaMapsSource}/u-deva.{cmap,cset} $out/lib/aspell/ ''; + passthru.tests = { + uses-curses = runCommand "${pname}-curses" { + buildInputs = [ glibc ]; + } '' + if ! ldd ${aspell}/bin/aspell | grep -q ${ncurses} + then + echo "Test failure: It does not look like aspell picked up the curses dependency." + exit 1 + fi + touch $out + ''; + }; + meta = { description = "Spell checker for many languages"; homepage = "http://aspell.net/"; diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 675c930d9edd..606ff2b34041 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.44.0"; + version = "2.44.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "fu488oWwiQYP1rblGz6yys91LMo6CCx/TCxauEHlE1M="; + sha256 = "S+sjJwumz3yvILWXNU11GU2Jr7adLvzxX0JxaIum90Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/atk/default.nix b/nixpkgs/pkgs/development/libraries/atk/default.nix index 08e6e5b0e41b..268bf43eb3e8 100644 --- a/nixpkgs/pkgs/development/libraries/atk/default.nix +++ b/nixpkgs/pkgs/development/libraries/atk/default.nix @@ -1,38 +1,49 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib -, fixDarwinDylibNames, gobject-introspection, gnome +{ stdenv +, lib +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, glib +, fixDarwinDylibNames +, gobject-introspection +, gnome }: -let +stdenv.mkDerivation rec { pname = "atk"; - version = "2.36.0"; -in + version = "2.38.0"; -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY="; }; - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - propagatedBuildInputs = [ - # Required by atk.pc - glib - ]; - patches = [ # meson builds an incorrect .pc file # glib should be Requires not Requires.private ./fix_pc.patch ]; - mesonFlags = [ - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + glib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; + + buildInputs = [ gobject-introspection ]; + + propagatedBuildInputs = [ + # Required by atk.pc + glib ]; doCheck = true; @@ -55,7 +66,7 @@ stdenv.mkDerivation rec { control running applications. ''; - homepage = "http://library.gnome.org/devel/atk/"; + homepage = "https://gitlab.gnome.org/GNOME/atk"; license = lib.licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix b/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix index 6b22c34e0c2f..f03421619733 100644 --- a/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix +++ b/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.36.1"; + version = "2.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4RMkv+0bbjMKAtslzswUXcoD+w3/R/BxDIXjF2h9pFg="; + sha256 = "sha256-b2LdmfdGmF5XNgWTdXfM/JRDaPYGpxykY0LXDhza4Hk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/atkmm/default.nix b/nixpkgs/pkgs/development/libraries/atkmm/default.nix index 7e3cecf12a92..d26611f45073 100644 --- a/nixpkgs/pkgs/development/libraries/atkmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/atkmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.28.2"; + version = "2.28.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oLtJdlzszCk6ssZzW6EAQxgH04T/oUwuvTDgeZP9L6Q="; + sha256 = "sha256-fCCItIapCb6NorGDBOVsX5CITRNDyNpzZ+pc0yWLmWk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix b/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix index cb34f24ced8d..65e4d0fb15ee 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; }; - # needed for finding libkeyfinder.so to link it into keyfinder-tests executable - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ fftw ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/nixpkgs/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix new file mode 100644 index 000000000000..8d5ef86a8967 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, libopenmpt +}: + +stdenv.mkDerivation rec { + pname = "libopenmpt-modplug"; + version = "0.8.9.0-openmpt1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz"; + sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libopenmpt + ]; + + configureFlags = [ + "--enable-libmodplug" + ]; + + meta = with lib; { + description = "A libmodplug emulation layer based on libopenmpt"; + homepage = "https://lib.openmpt.org/libopenmpt/"; + license = licenses.bsd3; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix new file mode 100644 index 000000000000..bd383ffe39c4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -0,0 +1,66 @@ +{ config +, lib +, stdenv +, fetchurl +, zlib +, pkg-config +, mpg123 +, libogg +, libvorbis +, portaudio +, libsndfile +, flac +, usePulseAudio ? config.pulseaudio or stdenv.isLinux +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "libopenmpt"; + version = "0.6.4"; + + outputs = [ "out" "dev" "bin" ]; + + src = fetchurl { + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; + sha256 = "4J+4RcMpJwCnrBPDsx1mns072+vL/hMo66I3bOvkAWI="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + zlib + mpg123 + libogg + libvorbis + portaudio + libsndfile + flac + ] ++ lib.optional usePulseAudio libpulseaudio; + + configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; + + doCheck = true; + + postFixup = '' + moveToOutput share/doc $dev + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Cross-platform C++ and C library to decode tracked music files into a raw PCM audio stream"; + longDescription = '' + libopenmpt is a cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream. + openmpt123 is a cross-platform command-line or terminal based module file player. + libopenmpt is based on the player code of the OpenMPT project. + ''; + homepage = "https://lib.openmpt.org/libopenmpt/"; + license = licenses.bsd3; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/update.sh b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/update.sh new file mode 100755 index 000000000000..2d4e5afac0b7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl xmlstarlet + +attr=libopenmpt + +set -eu -o pipefail + +# Get update notifications, remove updates for libopenmpt-modplug, find latest eligible & extract versions +versions="$( + curl -s 'https://lib.openmpt.org/libopenmpt/feed.xml' | + xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | + grep -v 'libopenmpt-modplug' | head -n1 | + grep -Eo '([0-9][^,\s]+)' | tr '\n' ' ' +)" +echo "Latest $attr versions: $versions" + +# Find a version that is > current version and not a rc +# rc's have different download path and a full release will usually follow shortly +currentVersion="$(nix-instantiate --eval -E "with import ./. {}; $attr.version" | tr -d '"')" +echo "Current $attr version: $currentVersion" +for version in $versions; do + (echo "$version" | grep -q 'rc') && continue + [ "$version" = "$(printf '%s\n%s' "$version" "$currentVersion" | sort -V | head -n1)" ] && continue + + echo "Updating to $version. Please check if other versions qualify for backport to stable!" + update-source-version "$attr" "$version" + exit 0 +done + +echo "No version eligible for bump." +exit 0 diff --git a/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix index b3e3a34973c0..6737d76538e0 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; + mainProgram = "smfsh"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix b/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix new file mode 100644 index 000000000000..b1065561e1c6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat}: + +stdenv.mkDerivation rec { + pname = "libspecbleach"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "lucianodato"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + fftwFloat + ]; + + meta = with lib; { + description = "C library for audio noise reduction"; + homepage = "https://github.com/lucianodato/libspecbleach"; + license = licenses.lgpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index a29fda0ec2b2..14b0d4c5e46f 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; + dontAddWafCrossFlags = true; passthru.tests = { inherit pipewire; diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix index d0ef2e65c598..6371a52b4dff 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook + python3 ]; buildInputs = [ @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; + dontAddWafCrossFlags = true; passthru.tests = { inherit pipewire; diff --git a/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix b/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix index dc01027c4693..dccb738a30f4 100644 --- a/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - ''; meta = with lib; { description = "P25 Phase 1 and ProVoice vocoder"; diff --git a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix index 1a40d249fd5e..67a66dbfe5a2 100644 --- a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ lv2 serd sord ]; + dontAddWafCrossFlags = true; meta = with lib; { homepage = "http://drobilla.net/software/sratom"; diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 3a1118c0d81b..3d5d973eec55 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-vYyfNg37VB+2DkinE7rx4i1BssdMGaD+ny005y9Q8cU="; + sha256 = "sha256-zyAKaO22She1e/+zPjiwSHeCctGLVYnT0vWgHODzSwc="; }; buildInputs = [ alsa-lib ]; diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index a52d1be566e6..e24217434557 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -1,24 +1,28 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages -, expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent +{ fetchurl +, fetchpatch +, lib +, stdenv +, pkg-config +, libdaemon +, dbus +, perlPackages +, expat +, gettext +, glib +, libiconv +, libevent , nixosTests -, gtk3Support ? false, gtk3 ? null -, qt4 ? null -, qt4Support ? false +, gtk3Support ? false +, gtk3 ? null , qt5 ? null , qt5Support ? false , withLibdnssdCompat ? false , python ? null -, withPython ? false }: - -assert qt4Support -> qt4 != null; - -let - # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it - pkg-config-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; -in +, withPython ? false +}: stdenv.mkDerivation rec { - name = "avahi${lib.optionalString withLibdnssdCompat "-compat"}-${version}"; + pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}"; version = "0.8"; src = fetchurl { @@ -26,41 +30,72 @@ stdenv.mkDerivation rec { sha256 = "1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6"; }; - prePatch = '' - substituteInPlace configure \ - --replace pkg-config "$PKG_CONFIG" - ''; - patches = [ - ./no-mkdir-localstatedir.patch + (fetchpatch { + url = "https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c.patch"; + sha256 = "sha256-BXWmrLWUvDxKPoIPRFBpMS3T4gijRw0J+rndp6iDybU="; + }) ]; - buildInputs = [ libdaemon dbus glib expat libiconv libevent ] - ++ (with perlPackages; [ perl XMLParser ]) - ++ (lib.optional gtk3Support gtk3) - ++ (lib.optional qt4Support qt4) - ++ (lib.optional qt5Support qt5); + depsBuildBuild = [ + pkg-config + ]; - propagatedBuildInputs = - lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); + nativeBuildInputs = [ + pkg-config + gettext + glib + ]; - nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ]; + buildInputs = [ + libdaemon + dbus + glib + expat + libiconv + libevent + ] ++ (with perlPackages; [ + perl + XMLParser + ]) ++ lib.optionals gtk3Support [ + gtk3 + ] ++ lib.optionals qt5Support [ + qt5 + ]; - configureFlags = - [ "--disable-qt3" "--disable-gdbm" "--disable-mono" - "--disable-gtk" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - (lib.enableFeature gtk3Support "gtk3") - "--${if qt4Support then "enable" else "disable"}-qt4" - "--${if qt5Support then "enable" else "disable"}-qt5" - (lib.enableFeature withPython "python") - "--localstatedir=/var" "--with-distro=none" - # A systemd unit is provided by the avahi-daemon NixOS module - "--with-systemdsystemunitdir=no" ] - ++ lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" + propagatedBuildInputs = lib.optionals withPython (with python.pkgs; [ + python + pygobject3 + dbus-python + ]); + + configureFlags = [ + "--disable-gdbm" + "--disable-mono" + # Use non-deprecated path https://github.com/lathiat/avahi/pull/376 + "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" + (lib.enableFeature gtk3Support "gtk3") + (lib.enableFeature qt5Support "qt5") + (lib.enableFeature withPython "python") + "--localstatedir=/var" + "--runstatedir=/run" + "--sysconfdir=/etc" + "--with-distro=none" + # A systemd unit is provided by the avahi-daemon NixOS module + "--with-systemdsystemunitdir=no" + ] ++ lib.optionals withLibdnssdCompat [ + "--enable-compat-libdns_sd" + ] ++ lib.optionals stdenv.isDarwin [ # autoipd won't build on darwin - ++ lib.optional stdenv.isDarwin "--disable-autoipd"; + "--disable-autoipd" + ]; - NIX_CFLAGS_COMPILE = "-DAVAHI_SERVICE_DIR=\"/etc/avahi/services\""; + installFlags = [ + # Override directories to install into the package. + # Replace with runstatedir once is merged https://github.com/lathiat/avahi/pull/377 + "avahi_runtime_dir=${placeholder "out"}/run" + "sysconfdir=${placeholder "out"}/etc" + ]; preBuild = lib.optionalString stdenv.isDarwin '' sed -i '20 i\ @@ -69,14 +104,10 @@ stdenv.mkDerivation rec { ''; postInstall = - # Maintain compat for mdnsresponder and howl + # Maintain compat for mdnsresponder lib.optionalString withLibdnssdCompat '' ln -s avahi-compat-libdns_sd/dns_sd.h "$out/include/dns_sd.h" ''; - /* # these don't exist (anymore?) - ln -s avahi-compat-howl $out/include/howl - ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc - */ passthru.tests = { smoke-test = nixosTests.avahi; @@ -85,9 +116,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "mDNS/DNS-SD implementation"; - homepage = "http://avahi.org"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; + homepage = "http://avahi.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ lovek323 globin ]; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/nixpkgs/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch deleted file mode 100644 index 72965c9f0282..000000000000 --- a/nixpkgs/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch +++ /dev/null @@ -1,12 +0,0 @@ -Don't "mkdir $(localstatedir)" since we can't do it (/var). - ---- a/avahi-daemon/Makefile.in -+++ b/avahi-daemon/Makefile.in -@@ -1625,7 +1625,6 @@ xmllint: - done - - install-data-local: -- test -z "$(avahi_runtime_dir)" || $(MKDIR_P) "$(DESTDIR)$(avahi_runtime_dir)" - - update-systemd: - curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c diff --git a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix index 743740fddb0d..8def8041ced9 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - sha256 = "1qv2wxh5q2iq48m5g3xci9p05znzcl0v3314bhcsyr5bkpdjvzs1"; + sha256 = "sha256-73DKihz+7XAX3LLA7VkTdN6rFhuGvmyksxK8JMranFY="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/nixpkgs/pkgs/development/libraries/avro-c/default.nix index 76d5839402cf..02ed9af632f6 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: +{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, snappy, xz, zlib }: stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-BlJZClStjkqliiuf8fTOcaZKQbCgXEUp0cUYxh52BkM="; + sha256 = "sha256-EliMTjED5/RKHgWrWD8d0Era9qEKov1z4cz1kEVTX5I="; }; postPatch = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ jansson zlib ]; + buildInputs = [ jansson snappy xz zlib ]; meta = with lib; { description = "A C library which implements parts of the Avro Specification"; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix index b6fcb11c3158..2c70c3e8acba 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.11"; + version = "0.6.13"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs="; + sha256 = "sha256-f1STZdxj8cdK60dCgl2Xfsqaa/x3Z1xEjH3p4GUwGUg="; }; nativeBuildInputs = [ @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index e7f0c0854dbb..40e8a5eb54c5 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.14"; + version = "0.5.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts="; + sha256 = "sha256-peaoTv2TLqtHScfnCPMNbE6fhUTKfRe1ZzuBsr/rpz0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index ab52fa5aa746..b20371f5dd29 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -7,20 +7,19 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.19"; + version = "0.7.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI="; + sha256 = "sha256-DKorZUVUDEP4IRPchzaW35fPLmYoJRcfLMdPHrBrol8="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix index 9d885278ff06..5d13c0653b22 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix index a25231ee8831..86ab4f4230e6 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.10"; + version = "0.6.15"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-R+teEKSQjSFYt3+XXvooAy4GJwN4yzEhJtiuknBZIgU="; + sha256 = "sha256-WIKWF8G+fdX9MD6vQctM+5pDnR0/0TenabWE4PRteq8="; }; nativeBuildInputs = [ @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index f19a69fc4573..0a9bb5543735 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.19"; + version = "0.11.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc="; + sha256 = "sha256-LIrAA3+Yd0lhCMQ9R4HT/ZFKm3y9iSm3h5vcn0ghiPA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix index 11ba67fe6f5a..6700b4e6a13e 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix index 2868e6b80b86..881bec9c2805 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix @@ -6,19 +6,20 @@ , aws-c-compression , aws-c-http , aws-c-io +, aws-checksums , cmake , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.33"; + version = "0.1.39"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o="; + sha256 = "sha256-UbYh3awI7Y3mJnVQrltU+rZ1TI1TDaMF5TOcvxbzNa8="; }; nativeBuildInputs = [ @@ -32,11 +33,11 @@ stdenv.mkDerivation rec { aws-c-compression aws-c-http aws-c-io + aws-checksums s2n-tls ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; @@ -44,7 +45,8 @@ stdenv.mkDerivation rec { description = "C99 library implementation for communicating with the S3 service"; homepage = "https://github.com/awslabs/aws-c-s3"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ r-burns ]; + mainProgram = "s3"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix index f5b5dfaeebc9..919b3229d7ea 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-jYeyNEoJsF67XQAkmC7oegnIRBRD3FXKf5wF/NCVb4o="; + sha256 = "sha256-G+ykP39EmI8BCeulTsZ/OSFKRzXVbEK0+mtJ3tugl5M="; }; nativeBuildInputs = [ @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix index 391ecc26fb86..28bb15f2a745 100644 --- a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , aws-c-auth , aws-c-cal , aws-c-common @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.16"; + version = "0.17.28"; outputs = [ "out" "dev" ]; @@ -24,13 +25,22 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c="; + sha256 = "sha256-4/BgwX8Pa5D2lEn0Dh3JlUiYUtA9u0rWpBixqmv1X/A="; }; patches = [ # Correct include path for split outputs. # https://github.com/awslabs/aws-crt-cpp/pull/325 ./0001-build-Make-includedir-properly-overrideable.patch + + # Fix build with new input stream api + # https://github.com/awslabs/aws-crt-cpp/pull/341 + # Remove with next release + (fetchpatch { + url = "https://github.com/awslabs/aws-crt-cpp/commit/8adb8490fd4f1d1fe65aad01b0a7dda0e52ac596.patch"; + excludes = [ "crt/*" ]; + sha256 = "190v8rlj6z0qllih6w3kqmdvqjifj66hc4bchsgr3gpfv18vpzid"; + }) ]; postPatch = '' @@ -57,7 +67,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DEPS=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 769cc2d3bd29..889c03676c10 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, s2n-tls, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, curl +, openssl +, s2n-tls +, zlib , aws-crt-cpp -, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums -, CoreAudio, AudioToolbox +, aws-c-cal +, aws-c-common +, aws-c-event-stream +, aws-c-io +, aws-checksums +, CoreAudio +, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -18,16 +31,33 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.9.150"; + version = if stdenv.system == "i686-linux" then "1.9.150" + else "1.9.238"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="; + sha256 = if version == "1.9.150" then "fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY=" + else "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; }; postPatch = '' + # Missing includes for GCC11 + sed '5i#include <thread>' -i \ + aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \ + aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \ + aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \ + aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \ + aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \ + aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \ + aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \ + aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \ + aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \ + aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \ + aws-cpp-sdk-transfer-tests/TransferTests.cpp # Flaky on Hydra rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp # Includes aws-c-auth private headers, so only works with submodule build @@ -55,7 +85,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DEPS=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DENABLE_TESTING=OFF" @@ -82,13 +111,12 @@ stdenv.mkDerivation rec { patches = [ ./cmake-dirs.patch - - # fix cmake config - (fetchpatch { - url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff"; - sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0="; - }) - ]; + ] + ++ lib.optional (lib.versionOlder version "1.9.163") + (fetchpatch { + url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff"; + sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0="; + }); # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index 7a3c8bc727be..3d396a0b2855 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -12,21 +11,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.90"; + version = "0.1.92"; outputs = [ "out" "dev" ]; - patches = [ - # Fix darwin build - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/babl/-/commit/33b18e74c9589fd4d5507ab88bd1fb19c15965dd.patch"; - sha256 = "bEjjOjHGTF55o1z31G9GNDqERxn/7vUuWZQYHosSEBQ="; - }) - ]; - src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bi67Y283WBWI49AkmbPS9p+axz40omL0KRHX9ZBqkkM="; + sha256 = "sha256-9mdzUCiUS2N1rRjxYKZM65P1x9zKqdh1HeNZd3SIosE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix index 03f49c3ee504..125e3799f572 100644 --- a/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "backward"; - version = "1.3"; + version = "1.6"; src = fetchFromGitHub { owner = "bombela"; repo = "backward-cpp"; rev = "v${version}"; - sha256 = "1nx77qamal53rq8qxsjzax6ljawb345a1v3cqmfwa0hx26srxcln"; + sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix b/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix index fe8f63c685c4..fcdf5619047b 100644 --- a/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix +++ b/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix @@ -1,6 +1,6 @@ { stdenvNoCC, lib, fetchFromGitHub, bats }: -let version = "0.4.1"; +let version = "0.5.0"; in stdenvNoCC.mkDerivation { pname = "bash-preexec"; inherit version; @@ -9,7 +9,7 @@ in stdenvNoCC.mkDerivation { owner = "rcaloras"; repo = "bash-preexec"; rev = version; - sha256 = "062iigps285628p710i7vh7kmgra5gahq9qiwj7rxir167lg0ggw"; + sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs="; }; checkInputs = [ bats ]; diff --git a/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix index 2f99a2616816..bf46dcd8def2 100644 --- a/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix +++ b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix @@ -1,7 +1,7 @@ { # general lib -, resholvePackage +, resholve , bash , doCheck ? true , doInstallCheck ? true @@ -32,7 +32,7 @@ let ''; in -resholvePackage rec { +resholve.mkDerivation rec { # bashup.events doesn't version yet but it has two variants with # differing features/performance characteristics: # - branch master: a variant for bash 3.2+ diff --git a/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix b/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix new file mode 100644 index 000000000000..acfd0e85d4f4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix @@ -0,0 +1,36 @@ +{ cmake +, fetchFromGitLab +, lib +, python3 +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "bc-decaf"; + version = "linphone-4.4.1"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + python3 + ]; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + group = "BC"; + owner = "public/external"; + repo = "decaf"; + rev = "6e78a9beb24d1e3d7050dd52a65e4f88b101a1fc"; + sha256 = "sha256-D2SzkinloL0Ya9p25YUsc+7lKvoTMUsdkKrkv/5AEeY="; + }; + + # Do not build static libraries and do not enable -Werror + cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ]; + + meta = with lib; { + description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone."; + homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; + license = licenses.mit; + maintainers = with maintainers; [ thibaultlemaire ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 869f38622418..6c1c2cdefb9c 100644 --- a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -1,16 +1,28 @@ { bcunit , cmake +, bc-decaf , fetchFromGitLab , mbedtls -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.1.12"; + version = "5.1.17"; - nativeBuildInputs = [ cmake bcunit ]; - buildInputs = [ mbedtls ]; + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + # Made by BC + bcunit + + # Vendored by BC + bc-decaf + + mbedtls + ]; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,13 +30,13 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-tmZ1XC8z4NUww58pvvqxZifOxFNXSrEBMY2biCJ55XM="; + sha256 = "sha256-p1rpFFMCYG/c35lqQT673j/Uicxe+PLhaktQfM6uF8Y="; }; # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + strictDeps = true; meta = with lib; { description = "Utilities library for Linphone"; diff --git a/nixpkgs/pkgs/development/libraries/belcard/default.nix b/nixpkgs/pkgs/development/libraries/belcard/default.nix index 740dbeee6487..0f251f73e81b 100644 --- a/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -2,12 +2,13 @@ , belr , cmake , fetchFromGitLab -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "belcard"; - version = "5.1.10"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -21,11 +22,13 @@ stdenv.mkDerivation rec { buildInputs = [ bctoolbox belr ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { - description = "C++ library to manipulate VCard standard format"; + description = "C++ library to manipulate VCard standard format. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/belcard"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 4032734416e4..22817feadeda 100644 --- a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -1,5 +1,5 @@ -{ antlr3_4 -, bctoolbox +{ bctoolbox +, belr , cmake , fetchFromGitLab , lib @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.5.14"; + version = "linphone-4.4.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = version; - sha256 = "sha256-L6dhgBJrzYgBuMNd2eMZJCqB/GIZjKipfn1SffxBFWw="; + rev = "44d5977570280763ee1fecdb920736715bad58a3"; + sha256 = "sha256-w++v3YlDZfpCHAbUQA/RftjRNGkz9J/zYoxZqRgtvnA="; }; - nativeBuildInputs = [ antlr3_4 cmake ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; @@ -30,16 +30,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=cast-function-type" "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" - "-Wno-error=cast-function-type" + "-Wno-error=stringop-overflow" ]; - propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ]; + propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ]; meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; - description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; + description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project."; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/nixpkgs/pkgs/development/libraries/belr/default.nix b/nixpkgs/pkgs/development/libraries/belr/default.nix index 05d6573beb8a..91f1c91e220c 100644 --- a/nixpkgs/pkgs/development/libraries/belr/default.nix +++ b/nixpkgs/pkgs/development/libraries/belr/default.nix @@ -1,12 +1,13 @@ { bctoolbox , cmake , fetchFromGitLab -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "belr"; - version = "5.1.3"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; meta = with lib; { - description = "Belledonne Communications' language recognition library"; + description = "Belledonne Communications' language recognition library. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/belr"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix index d5057a614843..1e74ddfc721e 100644 --- a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , autoreconfHook -, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) +, enableLargeConfig ? false +, enableMmap ? true , nixVersions }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; version = "8.0.6"; src = fetchurl { urls = [ - "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" - "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" + "https://github.com/ivmai/bdwgc/releases/download/v${finalAttrs.version}/gc-${finalAttrs.version}.tar.gz" ]; - sha256 = "3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11"; + sha256 = "sha256-O0kUq8n6dlk1lnc+TaZx1+1NU5Dj1G+/Ll8VXhIb6hE="; }; outputs = [ "out" "dev" "doc" ]; @@ -22,22 +26,24 @@ stdenv.mkDerivation rec { # boehm-gc whitelists GCC threading models patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; - configureFlags = - [ "--enable-cplusplus" "--with-libatomic-ops=none" ] - ++ lib.optional enableLargeConfig "--enable-large-config"; + configureFlags = [ + "--enable-cplusplus" + "--with-libatomic-ops=none" + ] + ++ lib.optional enableMmap "--enable-mmap" + ++ lib.optional enableLargeConfig "--enable-large-config"; - nativeBuildInputs = - lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; - doCheck = true; # not cross; + doCheck = true; enableParallelBuilding = true; passthru.tests = nixVersions; - meta = { + meta = with lib; { + homepage = "https://hboehm.info/gc/"; description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; - longDescription = '' The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C malloc or C++ new. It allows you @@ -54,13 +60,10 @@ stdenv.mkDerivation rec { Alternatively, the garbage collector may be used as a leak detector for C or C++ programs, though that is not its primary goal. ''; - - homepage = "https://hboehm.info/gc/"; - # non-copyleft, X11-style license + changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog"; license = "https://hboehm.info/gc/license.txt"; - - maintainers = [ ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/boolstuff/default.nix b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix index c7520ff783e5..c54cffb52851 100644 --- a/nixpkgs/pkgs/development/libraries/boolstuff/default.nix +++ b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "boolstuff"; - version = "0.1.16"; + version = "0.1.17"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; + url = "http://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; + hash = "sha256-WPFUoTUofigPxTRo6vUbVTEVWMeEPDWszCA05toOX0I="; }; nativeBuildInputs = [ pkg-config ]; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; + mainProgram = "booldnf"; platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/boost/1.59.nix b/nixpkgs/pkgs/development/libraries/boost/1.59.nix index 88e584f5e415..a417f3e26392 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.59.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.59.nix @@ -1,8 +1,21 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.59.0"; + boostBuildPatches = [ + # Fixes a segfault on aarch64-darwin from an implicitly defined varargs function. + # https://github.com/boostorg/build/pull/238 + (fetchpatch { + url = "https://github.com/boostorg/build/commit/48e9017139dd94446633480661e5447c7e0d8b1b.diff"; + excludes = [ + # Doesn't apply, isn't critical. + "src/engine/filesys.h" + ]; + sha256 = "sha256-/HLOJKBcGqcK9yBYKSRCSMmTNhCH3sSpK1s3OzkIqx8"; + }) + ]; + src = fetchurl { url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.69.nix b/nixpkgs/pkgs/development/libraries/boost/1.69.nix index d934e3267fcb..c8846daa64f3 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.69.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.69.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_69_0.html sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; }; + + patches = [ ./pthread-stack-min-fix.patch ]; }) diff --git a/nixpkgs/pkgs/development/libraries/boost/1.70.nix b/nixpkgs/pkgs/development/libraries/boost/1.70.nix index bc70797acda8..4d50f41e49ce 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.70.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.70.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_70_0.html sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"; }; + + patches = [ ./pthread-stack-min-fix.patch ]; }) diff --git a/nixpkgs/pkgs/development/libraries/boost/1.72.nix b/nixpkgs/pkgs/development/libraries/boost/1.72.nix index bb2fccdfaf78..4f2cc4848b19 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.72.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.72.nix @@ -6,10 +6,12 @@ callPackage ./generic.nix (args // rec { src = fetchurl { urls = [ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_72_0.html sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"; }; + + patches = [ ./pthread-stack-min-fix.patch ]; }) diff --git a/nixpkgs/pkgs/development/libraries/boost/1.73.nix b/nixpkgs/pkgs/development/libraries/boost/1.73.nix index 1d53ebcccd75..97506873980f 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.73.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.73.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { urls = [ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_73_0.html sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.74.nix b/nixpkgs/pkgs/development/libraries/boost/1.74.nix index f3a29dafbcd9..f28f40048632 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.74.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.74.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { urls = [ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_74_0.html sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.75.nix b/nixpkgs/pkgs/development/libraries/boost/1.75.nix index 1432899f9967..ec77070c932c 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.75.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.75.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { urls = [ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_75_0.html sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.77.nix b/nixpkgs/pkgs/development/libraries/boost/1.77.nix index 634523b244ce..3da1a455ead4 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.77.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.77.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { urls = [ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_77_0.html sha256 = "sha256-/J+F/AMOIzFCkIJBr3qEbmBjCqc4jeml+vsfOiaECFQ="; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.78.nix b/nixpkgs/pkgs/development/libraries/boost/1.78.nix new file mode 100644 index 000000000000..2cc818e63ce0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/1.78.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.78.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_78_0.html + sha256 = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"; + }; +}) + diff --git a/nixpkgs/pkgs/development/libraries/boost/1.79.nix b/nixpkgs/pkgs/development/libraries/boost/1.79.nix new file mode 100644 index 000000000000..87975e2846d3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/1.79.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.79.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_79_0.html + sha256 = "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39"; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/boost/default.nix b/nixpkgs/pkgs/development/libraries/boost/default.nix index aeb0878a0d11..e9f7308e3464 100644 --- a/nixpkgs/pkgs/development/libraries/boost/default.nix +++ b/nixpkgs/pkgs/development/libraries/boost/default.nix @@ -45,4 +45,6 @@ in { boost174 = makeBoost ./1.74.nix; boost175 = makeBoost ./1.75.nix; boost177 = makeBoost ./1.77.nix; + boost178 = makeBoost ./1.78.nix; + boost179 = makeBoost ./1.79.nix; } diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index c0fce3ae5760..b9bdec0cd077 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -15,6 +15,7 @@ , enableNumpy ? false , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? [] +, boostBuildPatches ? [] , useMpi ? false , mpi , extraB2Args ? [] @@ -32,7 +33,7 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be built on linux with clang >8, because pth was removed -assert with lib; ((stdenv.isLinux && toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); +assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69"; with lib; let @@ -68,7 +69,7 @@ let else "$NIX_BUILD_CORES"; - needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || stdenv.isDarwin; + needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared); b2Args = concatStringsSep " " ([ "--includedir=$dev/include" @@ -84,7 +85,9 @@ let # TODO: make this unconditional ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}" - "architecture=${toString stdenv.hostPlatform.parsed.cpu.family}" + "architecture=${if stdenv.hostPlatform.isMips64 + then if versionOlder version "1.78" then "mips1" else "mips" + else toString stdenv.hostPlatform.parsed.cpu.family}" "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}" @@ -92,7 +95,8 @@ let # https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html "abi=${if stdenv.hostPlatform.parsed.cpu.family == "arm" then "aapcs" else if stdenv.hostPlatform.isWindows then "ms" - else if stdenv.hostPlatform.isMips then "o32" + else if stdenv.hostPlatform.isMips32 then "o32" + else if stdenv.hostPlatform.isMips64n64 then "n64" else "sysv"}" ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ optional (variant == "release") "debug-symbols=off" @@ -133,7 +137,14 @@ stdenv.mkDerivation { sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0"; stripLen = 1; }) - ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch + ++ optional (versionAtLeast version "1.65" && versionOlder version "1.70") (fetchpatch { + # support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly + url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch"; + sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI="; + stripLen = 1; + extraPrefix = "libs/context/"; + }) + ++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; @@ -150,6 +161,18 @@ stdenv.mkDerivation { ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; maintainers = with maintainers; [ hjones2199 ]; + + broken = + # boost-context lacks support for the N32 ABI on mips64. The build + # will succeed, but packages depending on boost-context will fail with + # a very cryptic error message. + stdenv.hostPlatform.isMips64n32 || + # the patch above does not apply cleanly to pre-1.65 boost + (stdenv.hostPlatform.isMips64n64 && (versionOlder version "1.65")); + }; + + passthru = { + inherit boostBuildPatches; }; preConfigure = optionalString useMpi '' diff --git a/nixpkgs/pkgs/development/libraries/boost/pthread-stack-min-fix.patch b/nixpkgs/pkgs/development/libraries/boost/pthread-stack-min-fix.patch new file mode 100644 index 000000000000..b6c85f840529 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/pthread-stack-min-fix.patch @@ -0,0 +1,15 @@ +Taken from https://github.com/conan-io/conan-center-index/pull/361/files + +diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp +index aefbeb4..bc9b136 100644 +--- a/boost/thread/pthread/thread_data.hpp ++++ b/boost/thread/pthread/thread_data.hpp +@@ -57,7 +57,7 @@ namespace boost + #else + std::size_t page_size = ::sysconf( _SC_PAGESIZE); + #endif +-#if PTHREAD_STACK_MIN > 0 ++#ifdef PTHREAD_STACK_MIN + if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN; + #endif + size = ((size+page_size-1)/page_size)*page_size; diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index b9b2e568ce6b..efcb64a7fd5c 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -26,6 +26,8 @@ buildGoModule { # (if we use postConfigure then cmake will loop runHook postConfigure) preBuild = '' cmakeConfigurePhase + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + export GOARCH=$(go env GOHOSTARCH) ''; buildPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 113c4a27b919..6987b6c35f0a 100644 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -1,19 +1,10 @@ { callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.18"; - revision = "1"; - sha256 = "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq"; + baseVersion = "2.19"; + revision = "2"; + sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU="; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; - extraPatches = [ - (fetchpatch { - name = "CVE-2021-40529.patch"; - url = "https://github.com/randombit/botan/commit/9a23e4e3bc3966340531f2ff608fa9d33b5185a2.patch"; - sha256 = "1ax1n2l9zh0hk35vkkywgkhzpdk76xb9apz2wm3h9kjvjs9acr3y"; - # our source tarball doesn't include the tests - excludes = [ "src/tests/*" ]; - }) - ]; }) diff --git a/nixpkgs/pkgs/development/libraries/botan/default.nix b/nixpkgs/pkgs/development/libraries/botan/default.nix deleted file mode 100644 index d6ee9ff152f4..000000000000 --- a/nixpkgs/pkgs/development/libraries/botan/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - baseVersion = "1.10"; - revision = "17"; - sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8"; - sourceExtension = "tgz"; - extraConfigureFlags = "--with-gnump"; - postPatch = '' - sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt - ''; - knownVulnerabilities = [ - "CVE-2021-40529" - # https://botan.randombit.net/security.html#id1 - "2020-03-24: Side channel during CBC padding" - ]; -}) diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 1384bdee9add..3e5884c6c99a 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost +{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost # Passed by version specific builders , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { patches = extraPatches; inherit postPatch; - buildInputs = [ python3 bzip2 zlib gmp openssl boost ] + buildInputs = [ python3 bzip2 zlib gmp boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/bullet/default.nix b/nixpkgs/pkgs/development/libraries/bullet/default.nix index 167dda7c4c4a..5203e941b3d0 100644 --- a/nixpkgs/pkgs/development/libraries/bullet/default.nix +++ b/nixpkgs/pkgs/development/libraries/bullet/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "bullet"; - version = "3.21"; + version = "3.24"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "sha256-krzqZ2TPycyWjJzYJ69rb6Qgymlio5HGw2nPCjDZPGk="; + sha256 = "sha256-1zQZI1MdW0Ipg5XJeiFZQi/6cI0t6Ckralc5DE3auow="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix index a3966eaa4a39..ac8433fc77ac 100644 --- a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -51,5 +51,8 @@ stdenv.mkDerivation { homepage = "http://bulletphysics.org"; license = licenses.zlib; platforms = platforms.unix; + # /tmp/nix-build-bullet-2019-03-27.drv-0/source/src/Bullet3Common/b3Vector3.h:297:7: error: argument value 10880 is outside the valid range [0, 255] [-Wargument-outside-range] + # y = b3_splat_ps(y, 0x80); + broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/nixpkgs/pkgs/development/libraries/bwidget/default.nix b/nixpkgs/pkgs/development/libraries/bwidget/default.nix index 34f0e8b5b495..b73c11893edf 100644 --- a/nixpkgs/pkgs/development/libraries/bwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/bwidget/default.nix @@ -22,6 +22,6 @@ tcl.mkTclDerivation rec { description = "High-level widget set for Tcl/Tk"; maintainers = with lib.maintainers; [ agbrooks ]; license = lib.licenses.tcltk; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index 29b665fec628..3a6ef0e3562d 100644 --- a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -2,12 +2,13 @@ , cmake , fetchFromGitLab , sqlite -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.1.0"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -22,12 +23,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ]; meta = with lib; { - description = "An opensource implementation of ZRTP keys exchange protocol"; + description = "An opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix index b133f9867d32..a5a41813bc3e 100644 --- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -25,13 +25,17 @@ stdenv.mkDerivation rec { }; # Adapted from running a cmake build - passthru.cmake-config = writeTextDir "c-ares-config.cmake" + passthru.cmake-config = let + extension = if stdenv.hostPlatform.isStatic then ".a" else stdenv.hostPlatform.extensions.sharedLibrary; + buildType = if stdenv.hostPlatform.isStatic then "STATIC" else "SHARED"; + buildTypeLower = if stdenv.hostPlatform.isStatic then "static" else "shared"; + in writeTextDir "c-ares-config.cmake" '' set(c-ares_INCLUDE_DIR "${self}/include") set(c-ares_LIBRARY c-ares::cares) - add_library(c-ares::cares SHARED IMPORTED) + add_library(c-ares::cares ${buildType} IMPORTED) set_target_properties(c-ares::cares PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${self}/include" @@ -39,12 +43,12 @@ stdenv.mkDerivation rec { ) set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(c-ares::cares PROPERTIES - IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${stdenv.targetPlatform.extensions.sharedLibrary}" - IMPORTED_SONAME_RELEASE "libcares${stdenv.targetPlatform.extensions.sharedLibrary}" + IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${extension}" + IMPORTED_SONAME_RELEASE "libcares${extension}" ) - add_library(c-ares::cares_shared INTERFACE IMPORTED) - set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") - set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + add_library(c-ares::cares_${buildTypeLower} INTERFACE IMPORTED) + set_target_properties(c-ares::cares_${buildTypeLower} PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") + set(c-ares_${buildType}_LIBRARY c-ares::cares_${buildTypeLower}) ''; }; in self diff --git a/nixpkgs/pkgs/development/libraries/caf/default.nix b/nixpkgs/pkgs/development/libraries/caf/default.nix index 045595a84fde..8640fb6b5c9c 100644 --- a/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - preCheck = '' - export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io - export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io - ''; meta = with lib; { description = "An open source implementation of the actor model in C++"; diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 8c7f1bcfaa09..f3b631c892be 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -63,9 +63,25 @@ in stdenv.mkDerivation rec { url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki"; }) - ] ++ optionals stdenv.hostPlatform.isDarwin [ + # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 ./skip-configure-stderr-check.patch + + # Fixes cairo crash on macOS Big Sur + # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 + (fetchpatch { + url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; + sha256 = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; + }) + + # Fix unexpected color addition on grayscale images (usually text). + # Upstream fix: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/114 + # Can be removed after 1.18 release + (fetchpatch { + name = "fix-grayscale-anialias.patch"; + url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff"; + sha256 = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; + }) ]; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/nixpkgs/pkgs/development/libraries/capnproto/default.nix index 75b5f14d67ce..9af591db120e 100644 --- a/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -1,28 +1,25 @@ { lib , stdenv , fetchFromGitHub -, capnproto -, cmake }: +, cmake +, openssl +, zlib +}: stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.9.1"; + version = "0.10.2"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5"; + sha256 = "sha256-vBp4CAfPpd7/hdGk7JBxMTjtFFvXx16ODOfqDd8bAjc="; }; - nativeBuildInputs = [ cmake ] - ++ lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) capnproto; - - cmakeFlags = lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) "-DEXTERNAL_CAPNP"; - - # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.9.1. Drop on update. - patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch; + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ openssl zlib ]; meta = with lib; { homepage = "https://capnproto.org/"; diff --git a/nixpkgs/pkgs/development/libraries/capnproto/musl-no-fibers.patch b/nixpkgs/pkgs/development/libraries/capnproto/musl-no-fibers.patch deleted file mode 100644 index bb7804fb0abb..000000000000 --- a/nixpkgs/pkgs/development/libraries/capnproto/musl-no-fibers.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 3d983eff304c28574c330a52d70a60145c9e157e Mon Sep 17 00:00:00 2001 -From: Jonas Vautherin <jonas.vautherin@gmail.com> -Date: Fri, 14 Jan 2022 00:14:26 +0100 -Subject: [PATCH] Add support for musl - ---- -Based on upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, -modified slightly by dtzWill to apply to v0.9.1. - -(drop whitespace change to a cmake "if (WITH_OPENSSL)", -leave the other instance of that change since it applies) ---- - -Co-authored-by: Guillaume Papin <guillaume.papin@epitech.eu> -(cherry picked from commit 77ac9154440bcc216fda1092fd5bb51da62ae09c) ---- - .github/workflows/quick-test.yml | 9 ++++++ - c++/CMakeLists.txt | 46 ++++++++++++++++++++++++++++- - c++/cmake/CapnProtoConfig.cmake.in | 32 ++++++++++++++++++++ - c++/configure.ac | 47 ++++++++++++++++++++++++++++-- - c++/src/kj/CMakeLists.txt | 11 ++++++- - 5 files changed, 141 insertions(+), 4 deletions(-) - -diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml -index c18ef6a6..773ff043 100644 ---- a/.github/workflows/quick-test.yml -+++ b/.github/workflows/quick-test.yml -@@ -10,6 +10,15 @@ on: - - 'release-*' - - jobs: -+ Linux-musl: -+ runs-on: ubuntu-latest -+ container: alpine:latest -+ steps: -+ - uses: actions/checkout@v2 -+ - name: install dependencies -+ run: apk add autoconf automake build-base cmake libtool libucontext-dev linux-headers openssl-dev -+ - name: super-test -+ run: ./super-test.sh quick - Linux: - runs-on: ubuntu-latest - strategy: -diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt -index 548dfd1f..5de7ab26 100644 ---- a/c++/CMakeLists.txt -+++ b/c++/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4) -+cmake_minimum_required(VERSION 3.6) - project("Cap'n Proto" CXX) - set(VERSION 0.9.1) - -@@ -64,6 +64,50 @@ elseif (WITH_OPENSSL) - find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL) - endif() - -+set(WITH_FIBERS "AUTO" CACHE STRING -+ "Whether or not to build libkj-async with fibers") -+# define list of values GUI will offer for the variable -+set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF) -+ -+# CapnProtoConfig.cmake.in needs this variable. -+set(_WITH_LIBUCONTEXT OFF) -+ -+if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO") -+ set(_capnp_fibers_found OFF) -+ if (WIN32 OR CYGWIN) -+ set(_capnp_fibers_found ON) -+ else() -+ # Fibers need makecontext, setcontext, getcontext, swapcontext that may be in libc, -+ # or in libucontext (e.g. for musl). -+ # We assume that makecontext implies that the others are present. -+ include(CheckLibraryExists) -+ check_library_exists(c makecontext "" HAVE_UCONTEXT_LIBC) -+ if (HAVE_UCONTEXT_LIBC) -+ set(_capnp_fibers_found ON) -+ else() -+ # Try with libucontext -+ find_package(PkgConfig) -+ if (PKG_CONFIG_FOUND) -+ pkg_check_modules(libucontext IMPORTED_TARGET libucontext) -+ if (libucontext_FOUND) -+ set(_WITH_LIBUCONTEXT ON) -+ set(_capnp_fibers_found ON) -+ endif() -+ else() -+ set(_capnp_fibers_found OFF) -+ endif() -+ endif() -+ endif() -+ -+ if (_capnp_fibers_found) -+ set(WITH_FIBERS ON) -+ elseif(WITH_FIBERS STREQUAL "AUTO") -+ set(WITH_FIBERS OFF) -+ else() -+ message(FATAL_ERROR "Missing 'makecontext', 'getcontext', 'setcontext' or 'swapcontext' symbol in libc and no libucontext found: KJ won't be able to build with fibers. Disable fibers (-DWITH_FIBERS=OFF).") -+ endif() -+endif() -+ - if(MSVC) - # TODO(cleanup): Enable higher warning level in MSVC, but make sure to test - # build with that warning level and clean out false positives. -diff --git a/c++/cmake/CapnProtoConfig.cmake.in b/c++/cmake/CapnProtoConfig.cmake.in -index 667f502f..0580b11a 100644 ---- a/c++/cmake/CapnProtoConfig.cmake.in -+++ b/c++/cmake/CapnProtoConfig.cmake.in -@@ -62,6 +62,38 @@ if (@WITH_OPENSSL@) # WITH_OPENSSL - endif() - endif() - -+if (@_WITH_LIBUCONTEXT@) # _WITH_LIBUCONTEXT -+ set(forwarded_config_flags) -+ if(CapnProto_FIND_QUIETLY) -+ list(APPEND forwarded_config_flags QUIET) -+ endif() -+ if(CapnProto_FIND_REQUIRED) -+ list(APPEND forwarded_config_flags REQUIRED) -+ endif() -+ # If the consuming project called find_package(CapnProto) with the QUIET or REQUIRED flags, forward -+ # them to calls to find_package(PkgConfig) and pkg_check_modules(). Note that find_dependency() -+ # would do this for us in the former case, but there is no such forwarding wrapper for -+ # pkg_check_modules(). -+ -+ find_package(PkgConfig ${forwarded_config_flags}) -+ if(NOT ${PkgConfig_FOUND}) -+ # If we're here, the REQUIRED flag must not have been passed, else we would have had a fatal -+ # error. Nevertheless, a diagnostic for this case is probably nice. -+ if(NOT CapnProto_FIND_QUIETLY) -+ message(WARNING "pkg-config cannot be found") -+ endif() -+ set(CapnProto_FOUND OFF) -+ return() -+ endif() -+ -+ if (CMAKE_VERSION VERSION_LESS 3.6) -+ # CMake >= 3.6 required due to the use of IMPORTED_TARGET -+ message(SEND_ERROR "libucontext support requires CMake >= 3.6.") -+ endif() -+ -+ pkg_check_modules(libucontext IMPORTED_TARGET ${forwarded_config_flags} libucontext) -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoTargets.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoMacros.cmake") - -diff --git a/c++/configure.ac b/c++/configure.ac -index 72fe8456..b627bec8 100644 ---- a/c++/configure.ac -+++ b/c++/configure.ac -@@ -32,6 +32,11 @@ AC_ARG_WITH([openssl], - [build libkj-tls by linking against openssl @<:@default=check@:>@])], - [],[with_openssl=check]) - -+AC_ARG_WITH([fibers], -+ [AS_HELP_STRING([--with-fibers], -+ [build libkj-async with fibers @<:@default=check@:>@])], -+ [],[with_fibers=check]) -+ - AC_ARG_ENABLE([reflection], [ - AS_HELP_STRING([--disable-reflection], [ - compile Cap'n Proto in "lite mode", in which all reflection APIs (schema.h, dynamic.h, etc.) -@@ -195,8 +200,46 @@ AS_IF([test "$with_openssl" != no], [ - ]) - AM_CONDITIONAL([BUILD_KJ_TLS], [test "$with_openssl" != no]) - --# CapnProtoConfig.cmake.in needs this variable. --AC_SUBST(WITH_OPENSSL, $with_openssl) -+# Fibers need the symbols getcontext, setcontext, swapcontext and makecontext. -+# We assume that makecontext implies the rest. -+AS_IF([test "$with_fibers" != no], [ -+ libc_supports_fibers=yes -+ AC_SEARCH_LIBS([makecontext], [], [], [ -+ libc_supports_fibers=no -+ ]) -+ -+ AS_IF([test "$libc_supports_fibers" = yes], [ -+ with_fibers=yes -+ ], [ -+ # If getcontext does not exist in libc, try with libucontext -+ ucontext_supports_fibers=yes -+ AC_CHECK_LIB(ucontext, [makecontext], [], [ -+ ucontext_supports_fibers=no -+ ]) -+ AS_IF([test "$ucontext_supports_fibers" = yes], [ -+ ASYNC_LIBS="$ASYNC_LIBS -lucontext" -+ with_fibers=yes -+ ], [ -+ AS_IF([test "$with_fibers" = yes], [ -+ AC_MSG_ERROR([Missing symbols required for fibers (makecontext, setcontext, ...). Disable fibers (--without-fibers) or install libucontext]) -+ ], [ -+ AC_MSG_WARN([could not find required symbols (makecontext, setcontext, ...) -- won't build with fibers]) -+ with_fibers=no -+ ]) -+ ]) -+ ]) -+]) -+AS_IF([test "$with_fibers" = yes], [ -+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS" -+], [ -+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0" -+]) -+ -+# CapnProtoConfig.cmake.in needs these variables, -+# we force them to NO because we don't need the CMake dependency for them, -+# the dependencies are provided by the .pc files. -+AC_SUBST(WITH_OPENSSL, NO) -+AC_SUBST(_WITH_LIBUCONTEXT, NO) - - AM_CONDITIONAL([HAS_FUZZING_ENGINE], [test "x$LIB_FUZZING_ENGINE" != "x"]) - -diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt -index 813fac4d..f7b4dddf 100644 ---- a/c++/src/kj/CMakeLists.txt -+++ b/c++/src/kj/CMakeLists.txt -@@ -136,6 +136,15 @@ if(NOT CAPNP_LITE) - add_library(kj-async ${kj-async_sources}) - add_library(CapnProto::kj-async ALIAS kj-async) - target_link_libraries(kj-async PUBLIC kj) -+ if(WITH_FIBERS) -+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS) -+ if(_WITH_LIBUCONTEXT) -+ target_link_libraries(kj-async PUBLIC PkgConfig::libucontext) -+ endif() -+ else() -+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS=0) -+ endif() -+ - if(UNIX) - # external clients of this library need to link to pthreads - target_compile_options(kj-async INTERFACE "-pthread") -@@ -181,7 +190,7 @@ if(NOT CAPNP_LITE) - add_library(kj-tls ${kj-tls_sources}) - add_library(CapnProto::kj-tls ALIAS kj-tls) - target_link_libraries(kj-tls PUBLIC kj-async) -- if (WITH_OPENSSL) -+ if(WITH_OPENSSL) - target_compile_definitions(kj-tls PRIVATE KJ_HAS_OPENSSL) - target_link_libraries(kj-tls PRIVATE OpenSSL::SSL OpenSSL::Crypto) - endif() --- -2.35.1 - diff --git a/nixpkgs/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix index adc52da1e560..6f5a8e340ad6 100644 --- a/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation rec { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = lib.licenses.bsd3; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ris ]; + mainProgram = "cstool"; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/caroline/default.nix b/nixpkgs/pkgs/development/libraries/caroline/default.nix new file mode 100644 index 000000000000..6b94df2f64a1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/caroline/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, vala, meson, ninja, pkg-config, glib, libgee, gtk3 }: + +stdenv.mkDerivation rec { + pname = "caroline"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "dcharles525"; + repo = pname; + rev = version; + hash = "sha256-v423h9EC/h6B9VABhkvmYcyYXKPpvqhI8O7ZjbO637k"; + }; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + ]; + + buildInputs = [ + glib + libgee + gtk3 + ]; + + meta = with lib; { + description = " A simple Cairo Chart Library for GTK and Vala"; + homepage = "https://github.com/dcharles525/Caroline"; + maintainers = with maintainers; [ grindhold ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix new file mode 100644 index 000000000000..fb31f1e50abb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix @@ -0,0 +1,37 @@ +{ fetchFromGitHub, + lib, stdenv, + cmake, zlib, libuv, openssl, + examples ? false +}: stdenv.mkDerivation rec { + pname = "cassandra-cpp-driver"; + version = "2.16.2"; + + src = fetchFromGitHub { + owner = "datastax"; + repo = "cpp-driver"; + rev = "refs/tags/${version}"; + sha256 = "sha256-NAvaRLhEvFjSmXcyM039wLC6IfLws2rkeRpbE5eL/rQ="; + }; + + LIBUV_ROOT_DIR = "${libuv}/"; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libuv openssl.dev ]; + + cmakeFlags = lib.attrsets.mapAttrsToList + (name: value: "-DCASS_BUILD_${name}:BOOL=${if value then "ON" else "OFF"}") { + EXAMPLES = examples; + }; + + meta = with lib; { + description = "DataStax CPP cassandra driver"; + longDescription = '' + A modern, feature-rich and highly tunable C/C++ client + library for Apache Cassandra 2.1+ using exclusively Cassandra’s + binary protocol and Cassandra Query Language v3. + ''; + license = with licenses; [ asl20 ]; + platforms = platforms.x86_64; + homepage = "https://docs.datastax.com/en/developer/cpp-driver/"; + maintainers = [ maintainers.npatsakula ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/catch/default.nix b/nixpkgs/pkgs/development/libraries/catch/default.nix index c89fbd477c96..c4d64a0f4787 100644 --- a/nixpkgs/pkgs/development/libraries/catch/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { url = "https://github.com/catchorg/Catch2/commit/bb6d08323f23a39eb65dd86671e68f4f5d3f2d6c.patch"; sha256 = "1vhbzx84nrhhf9zlbl6h5zmg3r5w5v833ihlswsysb9wp2i4isc5"; }) + + # Fix glibc-2.34 build + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/catch1/raw/23276476148a657e7a45ade547f858cbf965a33a/f/catch1-sigstksz.patch"; + sha256 = "sha256-XSsI3iDEZCUSbozlYWC0y/LZ7qr/5zwACpn1jHKD0yU="; + }) ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/catch2/3.nix b/nixpkgs/pkgs/development/libraries/catch2/3.nix new file mode 100644 index 000000000000..9c2de74bea26 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/catch2/3.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +}: + +stdenv.mkDerivation rec { + pname = "catch2"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "catchorg"; + repo = "Catch2"; + rev = "v${version}"; + hash = "sha256-bp/KLTr754txVUTAauJFrsxGKgZicUEe40CZBDkxRwk="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DCATCH_DEVELOPMENT_BUILD=ON" + "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}" + ] ++ lib.optionals (stdenv.isDarwin && doCheck) [ + # test has a faulty path normalization technique that won't work in + # our darwin build environment https://github.com/catchorg/Catch2/issues/1691 + "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" + ]; + + doCheck = true; + + checkInputs = [ + python3 + ]; + + meta = { + description = "Modern, C++-native, test framework for unit-tests"; + homepage = "https://github.com/catchorg/Catch2"; + changelog = "https://github.com/catchorg/Catch2/blob/${src.rev}/docs/release-notes.md"; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix index 71a99ad6b696..111f1054f368 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.8"; + version = "2.13.9"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="sha256-jOA2TxDgaJUJ2Jn7dVGZUbjmphTDuVZahzSaxfJpRqE="; + sha256="sha256-G6rMTHvrBJbUaTNkR738YClAn2v2xVBr+tXLjpNzVZg="; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; - platforms = with platforms; unix; + platforms = platforms.unix ++ [ "x86_64-windows" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/cdo/default.nix b/nixpkgs/pkgs/development/libraries/cdo/default.nix index d13305d10b9e..ece7ab2f6921 100644 --- a/nixpkgs/pkgs/development/libraries/cdo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, curl, hdf5, netcdf +{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes , # build, install and link to a CDI library [default=no] enable_cdi_lib ? false , # build a completely statically linked CDO binary @@ -9,22 +9,24 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "1.9.10"; + version = "2.0.5"; # Dependencies buildInputs = [ curl netcdf hdf5 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/24638/${pname}-${version}.tar.gz"; - sha256 = "sha256-zDnIm7tIHXs5RaBsVqhJIEcjX0asNjxPDZgPzN3mZ34="; + url = "https://code.mpimet.mpg.de/attachments/download/26823/${pname}-${version}.tar.gz"; + sha256 = "sha256-7e678cOxofDGQtrmvIx2JODFS6vkYQZNxcfaykpbDc4="; }; - # Configure phase configureFlags = [ - "--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"] - ++ lib.optional (enable_cdi_lib) "--enable-cdi-lib" - ++ lib.optional (enable_all_static) "--enable-all-static" - ++ lib.optional (enable_cxx) "--enable-cxx"; + "--with-netcdf=${netcdf}" + "--with-hdf5=${hdf5}" + "--with-eccodes=${eccodes}" + ] + ++ lib.optional enable_cdi_lib "--enable-cdi-lib" + ++ lib.optional enable_all_static "--enable-all-static" + ++ lib.optional enable_cxx "--enable-cxx"; meta = with lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; diff --git a/nixpkgs/pkgs/development/libraries/cgreen/default.nix b/nixpkgs/pkgs/development/libraries/cgreen/default.nix index 85532bfd74b0..f8790791798d 100644 --- a/nixpkgs/pkgs/development/libraries/cgreen/default.nix +++ b/nixpkgs/pkgs/development/libraries/cgreen/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-aQrfsiPuNrEMscZrOoONiN665KlNmnOiYj9ZIyzW304="; }; + postPatch = '' + for F in tools/discoverer_acceptance_tests.c tools/discoverer.c; do + substituteInPlace "$F" --replace "/usr/bin/nm" "nm" + done + ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/check/default.nix b/nixpkgs/pkgs/development/libraries/check/default.nix index 37bde1caf437..8add9c623470 100644 --- a/nixpkgs/pkgs/development/libraries/check/default.nix +++ b/nixpkgs/pkgs/development/libraries/check/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://libcheck.github.io/check/"; license = licenses.lgpl2Plus; + mainProgram = "checkmk"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index 4a482c9da454..c22d819b3be0 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.0.2"; + version = "3.1.4"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk="; + hash = "sha256-nHYRs8X8I0B76SlgqWez3qubrsG7iBfa0I/G78v7H8g="; }; outputs = [ "out" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix index bf737972612b..3222702f5a1a 100644 --- a/nixpkgs/pkgs/development/libraries/civetweb/default.nix +++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix @@ -30,8 +30,9 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCIVETWEB_ENABLE_CXX=ON" "-DBUILD_SHARED_LIBS=ON" + "-DCIVETWEB_ENABLE_CXX=ON" + "-DCIVETWEB_ENABLE_IPV6=ON" # The civetweb unit tests rely on downloading their fork of libcheck. "-DCIVETWEB_BUILD_TESTING=OFF" diff --git a/nixpkgs/pkgs/development/libraries/cjose/default.nix b/nixpkgs/pkgs/development/libraries/cjose/default.nix index 57b5c6c1b8bf..1ce4ba8fe3d4 100644 --- a/nixpkgs/pkgs/development/libraries/cjose/default.nix +++ b/nixpkgs/pkgs/development/libraries/cjose/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cjose"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { - owner = "cisco"; + owner = "zmartzone"; repo = "cjose"; - rev = version; - sha256 = "1msyjwmylb5c7jc16ryx3xb9cdwx682ihsm0ni766y6dfwx8bkhp"; + rev = "v${version}"; + sha256 = "sha256-FHKuaf4Gg3On7d3UBbGD8k1gA8kGsCOaWtLMohr5woA="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/cisco/cjose"; - changelog = "https://github.com/cisco/cjose/blob/${version}/CHANGELOG.md"; - description = "C library for Javascript Object Signing and Encryption"; + homepage = "https://github.com/zmartzone/cjose"; + changelog = "https://github.com/zmartzone/cjose/blob/${version}/CHANGELOG.md"; + description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix index 52caa26c9c58..861e9179e094 100644 --- a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0" "-D_CL_HAVE_NAMESPACES_EXITCODE=0" + "-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0" - "-D_CL_HAVE_NO_SNWPRINTF_BUG_EXITCODE=0" + "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0" + "-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0" "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0" + "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT=" ]; patches = # From debian diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix index 6f0eb8dfff00..58c24069a3a4 100644 --- a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + meta = with lib; { + broken = stdenv.isDarwin; description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, diff --git a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index 599ac2b2e7b0..ecfdda3192f4 100644 --- a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.3"; + version = "0.29.0.gfm.4"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-V3XegSjqKLCMpfnoYHr9/r5fSC2CC7A2jXkAcHUt7eA="; + sha256 = "sha256-touFLrxVQvX75JXYLADq84yIuQ1kl43fVUvZ4qGYoMM="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cmrt/default.nix b/nixpkgs/pkgs/development/libraries/cmrt/default.nix index 5b2895a3f177..87c692b42cea 100644 --- a/nixpkgs/pkgs/development/libraries/cmrt/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmrt/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://01.org/linuxmedia"; description = "Intel C for Media Runtime"; longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; diff --git a/nixpkgs/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix index 7d271e16f240..303965b34b63 100644 --- a/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -2,22 +2,32 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; rev = "v${version}"; - hash = "sha256-2/Ef5cEe7Kr3a/D8u4BgvTQM6M6vglXsF+ccstFHDUw="; + hash = "sha256-Q5p6NicwmHBR7drX8Tdgf6Mruqssg9qzMC9sG9DlMbQ="; }; nativeBuildInputs = [ cmake ]; + # Install a binary that is used by openwebrx + postInstall = '' + install -Dm0755 src/freedv_rx -t $out/bin/ + ''; + # Swap keyword order to satisfy SWIG parser postFixup = '' sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "https://www.rowetel.com/codec2.html"; diff --git a/nixpkgs/pkgs/development/libraries/coeurl/default.nix b/nixpkgs/pkgs/development/libraries/coeurl/default.nix index bfa8aef2dd16..40712e8beddd 100644 --- a/nixpkgs/pkgs/development/libraries/coeurl/default.nix +++ b/nixpkgs/pkgs/development/libraries/coeurl/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0="; + sha256 = "sha256-+FIxi019+jnjpo4NhBQ4tb3ObLrEStMN5YD+MrTLa2E="; }; nativeBuildInputs = [ ninja pkg-config meson ]; diff --git a/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 3fe78e6d02e9..7675ddae378e 100644 --- a/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -1,29 +1,40 @@ -{ fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }: +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, libGL +, libGLU +, libX11 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "2020-12-07-unstable"; + version = "unstable-2022-07-27"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; - # rev = "Coin-${version}"; - rev = "d5539998aff272b349590fe74d068659682ecd0d"; - sha256 = "11jaz8p9nn8jpd6dsgwgkldwr7z829gyf64g014qyyh8l6p7jzzd"; + rev = "4c67945a58d2a6e5adb4d2332ab08007769130ef"; + hash = "sha256-lXS7GxtoPsZe2SJfr0uY99Q0ZtYG0KFlauY1PBuFleo="; }; - postPatch = '' - sed -i /cpack.d/d CMakeLists.txt - ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libX11 libGL libGLU ]; + + buildInputs = [ + boost + libGL + libGLU + libX11 + ]; + + cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; meta = with lib; { homepage = "https://github.com/coin3d/coin"; - license = licenses.bsd3; description = "High-level, retained-mode toolkit for effective 3D graphics development"; + license = licenses.bsd3; maintainers = with maintainers; [ gebner viric ]; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/console-bridge/default.nix b/nixpkgs/pkgs/development/libraries/console-bridge/default.nix index e2370ecce647..5c85bbd4a196 100644 --- a/nixpkgs/pkgs/development/libraries/console-bridge/default.nix +++ b/nixpkgs/pkgs/development/libraries/console-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "console-bridge"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ros"; repo = "console_bridge"; rev = version; - sha256 = "18qycrjnf7v8n5bipij91jsv7ap98z5dsp93w2gz9rah4lfjb80q"; + sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM="; }; nativeBuildInputs = [ cmake validatePkgConfig ]; diff --git a/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix b/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix index ca303fdeaea3..f58e654cbfe3 100644 --- a/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix +++ b/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, runCommand, unzip, cosmopolitan,bintools-unwrapped }: +{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped }: stdenv.mkDerivation rec { pname = "cosmopolitan"; @@ -11,72 +11,35 @@ stdenv.mkDerivation rec { sha256 = "sha256-UjL4wR5HhuXiQXg6Orcx2fKiVGRPMJk15P779BP1fRA="; }; - patches = [ - ./ioctl.patch # required /dev/tty - ]; + nativeBuildInputs = [ bintools-unwrapped unzip ]; - postPatch = '' - patchShebangs build/ - ''; + outputs = [ "out" "dist" ]; + # slashes are significant because upstream uses o/$(MODE)/foo.o + buildFlags = "o/cosmopolitan.h o//cosmopolitan.a o//libc/crt/crt.o o//ape/ape.o o//ape/ape.lds"; + checkTarget = "o//test"; + enableParallelBuilding = true; + + doCheck = true; dontConfigure = true; dontFixup = true; - enableParallelBuilding = true; - nativeBuildInputs = [ bintools-unwrapped unzip ]; installPhase = '' runHook preInstall - mkdir -p $out/{bin,include,lib} + mkdir -p $out/{include,lib} install o/cosmopolitan.h $out/include install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib - cat > $out/bin/cosmoc <<EOF - #!${stdenv.shell} - exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \ - -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ - "\$@" \ - -Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \ - -fuse-ld=bfd -Wl,-T,$out/lib/ape.lds \ - -include $out/include/cosmopolitan.h \ - -I $out/include \ - $out/lib/{crt.o,ape.o,cosmopolitan.a} - EOF - chmod +x $out/bin/cosmoc - - pushd o - find -iname "*.com" -type f -exec install -D {} $out/{} \; - popd - find -iname "*.h" -type f -exec install -m644 -D {} $out/include/{} \; - find -iname "*.inc" -type f -exec install -m644 -D {} $out/include/{} \; + cp -RT . "$dist" runHook postInstall ''; - passthru.tests = lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) { - hello = runCommand "hello-world" { } '' - printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c - ${stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ - -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ - -include ${cosmopolitan}/include/cosmopolitan.h \ - -I ${cosmopolitan}/include \ - ${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a} - ${stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com - ./hello.com - printf "test successful" > $out - ''; - cosmoc = runCommand "cosmoc-hello" { } '' - printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c - ${cosmopolitan}/bin/cosmoc hello.c - ./a.out - printf "test successful" > $out - ''; - }; - meta = with lib; { homepage = "https://justine.lol/cosmopolitan/"; description = "Your build-once run-anywhere c library"; platforms = platforms.x86_64; badPlatforms = platforms.darwin; license = licenses.isc; - maintainers = with maintainers; [ lourkeur tomberek ]; + maintainers = teams.cosmopolitan.members; }; } diff --git a/nixpkgs/pkgs/development/libraries/cosmopolitan/ioctl.patch b/nixpkgs/pkgs/development/libraries/cosmopolitan/ioctl.patch deleted file mode 100644 index e6e7eb4fc7b0..000000000000 --- a/nixpkgs/pkgs/development/libraries/cosmopolitan/ioctl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/third_party/python/python.mk b/third_party/python/python.mk -index f18c15060..b17455bca 100644 ---- a/third_party/python/python.mk -+++ b/third_party/python/python.mk -@@ -1818,7 +1818,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \ - third_party/python/Lib/test/test_int_literal.py \ - third_party/python/Lib/test/test_bisect.py \ - third_party/python/Lib/test/test_pyexpat.py \ -- third_party/python/Lib/test/test_ioctl.py \ - third_party/python/Lib/test/test_getopt.py \ - third_party/python/Lib/test/test_sort.py \ - third_party/python/Lib/test/test_slice.py \ diff --git a/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix index dfe7f7776703..bba2e03f8d59 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + postPatch = '' + sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt + ''; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix deleted file mode 100644 index 839ddb9b76fb..000000000000 --- a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: - -stdenv.mkDerivation { - pname = "cpp-ipfs-api"; - version = "2017-01-04"; - - src = fetchFromGitHub { - owner = "vasild"; - repo = "cpp-ipfs-api"; - rev = "96a890f4518665a56581a2a52311eaa65928eac8"; - sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl ]; - propagatedBuildInputs = [ nlohmann_json ]; - - meta = with lib; { - description = "IPFS C++ API client library"; - homepage = "https://github.com/vasild/cpp-ipfs-api"; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix new file mode 100644 index 000000000000..44fcbe5463cb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: + +stdenv.mkDerivation { + pname = "cpp-ipfs-http-client"; + version = "unstable-2022-01-30"; + + src = fetchFromGitHub { + owner = "vasild"; + repo = "cpp-ipfs-http-client"; + rev = "3cdfa7fc6326e49fc81b3c7ca43ce83bdccef6d9"; + sha256 = "sha256-/oyafnk4SbrvoCh90wkZXNBjknMKA6EEUoEGo/amLUo="; + }; + + patches = [ ./unvendor-nlohmann-json.patch ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '# Fetch "JSON for Modern C++"' "include_directories(${nlohmann_json}/include)" + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; + propagatedBuildInputs = [ nlohmann_json ]; + + NIX_CFLAGS_COMPILE = [ + "-Wno-error=range-loop-construct" + ]; + + meta = with lib; { + description = "IPFS C++ API client library"; + homepage = "https://github.com/vasild/cpp-ipfs-http-client"; + license = licenses.mit; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch new file mode 100644 index 000000000000..e21b4e9a7a71 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch @@ -0,0 +1,27 @@ +--- source/CMakeLists.txt ++++ source/CMakeLists.txt +@@ -56,11 +56,6 @@ target_include_directories(${IPFS_API_LIBNAME} + ) + + # Fetch "JSON for Modern C++" +-include(FetchContent) +-message(STATUS "Fetching nlohmann/JSON") +-# Retrieve Nlohmann JSON +-FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz) +-FetchContent_MakeAvailable(json) + + # libcurl requires additional libs only for static Windows builds + if(WIN32) +@@ -71,12 +66,11 @@ set_target_properties(${IPFS_API_LIBNAME} PROPERTIES + SOVERSION ${PROJECT_VERSION_MAJOR} + VERSION ${PROJECT_VERSION} + ) +-target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS} nlohmann_json::nlohmann_json) ++target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS}) + if(NOT DISABLE_INSTALL) + install(TARGETS ${IPFS_API_LIBNAME} DESTINATION lib) + install(FILES include/ipfs/client.h DESTINATION include/ipfs) + install(FILES include/ipfs/http/transport.h DESTINATION include/ipfs/http) +- install(FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp DESTINATION include/nlohmann) + endif() + # Tests, use "CTEST_OUTPUT_ON_FAILURE=1 make test" to see output from failed tests diff --git a/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix b/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix index 6085a3c849cc..1effce915515 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix @@ -19,11 +19,6 @@ stdenv.mkDerivation rec { "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; - # The test driver binary lacks an RPath to the library's libs - preCheck = '' - export LD_LIBRARY_PATH=$PWD/libs/network/src - ''; - # Most tests make network GET requests to various websites doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index a3de08a838bc..6740f458725e 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.13.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R22nWkI778LpCK3a5C6tvuIsEXU49wPya1fFQxdpocg="; + sha256 = "sha256-i/ihEPJHyWzRywzpXhYpauA8lL51yjoiWod8Nc/6gV0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cpptoml/default.nix b/nixpkgs/pkgs/development/libraries/cpptoml/default.nix index a3528444c6a1..888af1c18631 100644 --- a/nixpkgs/pkgs/development/libraries/cpptoml/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpptoml/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { "-DCPPTOML_BUILD_EXAMPLES=OFF" ]; - outputs = [ "out" ]; - meta = with lib; { description = "C++ TOML configuration library"; homepage = "https://github.com/skystrife/cpptoml"; diff --git a/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/nixpkgs/pkgs/development/libraries/crc32c/default.nix index bfd7bee94b65..8790840c4c1d 100644 --- a/nixpkgs/pkgs/development/libraries/crc32c/default.nix +++ b/nixpkgs/pkgs/development/libraries/crc32c/default.nix @@ -28,9 +28,8 @@ stdenv.mkDerivation rec { "-DCRC32C_BUILD_TESTS=1" "-DCRC32C_BUILD_BENCHMARKS=0" "-DCRC32C_USE_GLOG=0" + "-DINSTALL_GTEST=0" "-DBUILD_SHARED_LIBS=${if staticOnly then "0" else "1"}" - ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; doCheck = false; @@ -44,20 +43,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - postInstallCheck = '' - # without removing these libraries, dependents will look for - # libgtest/libgmock etc here, which can result in link time errors - rm $out/lib/libg* - ''; - postFixup = '' - # dependents shouldn't be able to find gtest libraries as dependencies of - # this package - rm -r $out/lib/pkgconfig - - # remove GTest cmake config files - rm -r $out/lib/cmake/GTest - # fix bogus include paths for f in $(find $out/lib/cmake -name '*.cmake'); do substituteInPlace "$f" --replace "\''${_IMPORT_PREFIX}/$out/include" "\''${_IMPORT_PREFIX}/include" diff --git a/nixpkgs/pkgs/development/libraries/criterion/default.nix b/nixpkgs/pkgs/development/libraries/criterion/default.nix index a1e7137d92ab..723865ab11d3 100644 --- a/nixpkgs/pkgs/development/libraries/criterion/default.nix +++ b/nixpkgs/pkgs/development/libraries/criterion/default.nix @@ -27,9 +27,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; checkTarget = "criterion_tests test"; outputs = [ "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/crossguid/default.nix b/nixpkgs/pkgs/development/libraries/crossguid/default.nix new file mode 100644 index 000000000000..09d07064527a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/crossguid/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libuuid }: + +stdenv.mkDerivation rec { + pname = "crossguid"; + version = "unstable-2019-05-29"; + + src = fetchFromGitHub { + owner = "graeme-hill"; + repo = pname; + rev = "ca1bf4b810e2d188d04cb6286f957008ee1b7681"; + hash = "sha256-37tKPDo4lukl/aaDWWSQYfsBNEnDjE7t6OnEZjBhcvQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional stdenv.isLinux libuuid; + + meta = with lib; { + description = "Lightweight cross platform C++ GUID/UUID library"; + license = licenses.mit; + homepage = "https://github.com/graeme-hill/crossguid"; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ctl/default.nix b/nixpkgs/pkgs/development/libraries/ctl/default.nix deleted file mode 100644 index 0a9f50a6aaa6..000000000000 --- a/nixpkgs/pkgs/development/libraries/ctl/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: - -stdenv.mkDerivation rec { - pname = "ctl"; - version = "1.5.2"; - - src = fetchFromGitHub { - owner = "ampas"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx"; - }; - - patches = [ - (fetchpatch { - name = "ctl-1.5.2-ilm_230.patch"; - url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch"; - sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d"; - }) - ]; - - postPatch = '' - # Fix include guard name - substituteInPlace lib/dpx/dpx_raw.hh \ - --replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE - - # Fix undefined symbols (link with Imath) - substituteInPlace lib/IlmCtlMath/CMakeLists.txt \ - --replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)" - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libtiff ilmbase openexr ]; - - meta = with lib; { - description = "Color Transformation Language"; - homepage = "https://github.com/ampas/CTL"; - license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/ctpp2/default.nix b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix index 626606d0526d..c8bc708a2aa9 100644 --- a/nixpkgs/pkgs/development/libraries/ctpp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sed -ie 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/ctpp2json contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = false; # fails meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/curlcpp/default.nix b/nixpkgs/pkgs/development/libraries/curlcpp/default.nix deleted file mode 100644 index 9d4ae41f384f..000000000000 --- a/nixpkgs/pkgs/development/libraries/curlcpp/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl }: - -stdenv.mkDerivation rec { - pname = "curlcpp"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "JosephP91"; - repo = "curlcpp"; - rev = version; - sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl ]; - - meta = with lib; { - homepage = "https://josephp91.github.io/curlcpp/"; - description = "Object oriented C++ wrapper for CURL"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ rszibele ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix deleted file mode 100644 index 9f7d020feaf7..000000000000 --- a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook -, qtbase, libuuid, libcap, uwsgi, grantlee, pcre -}: - -stdenv.mkDerivation rec { - pname = "cutelyst"; - version = "2.14.2"; - - src = fetchFromGitHub { - owner = "cutelyst"; - repo = "cutelyst"; - rev = "v${version}"; - sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o="; - }; - - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ]; - - cmakeFlags = [ - "-DPLUGIN_UWSGI=ON" - "-DPLUGIN_STATICCOMPRESSED=ON" - "-DPLUGIN_CSRFPROTECTION=ON" - "-DPLUGIN_VIEW_GRANTLEE=ON" - ]; - - preBuild = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/Cutelyst:`pwd`/EventLoopEPoll" - ''; - - postBuild = '' - unset LD_LIBRARY_PATH - ''; - - meta = with lib; { - description = "C++ Web Framework built on top of Qt"; - homepage = "https://cutelyst.org/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/cwiid/default.nix b/nixpkgs/pkgs/development/libraries/cwiid/default.nix index 31a5420e375c..e640b6cbbbab 100644 --- a/nixpkgs/pkgs/development/libraries/cwiid/default.nix +++ b/nixpkgs/pkgs/development/libraries/cwiid/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "cwiid-${version}-git"; - version = "2010-02-21"; + pname = "cwiid"; + version = "unstable-2010-02-21"; src = fetchFromGitHub { owner = "abstrakraft"; diff --git a/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock b/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock new file mode 100644 index 000000000000..6714e2f8a474 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock @@ -0,0 +1,445 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-ast" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c380e0de48337007dfc91b09eb75f567f5f08209437857fbaabbaf2e77e830" +dependencies = [ + "serde", +] + +[[package]] +name = "clap" +version = "3.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54635806b078b7925d6e36810b1755f2a4b5b4d57560432c1ecf60bcbe10602b" +dependencies = [ + "bitflags", + "clap_lex", + "indexmap", + "strsim", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cxx" +version = "1.0.72" +dependencies = [ + "cc", + "cxx-build", + "cxx-gen", + "cxx-test-suite", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", + "rustversion", + "trybuild", +] + +[[package]] +name = "cxx-build" +version = "1.0.72" +dependencies = [ + "cc", + "codespan-reporting", + "cxx-gen", + "once_cell", + "pkg-config", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxx-gen" +version = "0.7.72" +dependencies = [ + "codespan-reporting", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "cxx-test-suite" +version = "0.0.0" +dependencies = [ + "cxx", + "cxx-build", + "cxxbridge-flags", +] + +[[package]] +name = "cxxbridge-cmd" +version = "1.0.72" +dependencies = [ + "clap", + "codespan-reporting", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.72" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.72" +dependencies = [ + "clang-ast", + "cxx", + "flate2", + "memmap", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn", +] + +[[package]] +name = "demo" +version = "0.0.0" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "dissimilar" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5" + +[[package]] +name = "flate2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + +[[package]] +name = "jobserver" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +dependencies = [ + "libc", +] + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "link-cplusplus" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8" +dependencies = [ + "cc", +] + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "os_str_bytes" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "proc-macro2" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustversion" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" + +[[package]] +name = "ryu" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "scratch" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96311ef4a16462c757bb6a39152c40f58f31cd2602a40fceb937e2bc34e6cbab" + +[[package]] +name = "serde" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" +dependencies = [ + "dissimilar", + "glob", + "once_cell", + "serde", + "serde_derive", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix b/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix new file mode 100644 index 000000000000..4294cdd646f7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix @@ -0,0 +1,54 @@ +{ cxx-rs, fetchFromGitHub, lib, rustPlatform, testers }: + +rustPlatform.buildRustPackage rec { + pname = "cxx-rs"; + version = "1.0.72"; + + src = fetchFromGitHub { + owner = "dtolnay"; + repo = "cxx"; + rev = version; + sha256 = "sha256-+OumeLSgz8kLQKhEc3icCk1q+X+S7Xt+XtAlkx8iguU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoBuildFlags = [ + "--workspace" + "--exclude=demo" + ]; + + postBuild = '' + cargo doc --release + ''; + + cargoTestFlags = [ "--workspace" ]; + + outputs = [ "out" "doc" "dev" ]; + + postInstall = '' + mkdir -p $doc + cp -r ./target/doc/* $doc + + mkdir -p $dev/include/rust + install -D -m 0644 ./include/cxx.h $dev/include/rust + ''; + + passthru.tests.version = testers.testVersion { + package = cxx-rs; + command = "cxxbridge --version"; + }; + + meta = with lib; { + description = "Safe FFI between Rust and C++"; + homepage = "https://github.com/dtolnay/cxx"; + license = licenses.mit; + maintainers = with maintainers; [ centromere ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cxxopts/default.nix b/nixpkgs/pkgs/development/libraries/cxxopts/default.nix index 9d3ea6f32de3..5d12b3c19ee3 100644 --- a/nixpkgs/pkgs/development/libraries/cxxopts/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxxopts/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - name = "cxxopts"; + pname = "cxxopts"; version = "3.0.0"; src = fetchFromGitHub { owner = "jarro2783"; - repo = name; + repo = "cxxopts"; rev = "v${version}"; sha256 = "08x7j168l1xwj0r3rv89cgghmfhsx98lpq35r3vkh504m1pd55a6"; }; diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch index 8662e812e995..f0376792e002 100644 --- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch +++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch @@ -1,12 +1,13 @@ ---- a/m4/sasl2.m4 2018-11-18 22:33:29.902625600 +0300 -+++ b/m4/sasl2.m4 2018-11-18 22:33:59.828746176 +0300 -@@ -339,7 +339,8 @@ - ], - [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) - AC_MSG_RESULT(yes) ], -- AC_MSG_RESULT(no)) -+ AC_MSG_RESULT(no), -+ AC_MSG_RESULT(no)) - LIBS="$cmu_save_LIBS" +diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 +index 098c853a..91d98def 100644 +--- a/m4/sasl2.m4 ++++ b/m4/sasl2.m4 +@@ -350,7 +350,7 @@ int main(void) - else + return (!have_spnego); // 0 = success, 1 = failure + } +-],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no]) ++],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no],[ac_cv_gssapi_supports_spnego=no]) + LIBS="$cmu_save_LIBS" + ]) + AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index 6e97c61a6a5e..be20a9b1678d 100644 --- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false -, buildPackages, pruneLibtoolFiles, fetchpatch }: +, buildPackages, pruneLibtoolFiles, nixosTests }: with lib; stdenv.mkDerivation rec { pname = "cyrus-sasl"; - version = "2.1.27"; + version = "2.1.28"; src = fetchurl { urls = @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz" ]; - sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; + sha256 = "sha256-fM/Gq9Ae1nwaCSSzU+Um8bdmsh9C1FYu5jWo6/xbs4w="; }; + patches = [ + # Fix cross-compilation + ./cyrus-sasl-ac-try-run-fix.patch + ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -26,16 +31,6 @@ stdenv.mkDerivation rec { ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isLinux pam; - patches = [ - ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 - ./cyrus-sasl-ac-try-run-fix.patch - (fetchpatch { - name = "CVE-2019-19906.patch"; - url = "https://sources.debian.org/data/main/c/cyrus-sasl2/2.1.27+dfsg-1+deb10u1/debian/patches/0021-CVE-2019-19906.patch"; - sha256 = "1n4c5wg7l9j8rlbvx8i605j5d39xmj5wm618k8acxl4fmglcmfls"; - }) - ]; - configureFlags = [ "--with-openssl=${openssl.dev}" "--with-plugindir=${placeholder "out"}/lib/sasl2" @@ -46,6 +41,10 @@ stdenv.mkDerivation rec { installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; + passthru.tests = { + inherit (nixosTests) parsedmarc postfix; + }; + meta = { homepage = "https://www.cyrusimap.org/sasl"; description = "Library for adding authentication support to connection-based protocols"; diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/nixpkgs/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch deleted file mode 100644 index da96818ca267..000000000000 --- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -Gentoo bug #458790 ---- a/include/sasl.h 2012-10-12 17:05:48.000000000 +0300 -+++ b/include/sasl.h 2013-02-23 16:56:44.648786268 +0200 -@@ -121,6 +121,9 @@ - #ifndef SASL_H - #define SASL_H 1 - -+/* stddef.h to get size_t defined */ -+#include <stddef.h> -+ - /* Keep in sync with win32/common.mak */ - #define SASL_VERSION_MAJOR 2 - #define SASL_VERSION_MINOR 1 diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index b39e09236096..180480985ac7 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -10,14 +10,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0bkps488h9s15ylvkm4fmfywgrpbw570glawpnv6khpq9n223dzl"; + sha256 = "sha256-RVr7NFVxY+6MBD8NV7eMW8TEWuCgcfqpula1o1VZe0o="; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { "-Denable_examples=${lib.boolToString withExamples}" ]; + doCheck = true; + meta = with lib; { description = "A cross-platform AV1 decoder focused on speed and correctness"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix index a3c5bbbf70be..075f2a67b70e 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -5,47 +5,42 @@ , pkg-config , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic -, systemd +, systemdMinimal , audit , libapparmor -, libX11 ? null -, libICE ? null -, libSM ? null -, x11Support ? (stdenv.isLinux || stdenv.isDarwin) , dbus , docbook_xml_dtd_44 , docbook-xsl-nons , xmlto , autoreconfHook , autoconf-archive +, x11Support ? (stdenv.isLinux || stdenv.isDarwin) +, xorg }: stdenv.mkDerivation rec { pname = "dbus"; - version = "1.12.20"; + version = "1.14.0"; src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp"; + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; + sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q="; }; patches = [ - # 'generate.consistent.ids=1' ensures reproducible docs, for further details see - # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html - # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189, - # expected in version 1.14 - ./docs-reproducible-ids.patch - # AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems - # to provide valid pkg-config files. This replace AC_PATH_XTRA with - # PKG_CHECK_MODULES. - # MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f + # Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS. + # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302 (fetchpatch { - url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch"; - sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2"; + url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/b551b3e9737958216a1a9d359150a4110a9d0549.patch"; + sha256 = "kOVjlklZzKvBZXmmrE1UiO4XWRoBLViGwdn6/eDH+DY="; }) ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch); postPatch = '' + # We need to generate the file ourselves. + # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/317 + rm doc/catalog.xml + substituteInPlace bus/Makefile.am \ --replace 'install-data-hook:' 'disabled:' \ --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' @@ -61,6 +56,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "doc" "man" ]; + strictDeps = true; nativeBuildInputs = [ autoreconfHook autoconf-archive @@ -75,11 +71,11 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optionals x11Support [ + lib.optionals x11Support (with xorg; [ libX11 libICE libSM - ] ++ lib.optional enableSystemd systemd + ]) ++ lib.optional enableSystemd systemdMinimal ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; # ToDo: optional selinux? @@ -97,7 +93,8 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ]; + ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] + ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ]; NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; @@ -105,6 +102,11 @@ stdenv.mkDerivation rec { doCheck = true; + makeFlags = [ + # Fix paths in XML catalog broken by mismatching build/install datadir. + "dtddir=${placeholder "out"}/share/xml/dbus-1" + ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" "datadir=${placeholder "out"}/share" diff --git a/nixpkgs/pkgs/development/libraries/dbus/docs-reproducible-ids.patch b/nixpkgs/pkgs/development/libraries/dbus/docs-reproducible-ids.patch deleted file mode 100644 index 2356b64d95cf..000000000000 --- a/nixpkgs/pkgs/development/libraries/dbus/docs-reproducible-ids.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in ---- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200 -+++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100 -@@ -870,8 +870,10 @@ - .PRECIOUS: Makefile - - -+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see -+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html - @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml --@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $< -+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $< - - @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml - @DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $< diff --git a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix index ce5c0b3b5772..125da383c8d1 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,4 +1,8 @@ -{ runCommand, writeText, libxslt, dbus +{ runCommand +, writeText +, libxslt +, dbus +, findXMLCatalogs , serviceDirectories ? [] , suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" , apparmor ? "disabled" # one of enabled, disabled, required @@ -14,19 +18,15 @@ runCommand "dbus-1" inherit serviceDirectories suidHelper apparmor; preferLocalBuild = true; allowSubstitutes = false; - XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' - <?xml version="1.0"?> - <!DOCTYPE catalog PUBLIC - "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" - "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> - <rewriteSystem - systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/" - rewritePrefix="file://${dbus}/share/xml/dbus-1/"/> - </catalog> - ''; - nativeBuildInputs = [ libxslt.bin ]; + nativeBuildInputs = [ + libxslt.bin + findXMLCatalogs + ]; + + buildInputs = [ + dbus.out + ]; } '' mkdir -p $out diff --git a/nixpkgs/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix index ea6d45e5dffc..11a80987dcab 100644 --- a/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dlib"; - version = "19.23"; + version = "19.24"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "sha256-88vusoLEkjh3WRh/PxPtsVIFk85serRq2VxVcEus3IE="; + sha256 = "sha256-YhIjP9TIIyQF6lBj85gyVRIAAwgIodzh0ViQL8v2ACA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix index 3de84b684e52..2e37e073fb65 100644 --- a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, python3 }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -11,7 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7"; }; - nativeBuildInputs = [ cmake python2 ]; + patches = [ + (fetchpatch { + name = "python3-for-tests"; + url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch"; + hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o="; + }) + ]; + + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = ["-DWITH_TESTS=ON"]; @@ -25,7 +33,7 @@ stdenv.mkDerivation rec { "@CMAKE_INSTALL_LIBDIR@" ''; - checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests"; + checkPhase = "python ./run_tests"; meta = with lib; { description = "C++11 port of docopt"; diff --git a/nixpkgs/pkgs/development/libraries/doctest/default.nix b/nixpkgs/pkgs/development/libraries/doctest/default.nix index 11a2906b5c0f..6c9281bda991 100644 --- a/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.7"; + version = "2.4.9"; src = fetchFromGitHub { - owner = "onqtam"; + owner = "doctest"; repo = "doctest"; - rev = version; - sha256 = "sha256-pXUg+NHSCKOudkmDCU3ePZrvs8DlM/CEZntEd78oTJ0="; + rev = "v${version}"; + sha256 = "sha256-ugmkeX2PN4xzxAZpWgswl4zd2u125Q/ADSKzqTfnd94="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { - homepage = "https://github.com/onqtam/doctest"; + homepage = "https://github.com/doctest/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; platforms = platforms.all; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/dotconf/default.nix b/nixpkgs/pkgs/development/libraries/dotconf/default.nix index 39d71eee432b..fed050f64b6e 100644 --- a/nixpkgs/pkgs/development/libraries/dotconf/default.nix +++ b/nixpkgs/pkgs/development/libraries/dotconf/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, stdenv, autoreconfHook }: stdenv.mkDerivation rec { - name = "dotconf-" + version; + pname = "dotconf"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix index 9efdcd0c4f07..d6a82d3c66d7 100644 --- a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix +++ b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "double-conversion"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "sha256-Vvzjg+UOgegkH8x2vtNU1TS01k5O4ilRJjD7F+BmVmU="; + sha256 = "sha256-vrh/dCuleE3fikryXX86XC/fdVV+j8HvIe4s/SRpNJw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/draco/default.nix b/nixpkgs/pkgs/development/libraries/draco/default.nix index d35e9a229a56..dfce8765062f 100644 --- a/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -16,14 +16,14 @@ let cmakeBool = b: if b then "ON" else "OFF"; in stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.3"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = version; - sha256 = "sha256-o6KQJFrnxx2kz6g3vXk1w435OmaJhAJjzsKM/gmVJ2M="; + sha256 = "sha256-LbWtZtgvZQdgwAGHVsouH6cAIVXP+9Q5n8KjzaBRrBQ="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/nixpkgs/pkgs/development/libraries/drumstick/default.nix index 69b330f5a48e..6d11d8bfc8a3 100644 --- a/nixpkgs/pkgs/development/libraries/drumstick/default.nix +++ b/nixpkgs/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-V57YnyeOVBXL5qjuCO1j1Ozy9CeaXxadw6ed1suUUIU="; + hash = "sha256-5O9yD3MexorJUm5tv6oghDb4J/b3SO10mDQR9dT2jlA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/dssi/default.nix b/nixpkgs/pkgs/development/libraries/dssi/default.nix index ca7ea10afffa..4f7891910a7d 100644 --- a/nixpkgs/pkgs/development/libraries/dssi/default.nix +++ b/nixpkgs/pkgs/development/libraries/dssi/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM - libsamplerate libtool autoconf automake xorgproto libICE pkg-config + libsamplerate libtool xorgproto libICE pkg-config ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix index 7d12d9fabf2f..d4d45713de25 100644 --- a/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , ninja , openssl @@ -16,33 +17,80 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-F5YOqDeY3rgcnuu5SNqOfUxhsaXgqvdJZTnD1unI0tc="; + sha256 = "sha256-pQ/t26dv9ZWLl0MHcAn0sgxryW2T2hM8XyOkXyfC5CY="; }; - patches = [ ./version.patch ]; + patches = [ + ./version.patch + (fetchpatch { + name = "fix-tpce-test.patch"; + url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch"; + sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU="; + }) + (fetchpatch { + name = "fix-list-type-metadata.patch"; + url = "https://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch"; + sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}" ''; cmakeFlags = [ + "-DBUILD_EXCEL_EXTENSION=ON" "-DBUILD_FTS_EXTENSION=ON" "-DBUILD_HTTPFS_EXTENSION=${enableFeature withHttpFs}" "-DBUILD_ICU_EXTENSION=ON" + "-DBUILD_JSON_EXTENSION=ON" "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" "-DBUILD_PARQUET_EXTENSION=ON" - "-DBUILD_REST_EXTENSION=ON" + "-DBUILD_REST=ON" + "-DBUILD_SUBSTRAIT_EXTENSION=ON" "-DBUILD_TPCDS_EXTENSION=ON" + "-DBUILD_TPCE=ON" "-DBUILD_TPCH_EXTENSION=ON" "-DBUILD_VISUALIZER_EXTENSION=ON" "-DJDBC_DRIVER=${enableFeature withJdbc}" ]; + doInstallCheck = true; + + preInstallCheck = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="$out/lib''${DYLD_LIBRARY_PATH:+:}''${DYLD_LIBRARY_PATH}" + ''; + + installCheckPhase = + let + excludes = map (pattern: "exclude:'${pattern}'") [ + "*test_slow" + "Test file buffers for reading/writing to file" + "[test_slow]" + "test/common/test_cast_hugeint.test" + "test/sql/copy/csv/test_csv_remote.test" + "test/sql/copy/parquet/test_parquet_remote.test" + "test/sql/copy/parquet/test_parquet_remote_foreign_files.test" + ] ++ lib.optionals stdenv.isAarch64 [ + "test/sql/aggregate/aggregates/test_kurtosis.test" + "test/sql/aggregate/aggregates/test_skewness.test" + "test/sql/function/list/aggregates/skewness.test" + ]; + in + '' + runHook preInstallCheck + + $PWD/test/unittest ${lib.concatStringsSep " " excludes} + + runHook postInstallCheck + ''; + nativeBuildInputs = [ cmake ninja ]; buildInputs = lib.optionals withHttpFs [ openssl ] ++ lib.optionals withJdbc [ openjdk11 ] diff --git a/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/nixpkgs/pkgs/development/libraries/eccodes/default.nix index 5182c59567da..b6d4cd29f7e1 100644 --- a/nixpkgs/pkgs/development/libraries/eccodes/default.nix +++ b/nixpkgs/pkgs/development/libraries/eccodes/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://confluence.ecmwf.int/display/ECC/"; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix index 74a6f21992b5..af358be31218 100644 --- a/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20210625"; # upgrade might break the sage interface + version = "20220621"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561 # for upstream's explanation of the above url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2"; - sha256 = "sha256-fA3MPz/L+Q39sA8wxAYOUowlHRcgOd8VF4tpsBGI6BA="; + sha256 = "sha256-EfoCNhnXGuN5SxgPFES4BaevhSRzU1JvT3ARq9NMJhM="; }; buildInputs = [ pari diff --git a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix index 3881f8f7ee38..83cde54f348e 100644 --- a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix +++ b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "sha256-rcmGVEcOtKTR8sVkHV7Xb+8NuKWUapYn+/Fswi4z6Mc="; + sha256 = "sha256-dbcEMtPnzF2t7O8YtKVUGSvJqb5WPMmmW+SyqOFnDY4="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index 2a71b82af3cb..b3bde19fed02 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.002"; + version = "2022.05.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; + sha256 = "sha256-IH5vJtZTL7cDc6/D7z04JVITr2He9lnCXa06MOT8o4s="; }; patches = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { preConfigure = '' export FC="mpifort" export CC="mpicc" + export CXX="mpicxx" + export CPP="cpp" # These need to be set for configure to succeed export FCFLAGS="${lib.optionalString stdenv.hostPlatform.isx86_64 "-msse3 " diff --git a/nixpkgs/pkgs/development/libraries/embree/default.nix b/nixpkgs/pkgs/development/libraries/embree/default.nix index 6417f4b05a1c..fb8db3a218e6 100644 --- a/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.3"; + version = "3.13.4"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-g6BsXMNUvx17hgAq0PewtBLgtWqpp03M0k6vWNapDKs="; + sha256 = "sha256-WmblxU1kHiC8+hYAfUDcbJ1/e80f1LcKX8qCwgaBwGc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/entt/default.nix b/nixpkgs/pkgs/development/libraries/entt/default.nix index c514e3d78003..7c87580aea11 100644 --- a/nixpkgs/pkgs/development/libraries/entt/default.nix +++ b/nixpkgs/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.9.0"; + version = "3.10.3"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-7UeL8D+A0pH3TKNO5B8A1nhD7uDWeirHnHaI/YKVwyo="; + sha256 = "sha256-pewAwvNRCBS6rm3AmHthiayGfP71lqkAO+x6rT957Xg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 7a79e597beb5..6fc48c2d4e44 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { patchShebangs ../test/ mkdir ../test/tmp - ${lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' + ${lib.optionalString stdenv.hostPlatform.isAarch '' # Fix tests on arm # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py @@ -87,6 +87,8 @@ stdenv.mkDerivation rec { substituteInPlace ../tests/bash_tests/testcases.py \ --replace "def io_test(self):" "def io_disabled(self):" ''} + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + export LC_ALL=C ''; # With CMake we have to enable samples or there won't be @@ -116,10 +118,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { - homepage = "https://www.exiv2.org/"; + homepage = "https://exiv2.org"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with maintainers; [ wegank ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix index ac54ced75b1b..f20abe0bfc35 100644 --- a/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -16,16 +16,20 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.6"; + version = "2.4.8"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3lV5S3qbwhSFL9wHW+quzYVO/hNhWX5iaO6HlGlRKJs="; + sha256 = "sha256-95uPkEt0nj4NIK/q3s+CScVbLjLU67CJrjeN9HncryU="; }; + strictDeps = true; + outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; + enableParallelBuilding = true; + configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool @@ -45,6 +49,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit python3; + inherit (python3.pkgs) xmltodict; inherit (haskellPackages) hexpat; inherit (perlPackages) XMLSAXExpat XMLParser; inherit (luaPackages) luaexpat; diff --git a/nixpkgs/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix index 396acbc1bdf2..8b1757ed5634 100644 --- a/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; + homepage = "https://sourceforge.net/projects/faac/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; + mainProgram = "faad"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/fastjson/default.nix b/nixpkgs/pkgs/development/libraries/fastjson/default.nix index 9c7f4893cbe4..e4a169ef8ba9 100644 --- a/nixpkgs/pkgs/development/libraries/fastjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/fastjson/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-2LyBdJR0dV1CElcGfrlmNwX52lVtx9X/Z4h/1XFjOIs="; }; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; preConfigure = '' sh autogen.sh diff --git a/nixpkgs/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix index baf2b1024379..f085f33827c3 100644 --- a/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.10"; + version = "22.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-gh/QYH25j9A+XalW6ajRjs+yOYEfkZmw11CHjR6LK1E="; + sha256 = "sha256-2XQpwPNWjK5FF9ex5QxrGEPsUXT/MBqjXy7P2D/SxZw="; }; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/fcft/default.nix b/nixpkgs/pkgs/development/libraries/fcft/default.nix index 31e9e2fbbbd7..9ed4df601d35 100644 --- a/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.0.1"; + version = "3.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx"; + sha256 = "1m7prc792dsd4mg6iqqwbfbmvs3a2yw2zmj0cd3qrf7h672b8snq"; }; depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/fcgi/default.nix b/nixpkgs/pkgs/development/libraries/fcgi/default.nix index 434d445ceb48..5c7f0c44f91c 100644 --- a/nixpkgs/pkgs/development/libraries/fcgi/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcgi/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A language independent, scalable, open extension to CG"; homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ license = "FastCGI see LICENSE.TERMS"; + mainProgram = "cgi-fcgi"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/fcppt/default.nix b/nixpkgs/pkgs/development/libraries/fcppt/default.nix index 380fdcce29f3..1a82a9289a61 100644 --- a/nixpkgs/pkgs/development/libraries/fcppt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcppt/default.nix @@ -1,19 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2 }: stdenv.mkDerivation rec { pname = "fcppt"; - version = "3.5.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "045cmn4sym6ria96l4fsc1vrs8l4xrl1gzkmja82f4ddj8qkji2f"; + sha256 = "1pcmi2ck12nanw1rnwf8lmyx85iq20897k6daxx3hw5f23j1kxv6"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost catch2 metal ]; + buildInputs = [ boost catch2 ]; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; + cmakeFlags = [ + "-DENABLE_BOOST=true" + "-DENABLE_EXAMPLES=true" + "-DENABLE_CATCH=true" + "-DENABLE_TEST=true" + ]; meta = with lib; { description = "Freundlich's C++ toolkit"; @@ -27,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://fcppt.org"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "x86_64-windows" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 134d9031e97e..4645e168451b 100644 --- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { + broken = stdenv.isDarwin; description = "Finite Field Linear Algebra Subroutines"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 9d9a1a126cb2..1bc3d49bea2f 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -49,8 +49,11 @@ , alsa-lib ? null # Alsa in/output support #, avisynth ? null # Support for reading AviSynth scripts , bzip2 ? null +, clang ? null , celt ? null # CELT decoder #, crystalhd ? null # Broadcom CrystalHD hardware acceleration +, cuda ? !stdenv.isDarwin && !stdenv.isAarch64 # Dynamically linked CUDA +, cuda-llvm ? !stdenv.isDarwin && !stdenv.isAarch64 # LLVM-based CUDA compilation , dav1d ? null # AV1 decoder (focused on speed and correctness) #, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support , fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder @@ -101,9 +104,12 @@ , libXext ? null # Xlib support , libxml2 ? null # libxml2 support, for IMF and DASH demuxers , xz ? null # xz-utils -, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support +, nv-codec-headers ? null +, nvdec ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVDEC support +, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support -#, opencl ? null # OpenCL code +, ocl-icd ? null # OpenCL ICD +, opencl-headers ? null # OpenCL headers , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering , openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering @@ -164,7 +170,7 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libnut libquvi nvenc opencl oss shine twolame + * libnut libquvi nvenc oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: @@ -255,6 +261,10 @@ stdenv.mkDerivation rec { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + '' + + # ffmpeg 5.1 https://trac.ffmpeg.org/ticket/9841 + '' + substituteInPlace tests/Makefile --replace 'include $(SRC_PATH)/tests/fate/imf.mak' "" ''; configurePlatforms = []; @@ -324,6 +334,8 @@ stdenv.mkDerivation rec { #(enableFeature avisynth "avisynth") (enableFeature (bzip2 != null) "bzlib") (enableFeature (celt != null) "libcelt") + (enableFeature cuda "cuda") + (enableFeature (clang != null && cuda-llvm) "cuda-llvm") #(enableFeature crystalhd "crystalhd") (enableFeature (dav1d != null) "libdav1d") #(enableFeature decklinkExtlib "decklink") @@ -375,9 +387,11 @@ stdenv.mkDerivation rec { (enableFeature libxcbshapeExtlib "libxcb-shape") (enableFeature (libxml2 != null) "libxml2") (enableFeature (xz != null) "lzma") + (enableFeature nvdec "cuvid") + (enableFeature nvdec "nvdec") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") - #(enableFeature opencl "opencl") + (enableFeature (ocl-icd != null && opencl-headers != null) "opencl") (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") #(enableFeature (opencv != null) "libopencv") (enableFeature openglExtlib "opengl") @@ -431,7 +445,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext libxml2 xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext libxml2 xz openal ocl-icd opencl-headers openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore zeromq4 zimg zlib openh264 ] ++ optionals openglExtlib [ libGL libGLU ] @@ -441,7 +455,8 @@ stdenv.mkDerivation rec { ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx - ++ optional nvenc nv-codec-headers + ++ optional (nvdec || nvenc) nv-codec-headers + ++ optional cuda-llvm clang ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration libiconv ]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch b/nixpkgs/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch deleted file mode 100644 index ac016069357d..000000000000 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001 -From: James Almer <jamrial@gmail.com> -Date: Sun, 16 Jan 2022 00:32:52 -0300 -Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest - -Signed-off-by: James Almer <jamrial@gmail.com> -(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345) ---- - tests/fate/ffmpeg.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak -index 0b00bb5b23..b80467d02e 100644 ---- a/tests/fate/ffmpeg.mak -+++ b/tests/fate/ffmpeg.mak -@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \ - -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \ - -f ac3 -flags +bitexact -c ac3_fixed - --FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ -+FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ - SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \ - ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \ - AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \ --- -2.33.1 - diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 516c7546f564..9e7dcfd751cb 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -6,8 +6,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.4.1"; + version = "4.4.2"; branch = version; - sha256 = "0hmck0placn12kd9l0wam70mrpgfs2nlfmi8krd135gdql5g5jcg"; + sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix index 7b79ddff77eb..22dbe293ef85 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix @@ -5,10 +5,14 @@ }@args: callPackage ./generic.nix (rec { - version = "5.0"; + version = "5.1"; branch = version; - sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0"; + sha256 = "sha256-MrVvsBzpDUUpWK4l6RyVZKv0ntVFPBJ77CPGPlMKqPo="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; - patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ]; + # Newly introduced IPFS support in ffmpeg 5.1 relies on untrusted third + # party services, leading to consent and privacy issues. See upstream + # discussion for more information: + # https://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299924.html + patches = [ ./ipfs-remove-default-gateway.patch ]; } // args) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 4eb614d6e653..855586649b74 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -238,8 +238,8 @@ stdenv.mkDerivation rec { a corporation. ''; license = licenses.gpl3; + maintainers = with maintainers; [ ]; platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; inherit branch knownVulnerabilities; }; } diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch b/nixpkgs/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch new file mode 100644 index 000000000000..e4b25a4b6cbf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch @@ -0,0 +1,37 @@ +A gateway can see everything, and we should not be shipping a hardcoded +default from a third party company; it's a security risk. + +Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> +--- + libavformat/ipfsgateway.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c +index 5a5178c563..907b61b017 100644 +--- a/libavformat/ipfsgateway.c ++++ b/libavformat/ipfsgateway.c +@@ -240,13 +240,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD + ret = populate_ipfs_gateway(h); + + if (ret < 1) { +- // We fallback on dweb.link (managed by Protocol Labs). +- snprintf(c->gateway_buffer, sizeof(c->gateway_buffer), "https://dweb.link"); +- +- av_log(h, AV_LOG_WARNING, +- "IPFS does not appear to be running. " +- "You’re now using the public gateway at dweb.link.\n"); +- av_log(h, AV_LOG_INFO, ++ av_log(h, AV_LOG_ERROR, ++ "IPFS does not appear to be running.\n\n" + "Installing IPFS locally is recommended to " + "improve performance and reliability, " + "and not share all your activity with a single IPFS gateway.\n" +@@ -259,6 +254,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD + "3. Define an $IPFS_PATH environment variable " + "and point it to the IPFS data path " + "- this is typically ~/.ipfs\n"); ++ ret = AVERROR(EINVAL); ++ goto err; + } + } + diff --git a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 9bfee290871f..cb7b8214c57d 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ffmpegthumbnailer"; - version = "unstable-2021-09-02"; + version = "unstable-2022-02-18"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; - rev = "d92e191dd793b12cee0a0f685f5a8d8252988399"; - sha256 = "1ysfq3g74b8ivivrdpfi4vm23d3cyc3rfla5i6y8q9aycis9xv6q"; + rev = "3db9fe895b2fa656bb40ddb7a62e27604a688171"; + sha256 = "0606pbg391l4s8mpyyalm9zrcnm75fwqdlrxy2gif9n21i2fm3rc"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/flann/default.nix b/nixpkgs/pkgs/development/libraries/flann/default.nix index c294aec893a5..ec1715b005ff 100644 --- a/nixpkgs/pkgs/development/libraries/flann/default.nix +++ b/nixpkgs/pkgs/development/libraries/flann/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch"; sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4="; }) + ] ++ lib.optionals (!stdenv.cc.isClang) [ # Avoid the bundled version of LZ4 and instead use the system one. (fetchpatch { url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch"; @@ -57,7 +58,8 @@ stdenv.mkDerivation rec { unzip ]; - propagatedBuildInputs = [ lz4 ]; + # lz4 unbundling broken for llvm, use internal version + propagatedBuildInputs = lib.optional (!stdenv.cc.isClang) lz4; buildInputs = lib.optionals enablePython [ python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/flatbuffers/1.12.nix b/nixpkgs/pkgs/development/libraries/flatbuffers/1.12.nix deleted file mode 100644 index 1ad490d3a01b..000000000000 --- a/nixpkgs/pkgs/development/libraries/flatbuffers/1.12.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ callPackage, fetchpatch, lib, stdenv }: - -callPackage ./generic.nix { - version = "1.12.0"; - sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; - - patches = [ - (fetchpatch { - # Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020. - # Should be included in the next release after 1.12.0 - url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch"; - sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s"; - excludes = [ "src/idl_gen_cpp.cpp" ]; - }) - (fetchpatch { - # Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020. - # Should be included in the next release after 1.12.0 - url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch"; - sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4"; - }) - ]; - - preConfigure = lib.optionalString stdenv.buildPlatform.isDarwin '' - rm BUILD - ''; -} diff --git a/nixpkgs/pkgs/development/libraries/flatbuffers/2.0.nix b/nixpkgs/pkgs/development/libraries/flatbuffers/2.0.nix deleted file mode 100644 index 27b661ee0900..000000000000 --- a/nixpkgs/pkgs/development/libraries/flatbuffers/2.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ callPackage, fetchpatch }: - -callPackage ./generic.nix { - version = "2.0.0"; - sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; - - patches = [ - # Pull patch pending upstream inclustion for gcc-12 support: - # https://github.com/google/flatbuffers/pull/6946 - (fetchpatch { - name = "gcc-12.patch"; - url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch"; - sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9"; - }) - ]; -} diff --git a/nixpkgs/pkgs/development/libraries/flatbuffers/generic.nix b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix index 1cdfb4b9c870..42e7c665f2b2 100644 --- a/nixpkgs/pkgs/development/libraries/flatbuffers/generic.nix +++ b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix @@ -2,29 +2,30 @@ , stdenv , fetchFromGitHub , cmake -, version -, sha256 -, patches ? [ ] -, preConfigure ? null +, python3 }: stdenv.mkDerivation rec { pname = "flatbuffers"; - inherit version; + version = "2.0.6"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - inherit sha256; + sha256 = "sha256-0bJ0n/5yzj6lHXLKJzHUS0Bnlmys+X7pY/3LGapVh6k="; }; - inherit patches preConfigure; + nativeBuildInputs = [ cmake python3 ]; - nativeBuildInputs = [ cmake ]; + postPatch = '' + # Fix default value of "test_data_path" to make tests work + substituteInPlace tests/test.cpp --replace '"tests/";' '"../tests/";' + ''; cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -38,9 +39,10 @@ stdenv.mkDerivation rec { access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. ''; - maintainers = [ maintainers.teh ]; + homepage = "https://google.github.io/flatbuffers/"; license = licenses.asl20; + maintainers = [ maintainers.teh ]; + mainProgram = "flatc"; platforms = platforms.unix; - homepage = "https://google.github.io/flatbuffers/"; }; } diff --git a/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/nixpkgs/pkgs/development/libraries/flatcc/default.nix index 6b40814119c6..488cb6846d08 100644 --- a/nixpkgs/pkgs/development/libraries/flatcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatcc/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=misleading-indentation" + "-Wno-error=stringop-overflow" + ]; + meta = { description = "FlatBuffers Compiler and Library in C for C "; homepage = "https://github.com/dvidelabs/flatcc"; diff --git a/nixpkgs/pkgs/development/libraries/flint/default.nix b/nixpkgs/pkgs/development/libraries/flint/default.nix index 6873508eb7dc..eeb2cf1127e4 100644 --- a/nixpkgs/pkgs/development/libraries/flint/default.nix +++ b/nixpkgs/pkgs/development/libraries/flint/default.nix @@ -13,11 +13,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa stdenv.mkDerivation rec { pname = "flint"; - version = "2.8.4"; + version = "2.9.0"; src = fetchurl { url = "https://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "sha256-Yd+S6oyOncaS1Gxx1/UKqgmjPUugjQKheEcwpEXl5L4="; + sha256 = "sha256-L8CQ1RAzyTII5sENQGOXpTyYOuU0O5WOsl9ypXpM52o="; }; buildInputs = [ @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { "--with-blas=${openblas}" ]; + enableParallelBuilding = true; + doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/fltk/common.nix b/nixpkgs/pkgs/development/libraries/fltk/common.nix index 06e1c05c7d07..426a85e6a220 100644 --- a/nixpkgs/pkgs/development/libraries/fltk/common.nix +++ b/nixpkgs/pkgs/development/libraries/fltk/common.nix @@ -36,19 +36,13 @@ , withDocs ? true , doxygen , graphviz -, texlive -, withExamples ? true +, withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform) , withShared ? true }: let onOff = value: if value then "ON" else "OFF"; - tex = texlive.combine { - inherit (texlive) - scheme-medium varwidth multirow hanging adjustbox collectbox stackengine - sectsty tocloft newunicodechar etoc; - }; in stdenv.mkDerivation rec { pname = "fltk"; @@ -81,7 +75,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withDocs [ doxygen graphviz - tex ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -146,13 +139,17 @@ stdenv.mkDerivation rec { # Examples & Tests "-DFLTK_BUILD_EXAMPLES=${onOff withExamples}" + "-DFLTK_BUILD_TEST=${onOff withExamples}" # Docs "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}" - "-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_BUILD_PDF_DOCUMENTATION=OFF" "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}" - "-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF" "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) '' diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 3fee016175bc..bec7860223af 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -23,7 +23,6 @@ let cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; doCheck = true; @@ -49,7 +48,7 @@ in }; fmt_8 = generic { - version = "8.0.1"; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; + version = "8.1.1"; + sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; }; } diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index dfc194f1d4cd..69e690011b8a 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -16,18 +16,19 @@ , xz , zlib , zstd +, jemalloc , follyMobile ? false }: stdenv.mkDerivation rec { pname = "folly"; - version = "2022.02.28.00"; + version = "2022.08.15.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g="; + sha256 = "sha256-GJYjilN2nwKEpuWj2NJQ25hT9lI2pdkWzgfLBph5mmU="; }; nativeBuildInputs = [ @@ -50,9 +51,12 @@ stdenv.mkDerivation rec { libunwind fmt_8 zstd - ]; + ] ++ lib.optional stdenv.isLinux jemalloc; + + # jemalloc headers are required in include/folly/portability/Malloc.h + propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; - NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" ]; + NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with lib; { @@ -60,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; maintainers = with maintainers; [ abbradar pierreis ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index 64e6f9a24767..6c0b8899a3f4 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -1,6 +1,5 @@ -{ lib, stdenv -, fetchpatch -, substituteAll +{ stdenv +, lib , fetchurl , pkg-config , python3 @@ -15,23 +14,15 @@ stdenv.mkDerivation rec { pname = "fontconfig"; - version = "2.13.94"; + version = "2.14.0"; + + outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config src = fetchurl { url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; - sha256 = "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55"; + sha256 = "3L64TJx0u/2xM9U1/hx77cnyIhqNrzkUuYTETFIOm6w="; }; - patches = [ - # Fix font style detection - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/92fbf14b0d7c4737ffe1e8326b7ab8ffae5548c3.patch"; - sha256 = "1wmyax2151hg3m11q61mv25k45zk2w3xapb4p1r6wzk91zjlsgyr"; - }) - ]; - - outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config - nativeBuildInputs = [ autoreconfHook gperf diff --git a/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix index 028ab6a75302..c239210163c2 100644 --- a/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix +++ b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { + broken = stdenv.isDarwin; branch = "1.6"; description = "A C++ based class library for building Graphical User Interfaces"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/fplll/default.nix b/nixpkgs/pkgs/development/libraries/fplll/default.nix index 7d4ff382d8c1..ba461b08f9e9 100644 --- a/nixpkgs/pkgs/development/libraries/fplll/default.nix +++ b/nixpkgs/pkgs/development/libraries/fplll/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-6Zde8/bPOQQ16DqhqrQuGXDrf5HQEn5lwxauvyBr4XQ="; + sha256 = "sha256-6pzErZtT5xzCMcsNy2EwrZHiAICLrRl1dv59bp23hAA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/nixpkgs/pkgs/development/libraries/freeglut/default.nix index 0e81e2188af3..21b2d117558b 100644 --- a/nixpkgs/pkgs/development/libraries/freeglut/default.nix +++ b/nixpkgs/pkgs/development/libraries/freeglut/default.nix @@ -1,23 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: +{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: stdenv.mkDerivation rec { pname = "freeglut"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; - sha256 = "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l"; + sha256 = "sha256-xZRKCC3wu6lrV1bd2x910M1yzie1OVxsHd6Fwv8pelA="; }; - patches = [ - (fetchpatch { - # upstream build fix against -fno-common compilers like >=gcc-10 - url = "https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c.patch"; - sha256 = "0j43vrnm22mz3r3c43szgcnil19cx9vcydzky9gwzqlyacr51swd"; - stripLen = 2; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/nixpkgs/pkgs/development/libraries/freeimage/default.nix index 2b4b174ca31b..807e96669c67 100644 --- a/nixpkgs/pkgs/development/libraries/freeimage/default.nix +++ b/nixpkgs/pkgs/development/libraries/freeimage/default.nix @@ -5,18 +5,23 @@ stdenv.mkDerivation { pname = "freeimage"; - version = "unstable-2020-07-04"; + version = "unstable-2021-11-01"; src = fetchsvn { url = "svn://svn.code.sf.net/p/freeimage/svn/"; - rev = "1859"; - sha256 = "1d94935aqbkb994nqkw7m8xcynyz9rm6k7k59igrbjak8b63qpi6"; + rev = "1900"; + sha256 = "rWoNlU/BWKZBPzRb1HqU6T0sT7aK6dpqKPe88+o/4sA="; }; - sourceRoot = "svn-r1859/FreeImage/trunk"; + sourceRoot = "svn-r1900/FreeImage/trunk"; # Ensure that the bundled libraries are not used at all - prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; - patches = [ ./unbundle.diff ]; + prePatch = '' + rm -rf Source/Lib* Source/OpenEXR Source/ZLib + ''; + patches = [ + ./unbundle.diff + ./libtiff-4.4.0.diff + ]; postPatch = '' # To support cross compilation, use the correct `pkg-config`. diff --git a/nixpkgs/pkgs/development/libraries/freeimage/libtiff-4.4.0.diff b/nixpkgs/pkgs/development/libraries/freeimage/libtiff-4.4.0.diff new file mode 100644 index 000000000000..13abd5dd7089 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/freeimage/libtiff-4.4.0.diff @@ -0,0 +1,15 @@ +Fix build with libtiff 4.4.0 by not using a private libtiff API. +Patch by Kurt Schwehr: https://sourceforge.net/p/freeimage/discussion/36109/thread/2018fdc6e7/ + +diff -ru a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp +--- a/Source/Metadata/XTIFF.cpp ++++ b/Source/Metadata/XTIFF.cpp +@@ -749,7 +749,7 @@ + continue; + } + // type of storage may differ (e.g. rationnal array vs float array type) +- if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) { ++ if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) { + // skip tag or _TIFFmemcpy will fail + continue; + } diff --git a/nixpkgs/pkgs/development/libraries/freeimage/unbundle.diff b/nixpkgs/pkgs/development/libraries/freeimage/unbundle.diff index 22dac720155a..99a7cfb4ca35 100644 --- a/nixpkgs/pkgs/development/libraries/freeimage/unbundle.diff +++ b/nixpkgs/pkgs/development/libraries/freeimage/unbundle.diff @@ -1,5 +1,5 @@ diff --git a/Makefile.fip b/Makefile.fip -index 660a026..86b3040 100644 +index 660a0265..86b30401 100644 --- a/Makefile.fip +++ b/Makefile.fip @@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib @@ -54,7 +54,7 @@ index 660a026..86b3040 100644 ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) diff --git a/Makefile.gnu b/Makefile.gnu -index a4f2601..be95476 100644 +index a4f26013..be954761 100644 --- a/Makefile.gnu +++ b/Makefile.gnu @@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib @@ -110,7 +110,7 @@ index a4f2601..be95476 100644 clean: rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) diff --git a/Makefile.osx b/Makefile.osx -index c39121d..3800e39 100644 +index c39121db..3800e39d 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -10,24 +10,25 @@ MACOSX_SYSROOT = $(shell xcrun --show-sdk-path) @@ -185,21 +185,21 @@ index c39121d..3800e39 100644 ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) diff --git a/Makefile.srcs b/Makefile.srcs -index 0b8d3a0..b706fd0 100644 +index 692c6e56..212195b2 100644 --- a/Makefile.srcs +++ b/Makefile.srcs @@ -1,6 +1,6 @@ VER_MAJOR = 3 VER_MINOR = 19.0 --SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzma.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/internal/dcraw_common.cpp Source/LibRawLite/internal/dcraw_fileio.cpp Source/LibRawLite/internal/demosaic_packs.cpp Source/LibRawLite/src/libraw_c_api.cpp Source/LibRawLite/src/libraw_cxx.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c --INCLS = ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Examples/Generic/FIIO_Mem.h ./Source/MapIntrospector.h ./Source/CacheFile.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/transupp.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jpegint.h ./Source/Plugin.h ./Source/Metadata/FreeImageTag.h ./Source/Metadata/FIRational.h ./Source/ToneMapping.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/uvcode.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffconf.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/types.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/FreeImageIO.h ./Source/FreeImage.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage/J2KHelper.h ./Source/ZLib/trees.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/zlib.h ./Source/ZLib/zconf.h ./Source/ZLib/inftrees.h ./Source/ZLib/zutil.h ./Source/ZLib/inffast.h ./Source/ZLib/crc32.h ./Source/ZLib/gzguts.h ./Source/ZLib/deflate.h ./Source/Quantizers.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/tgt.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/tcd.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_const.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibPNG/png.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngstruct.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngconf.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/image/encode/encode.h ./Source/Utilities.h ./Source/FreeImageToolkit/Resize.h ./Source/FreeImageToolkit/Filters.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h ./TestAPI/TestSuite.h +-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c +-INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/transupp.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/encode/encode.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/tgt.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngstruct.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_cameraids.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/tiffconf.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/uvcode.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/webp/types.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./Source/ZLib/crc32.h ./Source/ZLib/deflate.h ./Source/ZLib/gzguts.h ./Source/ZLib/inffast.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/inftrees.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/zutil.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h +SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp -+INCLS = ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Generic/FIIO_Mem.h ./Examples/Plugin/PluginCradle.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h ./TestAPI/TestSuite.h ./Source/FreeImage.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/Metadata/FreeImageTag.h ./Source/Metadata/FIRational.h ./Source/ToneMapping.h ./Source/FreeImageIO.h ./Source/Plugin.h ./Source/CacheFile.h ./Source/Utilities.h ./Source/MapIntrospector.h ./Source/Quantizers.h ++INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h -INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib +INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit diff --git a/Source/FreeImage.h b/Source/FreeImage.h -index e8f1da6..235563e 100644 +index 2dfb9ee2..d2d32322 100644 --- a/Source/FreeImage.h +++ b/Source/FreeImage.h @@ -155,8 +155,8 @@ typedef uint8_t BYTE; @@ -214,20 +214,20 @@ index e8f1da6..235563e 100644 // MS is not C99 ISO compliant typedef long BOOL; diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp -index 1776c3b..538f1c5 100644 +index 062b49ee..0e79fbc5 100644 --- a/Source/FreeImage/J2KHelper.cpp +++ b/Source/FreeImage/J2KHelper.cpp @@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include <openjpeg.h> - #include "J2KHelper.h" - - // -------------------------------------------------------------------------- + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include <openjpeg.h> + #include "J2KHelper.h" + + // -------------------------------------------------------------------------- diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp -index b286430..9bf3ada 100644 +index b2864303..9bf3ada9 100644 --- a/Source/FreeImage/PluginEXR.cpp +++ b/Source/FreeImage/PluginEXR.cpp @@ -28,16 +28,16 @@ @@ -258,7 +258,7 @@ index b286430..9bf3ada 100644 // ========================================================== diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp -index 0a083b4..e2f1241 100644 +index 4680aa32..7d4b5ce6 100644 --- a/Source/FreeImage/PluginG3.cpp +++ b/Source/FreeImage/PluginG3.cpp @@ -20,7 +20,7 @@ @@ -271,7 +271,7 @@ index 0a083b4..e2f1241 100644 #include "FreeImage.h" #include "Utilities.h" diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp -index b8bcfc8..621a903 100644 +index b8bcfc8b..621a9037 100644 --- a/Source/FreeImage/PluginJ2K.cpp +++ b/Source/FreeImage/PluginJ2K.cpp @@ -21,7 +21,7 @@ @@ -284,7 +284,7 @@ index b8bcfc8..621a903 100644 // ========================================================== diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp -index 742fe2c..c57f626 100644 +index 742fe2c0..c57f6267 100644 --- a/Source/FreeImage/PluginJP2.cpp +++ b/Source/FreeImage/PluginJP2.cpp @@ -21,7 +21,7 @@ @@ -297,7 +297,7 @@ index 742fe2c..c57f626 100644 // ========================================================== diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp -index 8db177d..a7de637 100644 +index 8db177d2..a7de6378 100644 --- a/Source/FreeImage/PluginJPEG.cpp +++ b/Source/FreeImage/PluginJPEG.cpp @@ -35,9 +35,9 @@ extern "C" { @@ -431,7 +431,7 @@ index 8db177d..a7de637 100644 Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) */ diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp -index 85c6ff3..163a93b 100644 +index 85c6ff3e..163a93bd 100644 --- a/Source/FreeImage/PluginJXR.cpp +++ b/Source/FreeImage/PluginJXR.cpp @@ -23,7 +23,7 @@ @@ -444,7 +444,7 @@ index 85c6ff3..163a93b 100644 // ========================================================== // Plugin Interface diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp -index 661f160..504fafe 100644 +index 661f1602..504fafe1 100644 --- a/Source/FreeImage/PluginPNG.cpp +++ b/Source/FreeImage/PluginPNG.cpp @@ -40,8 +40,8 @@ @@ -459,7 +459,7 @@ index 661f160..504fafe 100644 // ---------------------------------------------------------- diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp -index ab0499f..2d3c9fd 100644 +index 26134bcc..d7fa81e4 100644 --- a/Source/FreeImage/PluginRAW.cpp +++ b/Source/FreeImage/PluginRAW.cpp @@ -19,12 +19,16 @@ @@ -481,7 +481,7 @@ index ab0499f..2d3c9fd 100644 // Plugin Interface // ========================================================== diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp -index a805319..3e318ba 100644 +index 84554958..13a224dd 100644 --- a/Source/FreeImage/PluginTIFF.cpp +++ b/Source/FreeImage/PluginTIFF.cpp @@ -37,9 +37,9 @@ @@ -497,7 +497,7 @@ index a805319..3e318ba 100644 #include "FreeImageIO.h" #include "PSDParser.h" diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp -index 7c9f62f..c401447 100644 +index 7c9f62fd..c4014473 100644 --- a/Source/FreeImage/PluginWebP.cpp +++ b/Source/FreeImage/PluginWebP.cpp @@ -24,9 +24,9 @@ @@ -514,7 +514,7 @@ index 7c9f62f..c401447 100644 // ========================================================== // Plugin Interface diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp -index 3ab6d32..0973475 100644 +index 3ab6d321..09734755 100644 --- a/Source/FreeImage/ZLibInterface.cpp +++ b/Source/FreeImage/ZLibInterface.cpp @@ -19,10 +19,9 @@ @@ -540,7 +540,7 @@ index 3ab6d32..0973475 100644 memcpy(target + 4 + dest_len, &crc, 4); memcpy(target + 8 + dest_len, &source_size, 4); diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp -index 6f9ba8e..836bc90 100644 +index 6f9ba8e1..836bc901 100644 --- a/Source/FreeImageToolkit/JPEGTransform.cpp +++ b/Source/FreeImageToolkit/JPEGTransform.cpp @@ -26,10 +26,10 @@ extern "C" { @@ -559,26 +559,26 @@ index 6f9ba8e..836bc90 100644 #include "FreeImage.h" diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp -index d5be902..b6ecd11 100644 +index 6919a8e8..ce3d7c6b 100644 --- a/Source/Metadata/XTIFF.cpp +++ b/Source/Metadata/XTIFF.cpp @@ -29,7 +29,7 @@ - #pragma warning (disable : 4786) // identifier was truncated to 'number' characters - #endif - --#include "../LibTIFF4/tiffiop.h" + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + +-#include "../LibTIFF4/tiffiop.h" +#include <tiffiop.h> - - #include "FreeImage.h" - #include "Utilities.h" + + #include "FreeImage.h" + #include "Utilities.h" diff --git a/fipMakefile.srcs b/fipMakefile.srcs -index 15ec099..72ba4fb 100644 +index cc75e5e0..bedc9e3e 100644 --- a/fipMakefile.srcs +++ b/fipMakefile.srcs @@ -1,4 +1,4 @@ VER_MAJOR = 3 VER_MINOR = 19.0 --SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzma.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/internal/dcraw_common.cpp Source/LibRawLite/internal/dcraw_fileio.cpp Source/LibRawLite/internal/demosaic_packs.cpp Source/LibRawLite/src/libraw_c_api.cpp Source/LibRawLite/src/libraw_cxx.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp +-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp -INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -IWrapper/FreeImagePlus +SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp +INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -IWrapper/FreeImagePlus diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index 5dfd56370022..9d94fe0c44ec 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -7,16 +7,31 @@ # LCD filtering is also known as ClearType and covered by several Microsoft patents. # This option allows it to be disabled. See http://www.freetype.org/patents.html. useEncumberedCode ? true + +# for passthru.tests +, cairo +, fontforge +, ghostscript +, graphicsmagick +, gtk3 +, harfbuzz +, imagemagick +, pango +, poppler +, python3 +, qt5 +, texmacs +, ttfautohint }: stdenv.mkDerivation rec { pname = "freetype"; - version = "2.11.1"; + version = "2.12.1"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MzOufP2ohCnJenrmO30BqzmAdsO2cYLpYOVoQFDyxcg="; + sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8="; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype @@ -52,6 +67,23 @@ stdenv.mkDerivation rec { --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; + passthru.tests = { + inherit + cairo + fontforge + ghostscript + graphicsmagick + gtk3 + harfbuzz + imagemagick + pango + poppler + texmacs + ttfautohint; + inherit (python3.pkgs) freetype-py; + inherit (qt5) qtbase; + }; + meta = with lib; { description = "A font rendering engine"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/nixpkgs/pkgs/development/libraries/fribidi/default.nix index 3549368fecbc..3dae39b3c38a 100644 --- a/nixpkgs/pkgs/development/libraries/fribidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/fribidi/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "fribidi"; - version = "1.0.11"; + version = "1.0.12"; outputs = [ "out" "devdoc" ]; # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MPk+nGPuYn0aLO3PWaw01FvzAkCYL5nkTG4BVGa05z0="; + sha256 = "sha256-DNIz+X/IxnuzrCfOhEDe9dP/rPUWdluRwsxlRJgpNJU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/ftxui/default.nix b/nixpkgs/pkgs/development/libraries/ftxui/default.nix index 27a21ceca665..68679d262bed 100644 --- a/nixpkgs/pkgs/development/libraries/ftxui/default.nix +++ b/nixpkgs/pkgs/development/libraries/ftxui/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , graphviz @@ -8,21 +9,34 @@ stdenv.mkDerivation rec { pname = "ftxui"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; - repo = pname; + repo = "ftxui"; rev = "v${version}"; - sha256 = "sha256-BfNUk2DbBpKMBEu1tQWl85tgjB/4NAh86VVSS9zAjKo="; + sha256 = "sha256-2pCk4drYIprUKcjnrlX6WzPted7MUAp973EmAQX3RIE="; }; + patches = [ + # Can be removed once https://github.com/ArthurSonzogni/FTXUI/pull/403 hits a stable release + (fetchpatch { + name = "fix-postevent-segfault.patch"; + url = "https://github.com/ArthurSonzogni/FTXUI/commit/f9256fa132e9d3c50ef1e1eafe2774160b38e063.patch"; + sha256 = "sha256-0040/gJcCXzL92FQLhZ2dNMJhNqXXD+UHFv4Koc07K0="; + }) + ]; + nativeBuildInputs = [ cmake doxygen graphviz ]; + cmakeFlags = [ + "-DFTXUI_BUILD_EXAMPLES=OFF" + ]; + # gtest and gbenchmark don't seem to generate any binaries doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/galario/default.nix b/nixpkgs/pkgs/development/libraries/galario/default.nix index 7fb93a61a0fe..ac7e4f4255e8 100644 --- a/nixpkgs/pkgs/development/libraries/galario/default.nix +++ b/nixpkgs/pkgs/development/libraries/galario/default.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} ''; + cmakeFlags = lib.optionals enablePython [ + # RPATH of binary /nix/store/.../lib/python3.10/site-packages/galario/double/libcommon.so contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = true; postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' diff --git a/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix b/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix index 8fcb5b2230e0..3927e6e428a8 100644 --- a/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GameNetworkingSockets"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = pname; rev = "v${version}"; - sha256 = "1d3k1ciw8c8rznxsr4bfmw0f0srblpflv8xqavhcxx2zwvaya78c"; + sha256 = "12741wmpvy7mcvqqmjg4a7ph75rwliwgclhk4imjijqf2qkvsphd"; }; nativeBuildInputs = [ cmake ninja go ]; diff --git a/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix index b9b7db729eba..094bb7e7a1d3 100644 --- a/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix @@ -4,7 +4,7 @@ }: stdenvNoLibs.mkDerivation rec { - name = "libgcc-${version}"; + pname = "libgcc"; inherit (gcc.cc) src version; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix index b277a52a6583..6c1c3de08a2e 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -16,7 +16,7 @@ , openssh , systemd , gobject-introspection -, makeWrapper +, wrapGAppsHook , libxslt , vala , gnome @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection libxslt - makeWrapper + wrapGAppsHook vala shared-mime-info ]; @@ -96,11 +96,6 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/nixpkgs/pkgs/development/libraries/gdal/2.4.nix b/nixpkgs/pkgs/development/libraries/gdal/2.4.nix index 0e57160f1947..5d6e99e8bd7f 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/2.4.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, fetchpatch, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, python3Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 @@ -16,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; + patches = [ + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/7a18e2669a733ebe3544e4f5c735fd4d2ded5fa3.patch"; + sha256 = "sha256-rBgIxJcgRzZR1gyzDWK/Sh7MdPWeczxEYVELbYEV8JY="; + relative = "gdal"; + # this doesn't apply correctly because of line endings + excludes = [ "third_party/LercLib/Lerc2.h" ]; + }) + ]; + buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with python3Packages; [ python numpy wrapPython ]) diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index bfa1c75b483f..bec478c66bd9 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -86,6 +86,46 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doInstallCheck = true; + # preCheck rather than preInstallCheck because this is what pytestCheckHook + # calls (coming from the python world) + preCheck = '' + pushd ../autotest + # something has made files here read-only by this point + chmod -R u+w . + + export HOME=$(mktemp -d) + export PYTHONPATH="$out/${pythonPackages.python.sitePackages}:$PYTHONPATH" + ''; + installCheckInputs = with pythonPackages; [ + pytestCheckHook + pytest-env + lxml + ]; + disabledTestPaths = [ + # tests that attempt to make network requests + "gcore/vsis3.py" + "gdrivers/gdalhttp.py" + "gdrivers/wms.py" + ]; + disabledTests = [ + # tests that attempt to make network requests + "test_jp2openjpeg_45" + # tests that require the full proj dataset which we don't package yet + # https://github.com/OSGeo/gdal/issues/5523 + "test_transformer_dem_overrride_srs" + "test_osr_ct_options_area_of_interest" + ] ++ lib.optionals (!stdenv.isx86_64) [ + # likely precision-related expecting x87 behaviour + "test_jp2openjpeg_22" + ] ++ lib.optionals stdenv.isDarwin [ + # flaky on macos + "test_rda_download_queue" + ]; + postCheck = '' + popd # ../autotest + ''; + meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; diff --git a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix deleted file mode 100644 index 21cb79ba8158..000000000000 --- a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchsvn, pkg-config, mono, dotnetPackages }: - -let - newtonsoft-json = dotnetPackages.NewtonsoftJson; -in stdenv.mkDerivation { - pname = "gdata-sharp"; - version = "2.2.0.0"; - - src = fetchsvn { - url = "http://google-gdata.googlecode.com/svn/trunk/"; - rev = "1217"; - sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mono newtonsoft-json ]; - - sourceRoot = "svn-r1217/clients/cs"; - - dontStrip = true; - - postPatch = '' - sed -i -e 's#^\(DEFINES=.*\)\(.\)#\1 /r:third_party/Newtonsoft.Json.dll\2#' Makefile - # carriage return ^ - ''; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - homepage = "https://code.google.com/archive/p/google-gdata/"; - - description = "The Google Data APIs"; - longDescription = '' - The Google Data APIs provide a simple protocol for reading and writing - data on the web. - ''; - - license = licenses.asl20; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/nixpkgs/pkgs/development/libraries/gdcm/default.nix index de7bf815b044..59559051e65e 100644 --- a/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.11"; + version = "3.0.15"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-rGR0yQImLG3kBp6/QoEMLFrFtgAIN6y9lZ3OmtAUVcY="; + sha256 = "sha256-kyazfsm0lGgz26PWJUyFRmFxQFxmotDPXrwx3N/EVl0="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index 1e9c881ae8ce..ff8ace9613fc 100644 --- a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -16,22 +16,18 @@ , libjpeg , libpng , gnome +, gobject-introspection +, buildPackages , doCheck ? false , makeWrapper , lib -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) -, gobject-introspection }: -let - withGtkDoc = stdenv.buildPlatform == stdenv.hostPlatform; -in stdenv.mkDerivation rec { pname = "gdk-pixbuf"; version = "2.42.8"; - outputs = [ "out" "dev" "man" ] - ++ lib.optional withGtkDoc "devdoc" + outputs = [ "out" "dev" "man" "devdoc" ] ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; src = fetchurl { @@ -60,6 +56,7 @@ stdenv.mkDerivation rec { makeWrapper glib gi-docgen + gobject-introspection # for man pages libxslt @@ -67,10 +64,10 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames - ] ++ lib.optionals withIntrospection [ - gobject-introspection ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ glib libtiff @@ -79,9 +76,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withGtkDoc}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgio_sniffing=false" + "-Dgtk_doc=true" ]; postPatch = '' @@ -89,10 +85,13 @@ stdenv.mkDerivation rec { patchShebangs build-aux substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" - ''; - preInstall = '' - PATH=$PATH:$out/bin # for install script + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + substituteInPlace docs/meson.build \ + --replace "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" ''; postInstall = @@ -108,9 +107,9 @@ stdenv.mkDerivation rec { install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ - $dev/bin/gdk-pixbuf-query-loaders --update-cache + ${stdenv.hostPlatform.emulator buildPackages} $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The fixDarwinDylibNames hook doesn't patch binaries. @@ -120,7 +119,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = lib.optionalString withGtkDoc '' + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" ''; @@ -149,8 +148,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; - maintainers = [ maintainers.eelco ] ++ teams.gnome.members; license = licenses.lgpl21Plus; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; + mainProgram = "gdk-pixbuf-thumbnailer"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/gecode/3.nix b/nixpkgs/pkgs/development/libraries/gecode/3.nix index 5c660a99ef84..685baea4a4ca 100644 --- a/nixpkgs/pkgs/development/libraries/gecode/3.nix +++ b/nixpkgs/pkgs/development/libraries/gecode/3.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, bash, perl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, perl +}: stdenv.mkDerivation rec { pname = "gecode"; @@ -9,11 +14,16 @@ stdenv.mkDerivation rec { sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; }; - nativeBuildInputs = [ bash perl ]; + patches = [ + (import ./fix-const-weights-clang-patch.nix fetchpatch) + ]; + + nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs configure"; meta = with lib; { + broken = stdenv.isDarwin; license = licenses.mit; homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; diff --git a/nixpkgs/pkgs/development/libraries/gecode/default.nix b/nixpkgs/pkgs/development/libraries/gecode/default.nix index fc9835d85db5..57bac2295139 100644 --- a/nixpkgs/pkgs/development/libraries/gecode/default.nix +++ b/nixpkgs/pkgs/development/libraries/gecode/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, bison +, flex +, perl +, gmp +, mpfr +, qtbase +, enableGist ? true +}: stdenv.mkDerivation rec { pname = "gecode"; @@ -11,6 +22,10 @@ stdenv.mkDerivation rec { sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"; }; + patches = [ + (import ./fix-const-weights-clang-patch.nix fetchpatch) + ]; + enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ bison flex ]; diff --git a/nixpkgs/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix b/nixpkgs/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix new file mode 100644 index 000000000000..77160283afee --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix @@ -0,0 +1,7 @@ +fetchpatch: +# https://github.com/Gecode/gecode/pull/74 +(fetchpatch { + name = "fix-const-weights-clang.patch"; + url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; + sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; +}) diff --git a/nixpkgs/pkgs/development/libraries/gegl/default.nix b/nixpkgs/pkgs/development/libraries/gegl/default.nix index df1b86fd1b78..fb50c2c8fc07 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.36"; + version = "0.4.38"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY="; + sha256 = "sha256-5KM8hDClBC+6hDm1lTSOcYcPDZX7+IX/VT+QIMG+11A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index 90fe46582672..48e2d4fd8fb3 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow="; + sha256 = "sha256-g1o/udsIFLJ+gunvI2QtsnksPaa946jWKkcdmdGmQ/k="; }; passthru = { @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/ser2net/"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; + mainProgram = "gensiot"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/nixpkgs/pkgs/development/libraries/geoclue/default.nix index 410c0afd8a65..d7b417ac09e9 100644 --- a/nixpkgs/pkgs/development/libraries/geoclue/default.nix +++ b/nixpkgs/pkgs/development/libraries/geoclue/default.nix @@ -4,6 +4,7 @@ , fetchpatch , intltool , meson +, mesonEmulatorHook , ninja , pkg-config , gtk-doc @@ -74,6 +75,8 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_412 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -81,6 +84,7 @@ stdenv.mkDerivation rec { json-glib libsoup avahi + gobject-introspection ] ++ lib.optionals withDemoAgent [ libnotify gdk-pixbuf ] ++ lib.optionals (!stdenv.isDarwin) [ @@ -113,6 +117,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin && withDemoAgent; description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin ]; diff --git a/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix index 458e0d59a0d5..b55b5c19228a 100644 --- a/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix @@ -1,37 +1,84 @@ -{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, gettext +, gtk-doc +, docbook-xsl-nons +, gobject-introspection +, gnome +, libsoup +, json-glib +, glib +, nixosTests +}: stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.2"; + version = "3.26.3"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; + url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz"; + sha256 = "Hf6ug7kOzMobbPfc98XjsxeCjPC1YgXERx7w+RGZl2Y="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ]; - buildInputs = [ glib libsoup json-glib ]; - patches = [ ./installed-tests-path.patch + + # Install data for pi test. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/0eb5c21cf4deb2c45aedf5a4393d4208b8dc6d58.patch"; + sha256 = "DmaPzGEu7f+gjjb2HSZ3+ZMc4EJSsba9ufsVysB0UPA="; + }) + # Fix pi test. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/464bb3bae5525566a7f41d157f73575cc4f3b5f8.patch"; + sha256 = "qSjXR8eKl+E38Zp7/Kgge/FxOLHYUJgRSR68okc3No0="; + postFetch = '' + substituteInPlace $out --replace "LC_MESSAGES" "LC_ALL" + ''; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gtk-doc + docbook-xsl-nons + gobject-introspection ]; - postPatch = '' - substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests" - ''; + buildInputs = [ + glib + libsoup + json-glib + ]; + + mesonFlags = [ + "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; passthru = { updateScript = gnome.updateScript { packageName = pname; }; + tests = { + installed-tests = nixosTests.installed-tests.geocode-glib; + }; }; meta = with lib; { description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch index 499c68008088..c68b7a3a75c3 100644 --- a/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch +++ b/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch @@ -1,8 +1,20 @@ --- a/geocode-glib/tests/meson.build +++ b/geocode-glib/tests/meson.build @@ -1,4 +1,4 @@ --install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib' -+install_dir = '@installedTests@/libexec/installed-tests/geocode-glib' +-install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name ++install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name e = executable('geo-uri', 'geo-uri.c', +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,6 +1,9 @@ + option('enable-installed-tests', + type: 'boolean', value: true, + description: 'Build & install test programs') ++option('installed_test_prefix', ++ type: 'string', value: '', ++ description: 'Prefix for installed tests') + option('enable-introspection', + type: 'boolean', value: true, + description: 'Whether to enable the introspection generation') diff --git a/nixpkgs/pkgs/development/libraries/geoip/default.nix b/nixpkgs/pkgs/development/libraries/geoip/default.nix index 8747433047c6..4b12871e5567 100644 --- a/nixpkgs/pkgs/development/libraries/geoip/default.nix +++ b/nixpkgs/pkgs/development/libraries/geoip/default.nix @@ -1,24 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook , drvName ? "geoip" -# in geoipDatabase, you can insert a package defining -# "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy + # in geoipDatabase, you can insert a package defining + # "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy , geoipDatabase ? "/var/lib/geoip-databases" }: let - dataDir = if lib.isDerivation geoipDatabase + dataDir = + if lib.isDerivation geoipDatabase then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; + in stdenv.mkDerivation rec { pname = drvName; version = "1.6.12"; src = fetchFromGitHub { - owner = "maxmind"; - repo = "geoip-api-c"; - rev = "v${version}"; + owner = "maxmind"; + repo = "geoip-api-c"; + rev = "v${version}"; sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; @@ -35,11 +40,13 @@ stdenv.mkDerivation rec { find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; + passthru = { inherit dataDir; }; + meta = with lib; { description = "An API for GeoIP/Geolocation databases"; maintainers = with maintainers; [ thoughtpolice raskin ]; - license = licenses.lgpl21; - platforms = platforms.unix; - homepage = "https://www.maxmind.com"; + license = licenses.lgpl21; + platforms = platforms.unix; + homepage = "https://www.maxmind.com"; }; } diff --git a/nixpkgs/pkgs/development/libraries/geos/3.9.nix b/nixpkgs/pkgs/development/libraries/geos/3.9.nix new file mode 100644 index 000000000000..fd0531fa747f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/geos/3.9.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "geos"; + version = "3.9.2"; + + src = fetchurl { + url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; + }; + + enableParallelBuilding = true; + + # https://trac.osgeo.org/geos/ticket/993 + configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + + meta = with lib; { + description = "C++ port of the Java Topology Suite (JTS)"; + homepage = "https://trac.osgeo.org/geos"; + license = licenses.lgpl21Only; + maintainers = with lib.maintainers; [ + willcohen + ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index 355e9e5f07ff..cfcccc571818 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,22 +1,26 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake }: stdenv.mkDerivation rec { pname = "geos"; - version = "3.9.1"; + version = "3.11.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; - sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo="; + sha256 = "sha256-eauMq/SqhgTRYVV7UuPk2EV1rNwNCMsJqz96rvpNhYo="; }; - enableParallelBuilding = true; - - # https://trac.osgeo.org/geos/ticket/993 - configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + maintainers = with lib.maintainers; [ + willcohen + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index 7b23b58c1922..62bc0374494b 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz }: +{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -52,12 +52,14 @@ stdenv.mkDerivation rec { sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in ''; + strictDeps = true; nativeBuildInputs = [ xz xz.bin ]; + buildInputs = [ bash ] # HACK, see #10874 (and 14664) - buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; + ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ libiconv ]; setupHooks = [ ../../../build-support/setup-hooks/role.bash diff --git a/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix index 025423ecd8a4..687b74fdb3ad 100644 --- a/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: stdenv.mkDerivation rec { + pname = "ggz-base-libs"; version = "0.99.5"; - baseName = "ggz-base-libs"; - name = "${baseName}-snapshot-${version}"; src = fetchurl { - url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/${name}.tar.gz"; + url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-${version}.tar.gz"; sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk"; }; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace configure \ --replace "/usr/local/ssl/include" "${openssl.dev}/include" \ - --replace "/usr/local/ssl/lib" "${openssl.out}/lib" + --replace "/usr/local/ssl/lib" "${lib.getLib openssl}/lib" ''; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix b/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix index 0ffad301a493..3232d7d8f615 100644 --- a/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix +++ b/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "filesystem"; - version = "1.5.6"; + version = "1.5.12"; src = fetchFromGitHub { owner = "gulrak"; repo = "filesystem"; rev = "v${version}"; - hash = "sha256-qnBZ9aCrCPOgxymjbzrRs0gssijo8MJOMiy7QWWMb5c="; + hash = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/givaro/3.7.nix b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix index a9b6325c3d71..7ca154f18e06 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/3.7.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/370/givaro-${version}.tar.gz"; sha256 = "0lf5cnbyr27fw7klc3zabkb1979dn67jmrjz6pa3jzw2ng74x9b3"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool gmpxx]; + nativeBuildInputs = [ autoreconfHook autoconf automake ]; + buildInputs = [libtool gmpxx]; meta = { description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; diff --git a/nixpkgs/pkgs/development/libraries/givaro/3.nix b/nixpkgs/pkgs/development/libraries/givaro/3.nix index 1bfe7682ffa7..f52f23d15c12 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/3.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/3.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/592/givaro-${version}.tar.gz"; sha256 = "1822ksv8653a84hvcz0vxl3nk8dqz7d41ys8rplq0zjjmvb2i5yq"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool gmpxx]; + nativeBuildInputs = [ autoreconfHook autoconf automake ]; + buildInputs = [libtool gmpxx]; meta = { description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index 83f7854a73b0..5f9f49f239d9 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool]; + nativeBuildInputs = [ autoreconfHook autoconf automake ]; + buildInputs = [libtool]; propagatedBuildInputs = [ gmpxx ]; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix index 42ba3bd46df8..9d621e584860 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -12,6 +12,7 @@ , pango , cairo , readline +, libsysprof-capture , glib , libxml2 , dbus @@ -30,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.72.0"; + version = "1.72.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PvDK9xbjkg3WH3dI9tVuR2zA/Bg1GtBUjn3xoKub3K0="; + sha256 = "sha256-F8Cx7D8JZnH/i/q6bku/FBmMcBPGBL/Wd6mFjaB5wKs="; }; patches = [ @@ -60,6 +61,7 @@ in stdenv.mkDerivation rec { gobject-introspection cairo readline + libsysprof-capture spidermonkey_91 dbus # for dbus-run-session ]; @@ -73,7 +75,6 @@ in stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dprofiler=disabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; diff --git a/nixpkgs/pkgs/development/libraries/gl3w/default.nix b/nixpkgs/pkgs/development/libraries/gl3w/default.nix new file mode 100644 index 000000000000..b79c83cbf155 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gl3w/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }: + +stdenv.mkDerivation rec { + pname = "gl3w"; + version = "unstable-2022-03-24"; + + src = fetchFromGitHub { + owner = "skaslev"; + repo = pname; + rev = "5f8d7fd191ba22ff2b60c1106d7135bb9a335533"; + hash = "sha256-qV/PZmaP5iCHhIzTA2bE4d1RMB6LzRbTsB5gWVvi9bU="; + }; + + nativeBuildInputs = [ python3 cmake ]; + # gl3w installs a CMake config that when included expects to be able to + # build and link against both of these libraries + # (the gl3w generated C file gets compiled into the downstream target) + propagatedBuildInputs = [ libglvnd libGLU ]; + + dontUseCmakeBuildDir = true; + + # These files must be copied rather than linked since they are considered + # outputs for the custom command, and CMake expects to be able to touch them + preConfigure = '' + mkdir -p include/{GL,KHR} + cp ${libglvnd.dev}/include/GL/glcorearb.h include/GL/glcorearb.h + cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h + ''; + + meta = with lib; { + description = "Simple OpenGL core profile loading"; + homepage = "https://github.com/skaslev/gl3w"; + license = licenses.unlicense; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 53409ec7f732..3aedaab5658c 100644 --- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -6,19 +6,18 @@ }: stdenv.mkDerivation rec { - version = "3.3.6"; + version = "3.3.7"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-mYcnucIRudLLySShKSDzsQfuoM2/0guKpeLSGuAWEkQ="; + sha256 = "sha256-aWwt6FRq/ofQmZAeavDa8inrJfrPxb8iyo1XYdQsrKc="; }; - # Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711) - # and linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = if waylandSupport then ./wayland.patch else ./x11.patch; + # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) + patches = lib.optional (!waylandSupport) ./x11.patch; propagatedBuildInputs = [ libGL ]; diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index fce73f74660e..489e92648a99 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.72.0"; + version = "2.72.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs="; + sha256 = "zSoITHu5HXjoSftV1A5HL22PaGLN3J8Sw5FJNZuhgmg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index ecae47b3d2dd..8fb12fc0203a 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.72.0"; + version = "2.72.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "177w1MTnpi4I77jl8lKgE1cAe5WIqH/ytGOjhXAR950="; + sha256 = "Sjmi9iS4US1QDVhAFz7af6hfUcEJBS6ugGrOzoXTRfA="; }; patches = optionals stdenv.isDarwin [ @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { ./glib-appinfo-watch.patch ./schema-override-variable.patch + # Add support for the GNOME’s default terminal emulator. + # https://gitlab.gnome.org/GNOME/glib/-/issues/2618 + ./gnome-console-support.patch + # Do the same for Pantheon’s terminal emulator. + ./elementary-terminal-support.patch + # GLib contains many binaries used for different purposes; # we will install them to different outputs: # 1. Tools for desktop environment ($bin) @@ -115,7 +121,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - (meson.override { + (buildPackages.meson.override { withDarwinFrameworksGtkDocPatch = stdenv.isDarwin; }) ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 diff --git a/nixpkgs/pkgs/development/libraries/glib/elementary-terminal-support.patch b/nixpkgs/pkgs/development/libraries/glib/elementary-terminal-support.patch new file mode 100644 index 000000000000..0b8c8a70871c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glib/elementary-terminal-support.patch @@ -0,0 +1,16 @@ +diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c +index a441bfec9..6bcd3e690 100644 +--- a/gio/gdesktopappinfo.c ++++ b/gio/gdesktopappinfo.c +@@ -2678,6 +2678,11 @@ prepend_terminal_to_vector (int *argc, + if (check != NULL) + pass_cmd_as_single_arg = TRUE; + } ++ if (check == NULL) { ++ check = g_find_program_in_path ("io.elementary.terminal"); ++ if (check != NULL) ++ pass_cmd_as_single_arg = TRUE; ++ } + if (check == NULL) + check = g_find_program_in_path ("tilix"); + if (check == NULL) diff --git a/nixpkgs/pkgs/development/libraries/glib/gnome-console-support.patch b/nixpkgs/pkgs/development/libraries/glib/gnome-console-support.patch new file mode 100644 index 000000000000..7f6894a5cec9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glib/gnome-console-support.patch @@ -0,0 +1,55 @@ +diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c +index 60d6debb2..a441bfec9 100644 +--- a/gio/gdesktopappinfo.c ++++ b/gio/gdesktopappinfo.c +@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc, + int i, j; + char **term_argv = NULL; + int term_argc = 0; ++ gboolean pass_cmd_as_single_arg = FALSE; + char *check; + char **the_argv; + +@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc, + } + else + { ++ if (check == NULL) { ++ check = g_find_program_in_path ("kgx"); ++ if (check != NULL) ++ pass_cmd_as_single_arg = TRUE; ++ } + if (check == NULL) + check = g_find_program_in_path ("tilix"); + if (check == NULL) +@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc, + } + } + +- real_argc = term_argc + *argc; ++ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc); + real_argv = g_new (char *, real_argc + 1); + + for (i = 0; i < term_argc; i++) + real_argv[i] = term_argv[i]; + +- for (j = 0; j < *argc; j++, i++) +- real_argv[i] = (char *)the_argv[j]; ++ if (pass_cmd_as_single_arg) { ++ char **quoted_argv = g_new (char *, *argc + 1); ++ ++ for (j = 0; j < *argc; j++) { ++ quoted_argv[j] = g_shell_quote (the_argv[j]); ++ g_free (the_argv[j]); ++ } ++ quoted_argv[j] = NULL; ++ ++ real_argv[i++] = g_strjoinv (" ", quoted_argv); ++ g_strfreev (quoted_argv); ++ } else { ++ for (j = 0; j < *argc; j++, i++) ++ real_argv[i] = (char *)the_argv[j]; ++ } + + real_argv[i] = NULL; + diff --git a/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch b/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch new file mode 100644 index 000000000000..b2c998aabbef --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch @@ -0,0 +1,133 @@ +From faeeb0f353f5540da2015a41cb60fe43d199a1ac Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer <bernardo@meurer.org> +Date: Fri, 22 Jul 2022 22:11:07 -0700 +Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed + files, and hardcode /bin/bash instead" + +We need the ability to override to use `/bin/sh` here to avoid having +some bootstrap tools in a final build product. + +This reverts commit 5188a9d0265cc6f7235a8af1d31ab02e4a24853d. + +Co-authored-by: Maximilian Bosch <maximilian@mbosch.me> +--- + debug/Makefile | 5 +++-- + debug/xtrace.sh | 2 +- + elf/Makefile | 4 +++- + elf/ldd.bash.in | 2 +- + elf/sotruss.sh | 2 +- + malloc/Makefile | 5 +++-- + malloc/memusage.sh | 2 +- + timezone/Makefile | 3 ++- + 8 files changed, 15 insertions(+), 10 deletions(-) + +diff --git a/debug/Makefile b/debug/Makefile +index 96029f32ee..cbbdeda277 100644 +--- a/debug/Makefile ++++ b/debug/Makefile +@@ -238,7 +238,8 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o + + $(objpfx)xtrace: xtrace.sh + rm -f $@.new +- sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \ +- -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \ ++ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ ++ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \ ++ -e 's|@PKGVERSION@|$(PKGVERSION)|' \ + -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ + && rm -f $@ && mv $@.new $@ && chmod +x $@ +diff --git a/debug/xtrace.sh b/debug/xtrace.sh +index 8c56e01449..c760391a33 100755 +--- a/debug/xtrace.sh ++++ b/debug/xtrace.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 1999-2022 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + +diff --git a/elf/Makefile b/elf/Makefile +index 3536b6af5e..83521d9dbc 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -256,7 +256,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ + $(common-objpfx)libc_nonshared.a + + $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make +- sed -e 's%@VERSION@%$(version)%g' \ ++ sed -e 's%@BASH@%$(BASH)%g' \ ++ -e 's%@VERSION@%$(version)%g' \ + -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ + -e 's%@PREFIX@%$(prefix)%g' \ + -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ +@@ -1363,6 +1364,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ + -e 's%@VERSION@%$(version)%g' \ + -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ + -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ ++ -e 's%@BASH@%$(BASH)%g' \ + -e 's%@TEXTDOMAINDIR@%$(localedir)%g' + + ifeq ($(ldd-rewrite-script),no) +diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in +index 3253b32ef8..127eb59206 100644 +--- a/elf/ldd.bash.in ++++ b/elf/ldd.bash.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 1996-2022 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + +diff --git a/elf/sotruss.sh b/elf/sotruss.sh +index 22327eac5c..7d15bf4fc8 100755 +--- a/elf/sotruss.sh ++++ b/elf/sotruss.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 2011-2022 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + +diff --git a/malloc/Makefile b/malloc/Makefile +index 2329cf718a..5d7de4bee7 100644 +--- a/malloc/Makefile ++++ b/malloc/Makefile +@@ -307,8 +307,9 @@ $(objpfx)mtrace: mtrace.pl + + $(objpfx)memusage: memusage.sh + rm -f $@.new +- sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \ +- -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \ ++ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ ++ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \ ++ -e 's|@PKGVERSION@|$(PKGVERSION)|' \ + -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ + && rm -f $@ && mv $@.new $@ && chmod +x $@ + +diff --git a/malloc/memusage.sh b/malloc/memusage.sh +index f447160b7d..faa4936639 100755 +--- a/malloc/memusage.sh ++++ b/malloc/memusage.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 1999-2022 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + +diff --git a/timezone/Makefile b/timezone/Makefile +index a789c22d26..d65bdf2391 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -130,7 +130,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh + mv $@.tmp $@ + + $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make +- sed -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ ++ sed -e 's|/bin/bash|$(BASH)|' \ ++ -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ + -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ + -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ + -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ +-- +2.37.0 + diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz deleted file mode 100644 index 777e94e2b2ea..000000000000 --- a/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz +++ /dev/null Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz new file mode 100644 index 000000000000..24939e1c0899 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index ffec9972d287..6ed0a4d4da0f 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -43,9 +43,9 @@ } @ args: let - version = "2.33"; - patchSuffix = "-117"; - sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; + version = "2.35"; + patchSuffix = "-163"; + sha256 = "sha256-USNzL2tnzNMZMF79OZlx1YWSEivMKmUYob0lEN0M9S4="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -62,14 +62,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-117-g55446dd8a2 - $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.35/master && git describe + glibc-2.35-210-ge123f08ad5 + $ git show --minimal --reverse glibc-2.35.. | gzip -9n --rsyncable - > 2.35-master.patch.gz To compare the archive contents zdiff can be used. - $ zdiff -u 2.33-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz + $ zdiff -u 2.35-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz */ - ./2.33-master.patch.gz + ./2.35-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -115,16 +115,12 @@ stdenv.mkDerivation ({ sha256 = "091bk3kyrx1gc380gryrxjzgcmh1ajcj8s2rjhp2d2yzd5mpd5ps"; }) - /* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */ - (fetchurl { - url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff"; - sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4"; - }) - ./fix-x64-abi.patch /* https://github.com/NixOS/nixpkgs/pull/137601 */ ./nix-nss-open-files.patch + + ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -138,6 +134,10 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + + # Ensure that `__nss_files_fopen` can still be wrapped by `libredirect`. + sed -i -e '/libc_hidden_def (__nss_files_fopen)/d' nss/nss_files_fopen.c + sed -i -e '/libc_hidden_proto (__nss_files_fopen)/d' include/nss_files.h '' # FIXME: find a solution for infinite recursion in cross builds. # For now it's hopefully acceptable that IDN from libc doesn't reliably work. @@ -157,7 +157,7 @@ stdenv.mkDerivation ({ [ "-C" "--enable-add-ons" "--sysconfdir=/etc" - "--enable-stackguard-randomization" + "--enable-stack-protector=strong" "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") @@ -167,6 +167,9 @@ stdenv.mkDerivation ({ # and on aarch64 with binutils 2.30 or later. # https://sourceware.org/glibc/wiki/PortStatus "--enable-static-pie" + ] ++ lib.optionals stdenv.hostPlatform.isx86 [ + # Enable Intel Control-flow Enforcement Technology (CET) support + "--enable-cet" ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -188,8 +191,10 @@ stdenv.mkDerivation ({ installFlags = [ "sysconfdir=$(out)/etc" ]; + # out as the first output is an exception exclusive to glibc outputs = [ "out" "bin" "dev" "static" ]; + strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; diff --git a/nixpkgs/pkgs/development/libraries/glibc/default.nix b/nixpkgs/pkgs/development/libraries/glibc/default.nix index caaacfe4f436..f941f7be769d 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/default.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/default.nix @@ -40,13 +40,10 @@ callPackage ./common.nix { inherit stdenv; } { makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") ''; - # The stackprotector and fortify hardening flags are autodetected by glibc - # and enabled by default if supported. Setting it for every gcc invocation - # does not work. - hardeningDisable = [ "stackprotector" "fortify" ] - # XXX: Not actually musl-speciic but since only musl enables pie by default, - # limit rebuilds by only disabling pie w/musl - ++ lib.optional stdenv.hostPlatform.isMusl "pie"; + # The pie, stackprotector and fortify hardening flags are autodetected by + # glibc and enabled by default if supported. Setting it for every gcc + # invocation does not work. + hardeningDisable = [ "fortify" "pie" "stackprotector" ]; NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (builtins.concatLists [ @@ -67,8 +64,12 @@ callPackage ./common.nix { inherit stdenv; } { # store path than that determined when built (as a source for the # bootstrap-tools tarball) # Building from a proper gcc staying in the path where it was installed, - # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without + # libgcc_s will now be at {gcc}/lib, and gcc's libgcc will be found without # any special hack. + # TODO: remove this hack. Things that rely on this hack today: + # - dejagnu: during linux bootstrap tcl SIGSEGVs + # - clang-wrapper in cross-compilation + # Last attempt: https://github.com/NixOS/nixpkgs/pull/36948 preInstall = '' if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib @@ -119,6 +120,17 @@ callPackage ./common.nix { inherit stdenv; } { # Get rid of more unnecessary stuff. rm -rf $out/var $bin/bin/sln + + # Backwards-compatibility to fix e.g. + # "configure: error: Pthreads are required to build libgomp" during `gcc`-build + # because it's not actually needed anymore to link against `pthreads` since + # it's now part of `libc.so.6` itself, but the gcc build breaks if + # this doesn't work. + ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so + ln -sf $out/lib/librt.so.1 $out/lib/librt.so + ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so + ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so + touch $out/lib/libpthread.a '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. diff --git a/nixpkgs/pkgs/development/libraries/glibc/info.nix b/nixpkgs/pkgs/development/libraries/glibc/info.nix index 7c4f3f63bf1c..04b0dc00a894 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/info.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/info.nix @@ -7,7 +7,7 @@ callPackage ./common.nix {} { configureFlags = [ "--enable-add-ons" ]; - buildInputs = [ texinfo perl ]; + extraNativeBuildInputs = [ texinfo perl ]; buildPhase = "make info"; diff --git a/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix b/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix index fed24aff2796..4dbcb19af2a4 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix @@ -8,7 +8,7 @@ # `glibc` needs to be overridden here because it's still needed to `./configure` the source in order # to have a build environment where we can call the needed make target. -glibc.overrideAttrs ({ meta ? {}, ... }: { +glibc.overrideAttrs (oldAttrs: { pname = "glibc-mtrace"; buildPhase = '' @@ -25,14 +25,16 @@ glibc.overrideAttrs ({ meta ? {}, ... }: { mv malloc/mtrace $out/bin/ ''; - # Perl interpreter used for `mtrace`. - buildInputs = [ perl ]; + # Perl checked during configure + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ perl ]; + # Perl shebang used for `mtrace`. + buildInputs = oldAttrs.buildInputs ++ [ perl ]; # Reset a few things declared by `pkgs.glibc`. outputs = [ "out" ]; separateDebugInfo = false; - meta = meta // { + meta = oldAttrs.meta // { description = "Perl script used to interpret and provide human readable output of the trace log contained in the file mtracedata, whose contents were produced by mtrace(3)."; }; }) diff --git a/nixpkgs/pkgs/development/libraries/glibc/multi.nix b/nixpkgs/pkgs/development/libraries/glibc/multi.nix index 5d3626b95cc0..be190d77c736 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/multi.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/multi.nix @@ -6,7 +6,8 @@ let glibc64 = glibc; in runCommand "${nameVersion.name}-multi-${nameVersion.version}" - { outputs = [ "bin" "dev" "out"]; } # TODO: no static version here (yet) + # out as the first output is an exception exclusive to glibc + { outputs = [ "out" "bin" "dev" ]; } # TODO: no static version here (yet) '' mkdir -p "$out/lib" ln -s '${glibc64.out}'/lib/* "$out/lib" diff --git a/nixpkgs/pkgs/development/libraries/glibc/nix-locale-archive.patch b/nixpkgs/pkgs/development/libraries/glibc/nix-locale-archive.patch index 39312951fcf9..2fedf2a7a7db 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/nixpkgs/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -1,7 +1,8 @@ -diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c ---- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 -@@ -123,6 +123,23 @@ +diff --git a/locale/loadarchive.c b/locale/loadarchive.c +index 512769eaec..171dbb4ad9 100644 +--- a/locale/loadarchive.c ++++ b/locale/loadarchive.c +@@ -123,6 +123,23 @@ calculate_head_size (const struct locarhead *h) return MAX (namehash_end, MAX (string_end, locrectab_end)); } @@ -25,7 +26,7 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c /* Find the locale *NAMEP in the locale archive, and return the internalized data structure for its CATEGORY data. If this locale has -@@ -202,7 +219,7 @@ +@@ -202,7 +219,7 @@ _nl_load_locale_from_archive (int category, const char **namep) archmapped = &headmap; /* The archive has never been opened. */ @@ -34,23 +35,25 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c if (fd < 0) /* Cannot open the archive, for whatever reason. */ return NULL; -@@ -397,8 +414,7 @@ +@@ -397,8 +414,7 @@ _nl_load_locale_from_archive (int category, const char **namep) if (fd == -1) { - struct stat64 st; + struct __stat64_t64 st; - fd = __open_nocancel (archfname, - O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); ++ fd = open_locale_archive(); if (fd == -1) /* Cannot open the archive, for whatever reason. */ return NULL; -diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c ---- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 -@@ -633,6 +633,24 @@ +diff --git a/locale/programs/locale.c b/locale/programs/locale.c +index ca0a95be99..e484783402 100644 +--- a/locale/programs/locale.c ++++ b/locale/programs/locale.c +@@ -633,6 +633,24 @@ nameentcmp (const void *a, const void *b) + } - static int ++static int +open_locale_archive (void) +{ + int fd = -1; @@ -68,11 +71,10 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l +} + + -+static int + static int write_archive_locales (void **all_datap, char *linebuf) { - struct stat64 st; -@@ -644,7 +662,7 @@ +@@ -645,7 +663,7 @@ write_archive_locales (void **all_datap, char *linebuf) int fd, ret = 0; uint32_t cnt; @@ -81,10 +83,11 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l if (fd < 0) return 0; -diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c ---- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 -@@ -117,6 +117,22 @@ +diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c +index f38e835c52..779a3199fc 100644 +--- a/locale/programs/locarchive.c ++++ b/locale/programs/locarchive.c +@@ -117,6 +117,22 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags, } @@ -107,7 +110,7 @@ diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/progra static void create_archive (const char *archivefname, struct locarhandle *ah) { -@@ -578,7 +594,7 @@ +@@ -578,7 +594,7 @@ open_archive (struct locarhandle *ah, bool readonly) while (1) { /* Open the archive. We must have exclusive write access. */ diff --git a/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix b/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix index 1ba18898ad89..f1f3df86349e 100644 --- a/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix +++ b/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.70.0"; + version = "2.72.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gAj9iu3cyGej+X8RPeYl9ulu+Yz3hgN5gTqcD+/9tSA="; + sha256 = "sha256-KnZJooq13FOsTau3bJ9hWZ+8Yokjq2p910v2ddkVXNg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/nixpkgs/pkgs/development/libraries/glibmm/default.nix index f409935372ee..996eacd65f4c 100644 --- a/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.2"; + version = "2.66.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0="; + sha256 = "sha256-GZrOVoLYGxWh1WVIC0qVBoLy22QCyKpd1yF9ce3/gdU="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/glm/default.nix b/nixpkgs/pkgs/development/libraries/glm/default.nix index 81b0b47d5ba8..d4c836b6912e 100644 --- a/nixpkgs/pkgs/development/libraries/glm/default.nix +++ b/nixpkgs/pkgs/development/libraries/glm/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + NIX_CFLAGS_COMPILE = + lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-fno-ipa-modref" # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_STATIC_LIBS=OFF" diff --git a/nixpkgs/pkgs/development/libraries/globalplatform/default.nix b/nixpkgs/pkgs/development/libraries/globalplatform/default.nix deleted file mode 100644 index a8dfa430f599..000000000000 --- a/nixpkgs/pkgs/development/libraries/globalplatform/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }: - -stdenv.mkDerivation rec { - pname = "globalplatform"; - version = "6.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; - sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib openssl_1_0_2 pcsclite ]; - - meta = with lib; { - homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; - description = "Library for interacting with smart card devices"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix deleted file mode 100644 index a3ea4305bea7..000000000000 --- a/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }: - -stdenv.mkDerivation rec { - pname = "gppcscconnectionplugin"; - version = "1.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; - sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; - - meta = with lib; { - homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; - description = "GlobalPlatform pcsc connection plugin"; - license = [ licenses.lgpl3 licenses.gpl3 ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix index 72758a1b3e77..f49c8b982993 100644 --- a/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -1,40 +1,28 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gflags, perl }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }: stdenv.mkDerivation rec { pname = "glog"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "glog"; rev = "v${version}"; - sha256 = "17014q25c99qyis6l3fwxidw6222bb269fdlr74gn7pzmzg4lvg3"; + sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s="; }; - patches = [ - # Fix duplicate-concatenated nix store path in cmake file, see: - # https://github.com/NixOS/nixpkgs/pull/144561#issuecomment-960296043 - # TODO: Remove when https://github.com/google/glog/pull/733 is merged and available. - (fetchpatch { - name = "glog-cmake-Fix-incorrect-relative-path-concatenation.patch"; - url = "https://github.com/google/glog/pull/733/commits/57c636c02784f909e4b5d3c2f0ecbdbb47097266.patch"; - sha256 = "1py93gkzmcyi2ypcwyj3nri210z8fmlaif51yflzmrrv507zd7bi"; - }) - ]; - nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ gflags ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - # Mak CMake place RPATHs such that tests will find the built libraries. - # See https://github.com/NixOS/nixpkgs/pull/144561#discussion_r742468811 and https://github.com/NixOS/nixpkgs/pull/108496 - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed doCheck = !stdenv.isDarwin; + # There are some non-thread safe tests that can fail + enableParallelChecking = false; checkInputs = [ perl ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/gloox/default.nix b/nixpkgs/pkgs/development/libraries/gloox/default.nix index 82429add2619..f50704bcb65c 100644 --- a/nixpkgs/pkgs/development/libraries/gloox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gloox/default.nix @@ -1,13 +1,9 @@ { lib, stdenv, fetchurl -, zlibSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, idnSupport ? true, libidn ? null +, zlibSupport ? true, zlib +, sslSupport ? true, openssl +, idnSupport ? true, libidn }: -assert zlibSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert idnSupport -> libidn != null; - with lib; stdenv.mkDerivation rec{ diff --git a/nixpkgs/pkgs/development/libraries/glpk/default.nix b/nixpkgs/pkgs/development/libraries/glpk/default.nix index a46c84844e89..e8b01d6d2e7d 100644 --- a/nixpkgs/pkgs/development/libraries/glpk/default.nix +++ b/nixpkgs/pkgs/development/libraries/glpk/default.nix @@ -14,12 +14,12 @@ assert withGmp -> gmp != null; stdenv.mkDerivation rec { - version = "4.65"; + version = "5.0"; pname = "glpk"; src = fetchurl { url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; - sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; + sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU="; }; buildInputs = @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/20710#comment:18 (fetchpatch { name = "error_recovery.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266"; + sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; }) ]; @@ -72,7 +72,8 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/glpk/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg ] ++ teams.sage.members; + maintainers = with maintainers; [ ] ++ teams.sage.members; + mainProgram = "glpsol"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/glpng/default.nix b/nixpkgs/pkgs/development/libraries/glpng/default.nix index 1194d988c073..34c58774fb24 100644 --- a/nixpkgs/pkgs/development/libraries/glpng/default.nix +++ b/nixpkgs/pkgs/development/libraries/glpng/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ libGL libpng @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm"; - description = "PNG loader for OpenGL"; + description = "PNG loader library for OpenGL"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gmime/3.nix b/nixpkgs/pkgs/development/libraries/gmime/3.nix index a8e39047256c..4ec99d2e18f3 100644 --- a/nixpkgs/pkgs/development/libraries/gmime/3.nix +++ b/nixpkgs/pkgs/development/libraries/gmime/3.nix @@ -2,12 +2,12 @@ , vala }: stdenv.mkDerivation rec { - version = "3.2.7"; + version = "3.2.12"; pname = "gmime"; - src = fetchurl { - url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"; + src = fetchurl { # https://github.com/jstedfast/gmime/releases + url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; + sha256 = "sha256-OPm3aBgjQsSExBIobbjVgRaX/4FiQ3wFea3w0G4icFs="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix index 9093073cecff..9d8a1c03accd 100644 --- a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix +++ b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix @@ -12,7 +12,7 @@ let inherit (lib) optional; in let self = stdenv.mkDerivation rec { - pname = "gmp"; + pname = "gmp${lib.optionalString cxx "-with-cxx"}"; version = "6.2.1"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv @@ -28,6 +28,7 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; + strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ m4 ]; diff --git a/nixpkgs/pkgs/development/libraries/gnet/default.nix b/nixpkgs/pkgs/development/libraries/gnet/default.nix index debf3eb59264..5992868c7343 100644 --- a/nixpkgs/pkgs/development/libraries/gnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnet/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake glib libtool ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ glib libtool ]; preConfigure = "./autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix b/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix index 5d682e23b277..157d7fa84040 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,16 +27,16 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.0"; + version = "42.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-88qik6Xob2zK0Y+BcnPbHGcGHmgNedg5qop1KOW7JtY="; + sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk="; }; - patches = [ + patches = lib.optionals stdenv.isLinux [ (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; @@ -58,14 +58,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - bubblewrap xkeyboard_config libxkbcommon # for xkbregistry isocodes - wayland gtk3 gtk4 glib + ] ++ lib.optionals stdenv.isLinux [ + bubblewrap + wayland libseccomp systemd ]; @@ -79,6 +80,9 @@ stdenv.mkDerivation rec { "-Ddesktop_docs=false" "-Ddate_in_gnome_version=false" "-Dgnome_distributor=NixOS" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsystemd=disabled" + "-Dudev=disabled" ]; separateDebugInfo = stdenv.isLinux; @@ -93,7 +97,7 @@ stdenv.mkDerivation rec { description = "Library with common API for various GNOME modules"; homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index f58e87b2f7e6..1fed0b470691 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.43.1"; + version = "3.44.0"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-Dpq5bQwU0ZAxmEllpbLnS1Jz3F0rxtFMKZcIvAteObU="; + sha256 = "sha256-8dp3cizyQVHegDxX9G6iGLW5g44audn431hCPMS/KlA="; }; outputs = [ "out" "man" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix index ef8ef7648ebd..a49e0fad215c 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }: +{ lib, stdenv, buildPackages, fetchurl, pciutils +, gitUpdater }: with lib; stdenv.mkDerivation rec { pname = "gnu-efi"; - version = "3.0.11"; + version = "3.0.14"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; - sha256 = "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj"; + sha256 = "tztkOg1Wl9HzltdDFEjoht2AVmh4lXjj4aKCd8lShDU="; }; patches = [ - # Fix build on armv6l - (fetchpatch { - url = "https://sourceforge.net/p/gnu-efi/patches/_discuss/thread/25bb273a18/9c4d/attachment/0001-Fix-ARCH-on-armv6-and-other-32-bit-ARM-platforms.patch"; - sha256 = "0pj03h20g2bbz6fr753bj1scry6919h57l1h86z3b6q7hqfj0b4r"; + # Pull fix pending upstream inclusion for parallel builds + # https://sourceforge.net/p/gnu-efi/patches/84/ + (fetchurl { + name = "parallel-build.patch"; + url = "https://sourceforge.net/p/gnu-efi/patches/84/attachment/0001-lib-Makefile-add-.o-file-dependency-on-libsubdirs-ta.patch"; + sha256 = "sha256-+2UwV2lopdB/tazib1BLzO1E3GgB1L8dZsSQKWVoLwA="; }) ]; @@ -29,6 +32,12 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; + passthru.updateScript = gitUpdater { + inherit pname version; + # No nicer place to find latest release. + url = "https://git.code.sf.net/p/gnu-efi/code"; + }; + meta = with lib; { description = "GNU EFI development toolchain"; homepage = "https://sourceforge.net/projects/gnu-efi/"; diff --git a/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix deleted file mode 100644 index 015163b32931..000000000000 --- a/nixpkgs/pkgs/development/libraries/gnutls-kdh/3.5.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, fetchFromGitHub, autoreconfHook, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.0"; - - src = fetchFromGitHub { - owner = "arpa2"; - repo = "gnutls-kdh"; - rev = "ff3bb36f70a746f28554641d466e124098dfcb25"; - sha256 = "1rr3p4r145lnprxn8hqyyzh3qkj3idsbqp08g07ndrhqnxq0k0sw"; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix deleted file mode 100644 index 7b3b4561efb1..000000000000 --- a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv -, guileBindings ? config.gnutls.guile or false, guile -, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake -, bison, texinfo - -# Version dependent args -, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] -, ...}: - -assert guileBindings -> guile != null; -let - # XXX: Gnulib's `test-select' fails on FreeBSD: - # https://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; -in -stdenv.mkDerivation { - pname = "gnutls-kdh"; - inherit version; - - inherit src patches; - - outputs = [ "bin" "dev" "out" ]; - - patchPhase = '' - # rm -fR ./po - # substituteInPlace configure "po/Makefile.in" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_cipher_list.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_cipher_self_test.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_digest_self_test.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_mac_self_test.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_pk_self_test.3" " " - printf "all: ;\n\ninstall: ;" > "po/Makefile.in" - printf "all: ;\n\ninstall: ;" > "po/Makefile.in.in" - ''; - - postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' - sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ - -i tests/cert-tests/name-constraints - '' + postPatch; - - preConfigure = "patchShebangs ."; - configureFlags = - lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" - ++ [ - "--disable-dependency-tracking" - "--enable-fast-install" - ] ++ lib.optional guileBindings - [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; - - # Build of the Guile bindings is not parallel-safe. See - # <https://github.com/arpa2/gnutls-kdh/commit/330995a920037b6030ec0282b51dde3f8b493cad> - # for the actual fix. Also an apparent race in the generation of - # systemkey-args.h. - enableParallelBuilding = false; - - buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp - autogen gperftools gperf gettext automake bison texinfo ] - ++ lib.optional doCheck nettools - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv - ++ lib.optional (tpmSupport && stdenv.isLinux) trousers - ++ [ unbound ] - ++ lib.optional guileBindings guile; - - nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs; - - #inherit doCheck; - doCheck = false; - - # Fixup broken libtool and pkg-config files - preFixup = lib.optionalString (!stdenv.isDarwin) '' - sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ - -e 's,-lz,-L${zlib.out}/lib -lz,' \ - -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \ - -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \ - -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc" - ''; - - meta = with lib; { - description = "GnuTLS with additional TLS-KDH ciphers: Kerberos + Diffie-Hellman"; - - longDescription = '' - The ARPA2 project aims to add security. This is an enhanced - version of GnuTLS, a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman. - ''; - - homepage = "https://github.com/arpa2/gnutls-kdh"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.all; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 627e5f46f728..21e818de8675 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -5,7 +5,8 @@ , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring , withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit -, withSecurity ? false, Security # darwin Security.framework +, withSecurity ? true, Security # darwin Security.framework +# certificate compression - only zlib now, more possible: zstd, brotli }: assert guileBindings -> guile != null; @@ -21,11 +22,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.7.3"; + version = "3.7.6"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - sha256 = "16n4yvw3792gcdxkikjmhddr6cbs4wlk027zfxlhmchsqcxw8ngw"; + sha256 = "1zv2097v9f6f4c66q7yn3c6gggjk9jz38095ma7v3gs5lccmf1kp"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { patches = [ ./nix-ssl-cert-file.patch ] # Disable native add_system_trust. + # FIXME: apparently it's not enough to drop the framework anymore; maybe related to + # https://gitlab.com/gnutls/gnutls/-/commit/c19cb93d492e45141bfef9b926dfeba36003261c ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch; # Skip some tests: @@ -73,7 +76,6 @@ stdenv.mkDerivation rec { buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit - ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; @@ -81,7 +83,9 @@ stdenv.mkDerivation rec { ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; - propagatedBuildInputs = [ nettle ]; + propagatedBuildInputs = [ nettle ] + # Builds dynamically linking against gnutls seem to need the framework now. + ++ lib.optional (isDarwin && withSecurity) Security; inherit doCheck; # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests. @@ -120,7 +124,7 @@ stdenv.mkDerivation rec { homepage = "https://gnutls.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ eelco fpletz ]; + maintainers = with maintainers; [ vcunat ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index b457331983aa..bb07d8c792ce 100644 --- a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -17,6 +17,8 @@ , cairo , gnome , substituteAll +, buildPackages +, gobject-introspection-unwrapped , nixStoreDir ? builtins.storeDir , x11Support ? true }: @@ -25,7 +27,7 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; version = "1.72.0"; @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; sha256 = "Av6OWQhh2I+DBg3TnNpcyqYLLaHSHQ+VSZMBsYa+qrw="; }; @@ -66,8 +68,8 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_45 python3 - setupHook # move .gir files - ]; + finalAttrs.setupHook # move .gir files + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ python3 @@ -86,7 +88,17 @@ stdenv.mkDerivation rec { "--datadir=${placeholder "dev"}/share" "-Ddoctool=disabled" "-Dcairo=disabled" - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-Dgi_cross_ldd_wrapper=${substituteAll { + name = "g-ir-scanner-lddwrapper"; + isExecutable = true; + src = ./wrappers/g-ir-scanner-lddwrapper.sh; + inherit (buildPackages) bash; + buildobjdump = "${buildPackages.stdenv.cc.bintools}/bin/objdump"; + }}" + "-Dgi_cross_use_prebuilt_gi=true" + "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" ]; doCheck = !stdenv.isAarch64; @@ -97,6 +109,14 @@ stdenv.mkDerivation rec { patchShebangs tools/* ''; + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + cp -r ${buildPackages.gobject-introspection-unwrapped.devdoc} $devdoc + # these are uncompiled c and header files which aren't installed when cross-compiling because + # code that installs them is in tests/meson.build which is only run when not cross-compiling + # pygobject3 needs them + cp -r ${buildPackages.gobject-introspection-unwrapped.dev}/share/gobject-introspection-1.0/tests $dev/share/gobject-introspection-1.0/tests + ''; + preCheck = '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed, @@ -114,7 +134,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gobject-introspection"; versionPolicy = "odd-unstable"; }; }; @@ -122,7 +142,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; - maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]); + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 artturin ]); platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; @@ -134,4 +154,4 @@ stdenv.mkDerivation rec { automatically provide bindings to call into the C library. ''; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 6bee47aeb096..50571a8f914d 100644 --- a/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -10,7 +10,7 @@ make_gobject_introspection_find_gir_files() { fi } -addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files +addEnvHooks "$targetOffset" make_gobject_introspection_find_gir_files giDiscoverSelf() { if [ -d "$prefix/lib/girepository-1.0" ]; then diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/wrapper.nix b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrapper.nix new file mode 100644 index 000000000000..4b3fa1a19819 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPackages +, targetPackages +, gobject-introspection-unwrapped +, ... +}@_args: + +# to build, run +# `nix build ".#pkgsCross.aarch64-multiplatform.buildPackages.gobject-introspection"` + +let + # ensure that `.override` works when gobject-introspection == gobject-introspection-wrapped + args = builtins.removeAttrs _args [ "buildPackages" "targetPackages" "gobject-introspection-unwrapped" ]; + # passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override`` + argsForTarget = builtins.removeAttrs args [ "stdenv" ]; +in + +(gobject-introspection-unwrapped.override args).overrideAttrs (previousAttrs: { + pname = "gobject-introspection-wrapped"; + postFixup = (previousAttrs.postFixup or "") + '' + mv $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped + mv $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped + + ( + export bash="${buildPackages.bash}" + export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} + export buildobjdump="${buildPackages.stdenv.cc.bintools}/bin/objdump" + + export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" + + substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" + substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" + substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" + chmod +x "$dev/bin/g-ir-compiler" + chmod +x "$dev/bin/g-ir-scanner" + chmod +x "$dev/bin/g-ir-scanner-lddwrapper" + ) + '' + # when cross-compiling and using the wrapper then when a package looks up the g_ir_X + # variable with pkg-config they'll get the host version which can't be run + # override the variable to use the absolute path to g_ir_X in PATH which can be run + + '' + cat >> $dev/nix-support/setup-hook <<-'EOF' + override-pkg-config-gir-variables() { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)" + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE + } + + preConfigureHooks+=(override-pkg-config-gir-variables) + EOF + ''; +}) diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh new file mode 100644 index 000000000000..69642831c8a0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh @@ -0,0 +1,4 @@ +#! @bash@/bin/bash +# shellcheck shell=bash + +exec @emulator@ @targetgir@/bin/g-ir-compiler "$@" diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh new file mode 100644 index 000000000000..1bf9c3659dc5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh @@ -0,0 +1,4 @@ +#! @bash@/bin/bash +# shellcheck shell=bash + +exec @buildobjdump@ -p "$@" diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh new file mode 100644 index 000000000000..6a222191c7b2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh @@ -0,0 +1,7 @@ +#! @bash@/bin/bash +# shellcheck shell=bash + +exec @dev@/bin/.g-ir-scanner-wrapped \ + --use-binary-wrapper=@emulator@ \ + --use-ldd-wrapper=@dev@/bin/g-ir-scanner-lddwrapper \ + "$@" diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix index 0617eaa1a260..4428b077a47d 100644 --- a/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.51"; + version = "0.10.52"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "LoQQiE1qUa4AyUIJKKv6c/elUsGqIiNx308txazDzSM="; + sha256 = "YLnv2UNw8JabOU8KrIxuuR4V68DOEja0Sqc16xyYhAw="; }; nativeBuildInputs = [ pkg-config intltool ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt librsvg ]; enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.hostPlatform.isPower64; passthru = { updateScript = gnome.updateScript { diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index 1f2966695d86..f59198a5528e 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python3, gtk3, cairo, glib, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; - nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ]; + nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ]; buildInputs = [ gtk3 cairo glib gobject-introspection ]; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/gperftools/default.nix b/nixpkgs/pkgs/development/libraries/gperftools/default.nix index 0ed2dea0c4c0..c1dd608f8052 100644 --- a/nixpkgs/pkgs/development/libraries/gperftools/default.nix +++ b/nixpkgs/pkgs/development/libraries/gperftools/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux - buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; + buildInputs = lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isAarch) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 - configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64) + configureFlags = lib.optional stdenv.hostPlatform.isAarch "--disable-general-dynamic-tls"; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index 75b13b6b7ef1..079caf85da9e 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -18,17 +18,20 @@ , pythonSupport ? false , swig2 ? null , python ? null +# only for passthru.tests +, libsForQt5 +, python3 }: let inherit (stdenv.hostPlatform) system; in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - sha256 = "1xb9k88rrafdi0n95nzx0d6bz7hcn9b44hciqbigrqkvxc6gblsf"; + hash = "sha256-cR6r9d1mG5sEvp7cms4qe8Ax9r2dN6do0C0O/e8Qj18="; }; patches = [ @@ -44,6 +47,9 @@ stdenv.mkDerivation rec { ./python-310-detection-without-distutils.patch # Find correct version string for Python >= 3.10, https://dev.gnupg.org/D546 ./python-find-version-string-above-310.patch + # Fix a test after disallowing compressed signatures in gpg (PR #180336) + ./test_t-verify_double-plaintext.patch + # Disable python tests on Darwin as they use gpg (see configureFlags below) ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch # Fix _AC_UNDECLARED_WARNING for autoconf>=2.70 @@ -101,14 +107,19 @@ stdenv.mkDerivation rec { # debugging is disabled lib.optional (qtbase != null) "-DQT_NO_DEBUG" # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html - ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64" + ++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" ); doCheck = true; + passthru.tests = { + python = python3.pkgs.gpgme; + qt = libsForQt5.qgpgme; + }; + meta = with lib; { homepage = "https://gnupg.org/software/gpgme/index.html"; - changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-${version}"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-${version}"; description = "Library for making GnuPG easier to use"; longDescription = '' GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -118,6 +129,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl21Plus gpl3Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch b/nixpkgs/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch new file mode 100644 index 000000000000..8f866af0da91 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch @@ -0,0 +1,31 @@ +--- a/tests/gpg/t-verify.c ++++ b/tests/gpg/t-verify.c +@@ -304,7 +304,7 @@ + err = gpgme_data_new (&text); + fail_if_err (err); + err = gpgme_op_verify (ctx, sig, NULL, text); +- if (gpgme_err_code (err) != GPG_ERR_BAD_DATA) ++ if (gpgme_err_code (err) == GPG_ERR_NO_ERROR) + { + fprintf (stderr, "%s:%i: Double plaintext message not detected\n", + PGM, __LINE__); +--- a/lang/python/tests/t-verify.py ++++ b/lang/python/tests/t-verify.py +@@ -142,7 +142,7 @@ + c.op_verify(sig, None, text) + except Exception as e: + assert type(e) == gpg.errors.GPGMEError +- assert e.getcode() == gpg.errors.BAD_DATA ++ assert e.getcode() != gpg.errors.NO_ERROR + else: + assert False, "Expected an error but got none." + +@@ -178,7 +178,7 @@ + try: + c.verify(double_plaintext_sig) + except gpg.errors.GPGMEError as e: +- assert e.getcode() == gpg.errors.BAD_DATA ++ assert e.getcode() != gpg.errors.NO_ERROR + else: + assert False, "Expected an error but got none." + diff --git a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index f3c16c8ac321..3d4af9db19ce 100644 --- a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,14 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, python3, runCommand, makeWrapper, stress-ng }: +{ lib +, stdenv +, fetchFromGitHub +, python3 +, runCommand +, makeWrapper +, stress-ng +}: lib.fix (self: stdenv.mkDerivation rec { pname = "graphene-hardened-malloc"; - version = "8"; + version = "11"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = version; - sha256 = "sha256-+5kJb3hhuFTto7zsIymIXl3tpKUOm3v1DCY4EkAOCgo="; + sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU="; }; doCheck = true; @@ -20,7 +27,7 @@ lib.fix (self: stdenv.mkDerivation rec { installPhase = '' install -Dm444 -t $out/include include/* - install -Dm444 -t $out/lib libhardened_malloc.so + install -Dm444 -t $out/lib out/libhardened_malloc.so mkdir -p $out/bin substitute preload.sh $out/bin/preload-hardened-malloc --replace "\$dir" $out/lib @@ -41,21 +48,21 @@ lib.fix (self: stdenv.mkDerivation rec { # standalone executables. this includes disabling tests for # malloc_object_size, which doesn't make sense to use via LD_PRELOAD. buildPhase = '' - pushd test/simple-memory-corruption + pushd test make LDLIBS= LDFLAGS=-Wl,--unresolved-symbols=ignore-all CXXFLAGS=-lstdc++ substituteInPlace test_smc.py \ --replace 'test_malloc_object_size' 'dont_test_malloc_object_size' \ --replace 'test_invalid_malloc_object_size' 'dont_test_invalid_malloc_object_size' - popd # test/simple-memory-corruption + popd # test ''; installPhase = '' mkdir -p $out/test - cp -r test/simple-memory-corruption $out/test/simple-memory-corruption + cp -r test $out/test mkdir -p $out/bin makeWrapper ${python3.interpreter} $out/bin/run-tests \ - --add-flags "-I -m unittest discover --start-directory $out/test/simple-memory-corruption" + --add-flags "-I -m unittest discover --start-directory $out/test" ''; }; tests = { diff --git a/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch index 9111217ea08e..36d81ca9f138 100644 --- a/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch +++ b/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch @@ -1,12 +1,12 @@ -From 57bed86429db9d871f1442c94f14e94e38972ca3 Mon Sep 17 00:00:00 2001 +From d68fcb793d70032e978ecf8e0577eea955a741cf Mon Sep 17 00:00:00 2001 From: worldofpeace <worldofpeace@protonmail.ch> -Date: Thu, 16 May 2019 21:15:15 -0400 +Date: Sun, 10 Apr 2022 12:02:10 +0800 Subject: [PATCH] meson: add options for tests installation dirs --- meson_options.txt | 6 ++++++ - tests/meson.build | 23 ++++++++++++++++------- - 2 files changed, 22 insertions(+), 7 deletions(-) + tests/meson.build | 13 +++++++++++-- + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index b9a2fb5..4b8629f 100644 @@ -23,7 +23,7 @@ index b9a2fb5..4b8629f 100644 + value: '', + description: 'Installation directory for binary files in tests') diff --git a/tests/meson.build b/tests/meson.build -index 77281f5..7522456 100644 +index 2b925e7..3276849 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -21,8 +21,17 @@ unit_tests = [ @@ -32,66 +32,20 @@ index 77281f5..7522456 100644 -installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path) -installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path) -+test_suffix = join_paths('installed-tests', graphene_api_path) ++installed_test_suffix = join_paths('installed-tests', graphene_api_path) + -+test_datadir = join_paths(get_option('installed_test_datadir'), test_suffix) -+if test_datadir == '' -+ test_datadir = join_paths(get_option('prefix'), get_option('datadir'), test_suffix) ++installed_test_datadir = join_paths(get_option('installed_test_datadir'), installed_test_suffix) ++if installed_test_datadir == '' ++ installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), installed_test_suffix) +endif + -+test_bindir = join_paths(get_option('installed_test_bindir'), test_suffix) -+if test_bindir == '' -+ test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix) ++installed_test_bindir = join_paths(get_option('installed_test_bindir'), installed_test_suffix) ++if installed_test_bindir == '' ++ installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), installed_test_suffix) +endif # Make tests conditional on having mutest-1 installed system-wide, or # available as a subproject -@@ -40,13 +49,13 @@ if mutest_dep.found() - output: wrapper, - command: [ - gen_installed_test, -- '--testdir=@0@'.format(installed_test_bindir), -+ '--testdir=@0@'.format(test_bindir), - '--testname=@0@'.format(unit), - '--outdir=@OUTDIR@', - '--outfile=@0@'.format(wrapper), - ], - install: get_option('installed_tests'), -- install_dir: installed_test_datadir, -+ install_dir: test_datadir, - ) - - test(unit, -@@ -55,7 +64,7 @@ if mutest_dep.found() - include_directories: graphene_inc, - c_args: common_cflags, - install: get_option('installed_tests'), -- install_dir: installed_test_bindir, -+ install_dir: test_bindir, - ), - env: ['MUTEST_OUTPUT=tap'], - protocol: 'tap', -@@ -66,17 +75,18 @@ endif - if build_gir and host_system == 'linux' and not meson.is_cross_build() - foreach unit: ['introspection.py'] - wrapper = '@0@.test'.format(unit) -+ install_data(unit, install_dir: test_bindir) - custom_target(wrapper, - output: wrapper, - command: [ - gen_installed_test, -- '--testdir=@0@'.format(installed_test_bindir), -+ '--testdir=@0@'.format(test_bindir), - '--testname=@0@'.format(unit), - '--outdir=@OUTDIR@', - '--outfile=@0@'.format(wrapper), - ], - install: get_option('installed_tests'), -- install_dir: installed_test_datadir, -+ install_dir: test_datadir, - ) - - test(unit, -- -2.31.1 +2.35.1 diff --git a/nixpkgs/pkgs/development/libraries/graphene/default.nix b/nixpkgs/pkgs/development/libraries/graphene/default.nix index 22c0e044f1e8..b883c549da54 100644 --- a/nixpkgs/pkgs/development/libraries/graphene/default.nix +++ b/nixpkgs/pkgs/development/libraries/graphene/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.10.6"; + version = "1.10.8"; outputs = [ "out" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ]; @@ -26,12 +28,21 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "v6YH3fRMTzhp7wmU8in9ukcavzHmOAW54EK9ZwQyFxc="; + sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI="; }; patches = [ # Add option for changing installation path of installed tests. ./0001-meson-add-options-for-tests-installation-dirs.patch + + # Disable flaky simd_operators_reciprocal test + # https://github.com/ebassi/graphene/issues/246 + (fetchpatch { + url = "https://github.com/ebassi/graphene/commit/4fbdd07ea3bcd0964cca3966010bf71cb6fa8209.patch"; + sha256 = "uFkkH0u4HuQ/ua1mfO7sJZ7MPrQdV/JON7mTYB4DW80="; + includes = [ "tests/simd.c" ]; + revert = true; + }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 28c47640ca6a..55f1fb2790e6 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -16,11 +16,12 @@ # tests , python3 +, arrow-cpp }: stdenv.mkDerivation rec { pname = "grpc"; - version = "1.43.0"; # N.B: if you change this, please update: + version = "1.48.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "sha256-NPyCQsrmD/gBs4UHPGbBACmGRTNQDj6WfnfLNdWulK4="; + hash = "sha256-cR+K3po/9XpYWe+sRXGwzvNAPChrWzYu5D4ygBTKKIQ="; fetchSubmodules = true; }; @@ -61,7 +62,6 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (python3.pkgs) grpcio-status grpcio-tools; + inherit arrow-cpp; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 085544a36120..acc143cd5566 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -39,14 +39,20 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post-install.py ''; - # meson installs the schemas to share/glib-2.0/schemas - # We add the override file there too so it will be compiled and later moved by - # glib's setup hook. preInstall = '' + # Meson installs the schemas to share/glib-2.0/schemas + # We add the override file there too so it will be compiled and later moved by + # glib's setup hook. mkdir -p $out/share/glib-2.0/schemas cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + # These paths are supposed to refer to gnome-backgrounds + # but since we do not use FHS, they are broken. + # And we do not want to hardcode the correct paths + # since then every GTK app would pull in gnome-backgrounds. + # Let’s just override the broken paths so that people are not confused. [org.gnome.desktop.background] picture-uri=''' + picture-uri-dark=''' [org.gnome.desktop.screensaver] picture-uri=''' diff --git a/nixpkgs/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix index be45a48090ff..d4bd149e64e3 100644 --- a/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.9.1"; + version = "1.11.1"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; + sha256 = "72qk4/cRd1FYp+JBpfgJzyQmvA4Cwjp9K1xx/D3gApI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gss/default.nix b/nixpkgs/pkgs/development/libraries/gss/default.nix index 0c49e97a56bd..dd7852ac555b 100644 --- a/nixpkgs/pkgs/development/libraries/gss/default.nix +++ b/nixpkgs/pkgs/development/libraries/gss/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gss/"; description = "Generic Security Service"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/gssdp/default.nix b/nixpkgs/pkgs/development/libraries/gssdp/default.nix index a8f8535138e3..21af779a5112 100644 --- a/nixpkgs/pkgs/development/libraries/gssdp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gssdp/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + broken = stdenv.isDarwin; description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 0e17e13e5818..6d940362a21a 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -84,6 +84,7 @@ , libxml2 , srt , vo-aacenc +, libfreeaptx , VideoToolbox , AudioToolbox , AVFoundation @@ -92,17 +93,18 @@ , Foundation , MediaToolbox , enableGplPlugins ? true +, bluezSupport ? stdenv.isLinux }: stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.20.0"; + version = "1.20.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-AVuNTZo5Xr9ETUCHaGeiA03TMEs61IvDoN0MHucdwR0="; + sha256 = "0j1q89dl8369djibc5p27lyj8y8p4maplmdzlryvrw0ib77w5lq9"; }; nativeBuildInputs = [ @@ -119,11 +121,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection gst-plugins-base orc - # gobject-introspection has to be in both nativeBuildInputs and - # buildInputs. The build tries to link against libgirepository-1.0.so - gobject-introspection json-glib ldacbt libass @@ -170,6 +170,7 @@ stdenv.mkDerivation rec { libintl srt vo-aacenc + libfreeaptx ] ++ lib.optionals enableZbar [ zbar ] ++ lib.optionals faacSupport [ @@ -179,8 +180,9 @@ stdenv.mkDerivation rec { mjpegtools faad2 x265 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals bluezSupport [ bluez + ] ++ lib.optionals stdenv.isLinux [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols @@ -261,13 +263,13 @@ stdenv.mkDerivation rec { "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3 "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing - "-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235 + "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx` + "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" ] ++ lib.optionals (!stdenv.isLinux) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` ] ++ lib.optionals stdenv.isDarwin [ - "-Dbluez=disabled" "-Dchromaprint=disabled" "-Ddirectfb=disabled" "-Dflite=disabled" @@ -290,8 +292,6 @@ stdenv.mkDerivation rec { # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, # but its meson build system does not declare the dependency. "-Dapplemedia=disabled" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ] ++ (if enableGplPlugins then [ "-Dgpl=enabled" ] else [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 82d90845677c..c9e9c7f3248a 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -5,7 +5,6 @@ , meson , ninja , gettext -, gobject-introspection , python3 , gstreamer , orc @@ -19,6 +18,7 @@ , libvisual , tremor # provides 'virbisidec' , libGL +, gobject-introspection , enableX11 ? stdenv.isLinux , libXv , libXext @@ -41,15 +41,19 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.20.0"; + version = "1.20.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw="; + sha256 = "0162ly7pscymq6bsf1d5fva2k9s16zvfwyi1q6z4yfd97d0sdn4n"; }; + strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ meson ninja @@ -58,13 +62,14 @@ stdenv.mkDerivation rec { gettext orc glib - gobject-introspection - + gstreamer # docs # TODO add hotdoc here + gobject-introspection ] ++ lib.optional enableWayland wayland; buildInputs = [ + gobject-introspection orc libtheora libintl @@ -102,7 +107,6 @@ stdenv.mkDerivation rec { # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" "-Dtests=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index fa1188347731..662c3281b030 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -4,7 +4,6 @@ , ninja , pkg-config , gettext -, gobject-introspection , bison , flex , python3 @@ -17,11 +16,12 @@ , bash-completion , lib , CoreServices +, gobject-introspection }: stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.20.0"; + version = "1.20.1"; outputs = [ "bin" @@ -34,9 +34,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc="; + sha256 = "0cghi6n4nhdbajz3wqcgbh5xm94myvnqgsi9g2bz9n1s9904l2fy"; }; + depsBuildBuild = [ + pkg-config + ]; + + strictDeps = true; nativeBuildInputs = [ meson ninja @@ -47,15 +52,18 @@ stdenv.mkDerivation rec { python3 makeWrapper glib - gobject-introspection bash-completion + gobject-introspection # documentation # TODO add hotdoc here + ] ++ lib.optionals stdenv.isLinux [ + libcap # for setcap binary ]; buildInputs = [ bash-completion + gobject-introspection ] ++ lib.optionals stdenv.isLinux [ libcap libunwind @@ -72,8 +80,6 @@ stdenv.mkDerivation rec { "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index d1c7233f0d48..9b67dd49c82b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -13,6 +13,8 @@ gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; + gst-plugins-viperfx = callPackage ./viperfx { }; + gst-rtsp-server = callPackage ./rtsp-server { }; gst-libav = callPackage ./libav { }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index aa92410e0e48..acb12b78341d 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-afyHVuydk+XFJYyZCIQ08gPpH9vFryjR8sWD/YGbeh0="; + sha256 = "0asbapgf485h2gqq0sn9c4qknwi0ccpraf1685ixp2sv23pwgwc1"; }; outputs = [ @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -40,6 +44,7 @@ stdenv.mkDerivation rec { cairo python3 json-glib + gobject-introspection ]; propagatedBuildInputs = [ @@ -49,8 +54,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 4630ce6d0ce4..9d6f3c0f4834 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.20.0"; + version = "1.20.1"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+Detz0Bz0ZpZCJhOh5zQOfQZLKNo5x056MzYpWuf7t8="; + sha256 = "1ps887yyj6jkj8a2613n43b4fbvynxwryinxvavi00cfnlhipkka"; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash-completion libxml2 + gobject-introspection ]; propagatedBuildInputs = [ @@ -55,8 +56,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 3b686e4c7f59..18361f15ae80 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -42,21 +42,26 @@ , xorg , libgudev , wavpack +, glib }: assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.20.0"; + version = "1.20.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-LRGcFauMnnn4zTxr9YL/egULKMyuUqtIZeGhRkmRZZw="; + sha256 = "1al4f35mx41cy2h6agvmsqkjfchsyfs0iyxzpv6pnl0xh9pqfriw"; }; + strictDeps = true; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config python3 @@ -64,7 +69,12 @@ stdenv.mkDerivation rec { ninja gettext nasm - ] ++ lib.optionals stdenv.isLinux [ + orc + libshout + glib + ] ++ lib.optionals qt5Support (with qt5; [ + qtbase + ]) ++ lib.optionals stdenv.isLinux [ wayland-protocols ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 0d9f22d7d65f..31e127db083b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc="; + sha256 = "1iwz7928yi48xia5kfkj54x5dfmhbj25g9125vainpmp6fv1z9wi"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 80190200c26c..8fe79bb7b8be 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wgn17ZBtpxP91EqIROkJqmyK89+2MCWbCSz7d6d1WEM="; + sha256 = "028maajlvfn96v3gqk2ws1k6w9hjfk7dsxnm84d73pnpi99bqia7"; }; outputs = [ @@ -41,13 +41,12 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gst-plugins-bad + gobject-introspection ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 05133271f846..be8aaf5606ee 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.20.0"; + version = "1.20.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-To3LXSZVLwpJN/a8Ynm9kHD1XKauDqoy1y0mTEQAHC4="; + sha256 = "06fvgyjwcf4paqxgp1xmgd0d0glkxys7n818526k10wrw92m20s2"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index c8b6230cd595..80bcc43c5878 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-95pHNG39XlheBj53B45fxJiwbe6JW/y/R9iGP8rJ6jI="; + sha256 = "0dqiy8mhcpq3yla8dk69pkjid7hiv98ykvwskb4pk45g6z2zdyw7"; }; outputs = [ @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Set of VAAPI GStreamer Plug-ins"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/viperfx/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/viperfx/default.nix new file mode 100644 index 000000000000..83c7d75e98c1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gstreamer/viperfx/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, gst_all_1 +, cmake +}: +stdenv.mkDerivation rec { + pname = "gst-plugins-viperfx"; + version = "unstable-2020-9-20"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "gst-plugin-viperfx"; + rev = "a5c1b03dfe1ab0822b717a5f9392e9f1237fdba0"; + sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y="; + }; + + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + + propagatedBuildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + installPhase = '' + runHook preInstall + install -D libgstviperfx.so $out/lib/gstreamer-1.0/libgstviperfx.so + install -D $src/COPYING $out/share/licenses/gst-plugins-viperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + description = "ViPER FX core wrapper plug-in for GStreamer1"; + homepage = "https://github.com/Audio4Linux/gst-plugin-viperfx"; + license = licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/gtest/default.nix b/nixpkgs/pkgs/development/libraries/gtest/default.nix index 59bfb4492783..049d202a71ec 100644 --- a/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.11.0"; + version = "1.12.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "release-${version}"; - hash = "sha256-SjlJxushfry13RGA7BCjYC9oZqV4z6x8dOiHfl/wpF0="; + hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch index c05e3a9326ae..573884fdcbcd 100644 --- a/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch +++ b/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -1,30 +1,34 @@ +diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt +index 5c1f0daf..ed8aae58 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt -@@ -106,10 +106,10 @@ - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") +@@ -108,10 +108,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}") target_include_directories(gmock SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" + "$<BUILD_INTERFACE:${dirs}>" - "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") + "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") target_include_directories(gmock_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" + "$<BUILD_INTERFACE:${dirs}>" - "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") + "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") endif() ######################################################################## +diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt +index aa00a5f3..50434fed 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt -@@ -126,10 +126,10 @@ - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") +@@ -134,10 +134,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}") target_include_directories(gtest SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" + "$<BUILD_INTERFACE:${dirs}>" - "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") + "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") target_include_directories(gtest_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" + "$<BUILD_INTERFACE:${dirs}>" - "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") + "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") endif() - target_link_libraries(gtest_main PUBLIC gtest) - + if(CMAKE_SYSTEM_NAME MATCHES "QNX") + target_link_libraries(gtest PUBLIC regex) diff --git a/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix index 8d40499fb626..5cbd4302dbaa 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk2 ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 ]; meta = { description = "A very flexible theme engine"; diff --git a/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix index ffb4e5bbbf90..4498930bd838 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2021-10-28"; + version = "unstable-2022-04-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "a44d84ec687f41ad37e43697b28a018f65780780"; - sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM="; + rev = "d7f408fb23adc01db14c708b35b74a317418de4b"; + sha256 = "EyReJX3f7G5+EEB/gbLTnrxdltedbzm7Bg02hCb+XO0="; }; nativeBuildInputs = [ @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = unstableGitUpdater { - # The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl). - url = "${meta.homepage}.git"; branch = "gtk-frdp-0-1"; }; }; diff --git a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index d8010cdc63b4..ba7950d72561 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,15 +13,16 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.6.0"; + version = "0.7.0"; outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # for demo src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "sha256-jLWXBoYcVoUSzw4OIYVM5iPvsmpy+Wg5TbDpo8cll80="; + sha256 = "sha256-0S1WBpxXpWoMOecJQS6FKEXRZdw4E5hrjURPyhkxiMc="; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + "-Dexamples=true" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index c736c5cc7617..c06aa9469937 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -30,7 +30,7 @@ , gnome , gsettings-desktop-schemas , sassc -, trackerSupport ? stdenv.isLinux +, trackerSupport ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) , tracker , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux @@ -39,12 +39,13 @@ , wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux -, withGtkDoc ? stdenv.isLinux +, withGtkDoc ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) , cups , AppKit , Cocoa , QuartzCore , broadwaySupport ? true +, wayland-scanner }: let @@ -59,7 +60,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.33"; + version = "3.24.34"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-WIsGUi4l0VeemJtvnYob2/L+E83gGgTpBP80aiJeeAE="; + sha256 = "sha256-28afkN3IIbjRRB8AN03B2kMjour6kHjmHtvl7u+oUuw="; }; patches = [ @@ -85,6 +86,9 @@ stdenv.mkDerivation rec { ./patches/3.0-darwin-x11.patch ]; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ gettext gobject-introspection @@ -94,15 +98,19 @@ stdenv.mkDerivation rec { pkg-config python3 sassc + gdk-pixbuf ] ++ setupHooks ++ lib.optionals withGtkDoc [ docbook_xml_dtd_43 docbook-xsl-nons gtk-doc # For xmllint libxml2 + ] ++ lib.optionals waylandSupport [ + wayland-scanner ]; buildInputs = [ + gobject-introspection libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes @@ -193,6 +201,8 @@ stdenv.mkDerivation rec { for f in $dev/bin/gtk-encode-symbolic-svg; do wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" done + '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' + GTK_PATH="''${out:?}/lib/gtk-3.0/3.0.0/immodules/" ''${dev:?}/bin/gtk-query-immodules-3.0 > "''${out:?}/lib/gtk-3.0/3.0.0/immodules.cache" ''; # Wrap demos @@ -203,6 +213,9 @@ stdenv.mkDerivation rec { wrapProgram $dev/bin/$program \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" done + '' + lib.optionalString stdenv.isDarwin '' + # a comment created a cycle between outputs + sed '/^# ModulesPath =/d' -i "$out"/lib/gtk-*/*/immodules.cache ''; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index eaf6d5bf1b26..fc3e39b02261 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.2"; + version = "4.6.6"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "/yY69gmlDrdgVmU1ktkpRZrvSBmkRMQ29tUsb2PB+uw="; + sha256 = "e7/k0TVp98KX7UmDSscmPjGLe/EC0ycctGbVlx9ZrnA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix index ed4326527005..d773434b8323 100644 --- a/nixpkgs/pkgs/development/libraries/gtkd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix @@ -1,40 +1,25 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg +{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; in stdenv.mkDerivation rec { pname = "gtkd"; - version = "3.9.0"; - - outputs = [ "out" "dev" ]; + version = "3.10.0"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p"; + sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE="; stripRoot = false; }; - nativeBuildInputs = [ ldc pkg-config which ]; + nativeBuildInputs = [ dcompiler pkg-config which ]; propagatedBuildInputs = [ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte ]; - patches = [ - # Fix makefile not installing .pc's - (fetchpatch { - url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; - sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; - }) - # Fix breakage with dmd ldc 1.26 and newer - (fetchpatch { - url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch"; - sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d"; - }) - ]; - - prePatch = '' + postPatch = '' substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d substituteInPlace generated/gstreamer/gst/app/c/functions.d \ @@ -134,6 +119,10 @@ in stdenv.mkDerivation rec { done ''; + passthru = { + inherit dcompiler; + }; + meta = with lib; { description = "D binding and OO wrapper for GTK"; homepage = "https://gtkd.org"; diff --git a/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix b/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix deleted file mode 100644 index b5399553f960..000000000000 --- a/nixpkgs/pkgs/development/libraries/gtkmathview/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: - -let - pname = "gtkmathview"; - version = "0.8.0"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz"; - sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ t1lib glib gmetadom libxml2 popt]; - propagatedBuildInputs = [gtk2 t1lib]; - - patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; - - meta = { - homepage = "http://helm.cs.unibo.it/mml-widget/"; - description = "C++ rendering engine for MathML documents"; - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.roconnor ]; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch b/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch deleted file mode 100644 index 14ad594b38b8..000000000000 --- a/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.3-build-fixes.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Stefano Zacchiroli <zack@upsilon.cc> -Date: Fri, 11 Dec 2009 12:58:56 +0100 -Subject: [PATCH] gcc 4.3 build fixes - ---- - mathmlps/main.cc | 1 + - mathmlsvg/SMS.cc | 1 + - mathmlsvg/main.cc | 1 + - src/backend/ps/T1_FontDataBase.cc | 2 +- - src/engine/mathml/mathVariantAux.cc | 1 + - 5 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/mathmlps/main.cc b/mathmlps/main.cc -index cc6cd1c..48339af 100644 ---- a/mathmlps/main.cc -+++ b/mathmlps/main.cc -@@ -19,6 +19,7 @@ - #include <config.h> - - #include <cassert> -+#include <cstring> - #include <fstream> - - #include <popt.h> -diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc -index a76266e..be7add8 100644 ---- a/mathmlsvg/SMS.cc -+++ b/mathmlsvg/SMS.cc -@@ -18,6 +18,7 @@ - - #include <config.h> - -+#include <cstring> - #include <sstream> - #include "defs.h" - #include "AbstractLogger.hh" -diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc -index 259d67e..c49e8ac 100644 ---- a/mathmlsvg/main.cc -+++ b/mathmlsvg/main.cc -@@ -19,6 +19,7 @@ - #include <config.h> - - #include <cassert> -+#include <cstring> - #include <fstream> - - #include <popt.h> -diff --git a/src/backend/ps/T1_FontDataBase.cc b/src/backend/ps/T1_FontDataBase.cc -index b6490eb..3dd436c 100644 ---- a/src/backend/ps/T1_FontDataBase.cc -+++ b/src/backend/ps/T1_FontDataBase.cc -@@ -19,7 +19,7 @@ - #include <t1lib.h> - #include <config.h> - #include <map> --#include <string> -+#include <cstring> - #include <stdlib.h> - #include <iostream> - #include <list> -diff --git a/src/engine/mathml/mathVariantAux.cc b/src/engine/mathml/mathVariantAux.cc -index 736acc1..dcf1826 100644 ---- a/src/engine/mathml/mathVariantAux.cc -+++ b/src/engine/mathml/mathVariantAux.cc -@@ -19,6 +19,7 @@ - #include <config.h> - - #include <cassert> -+#include <cstring> - - #include "mathVariantAux.hh" - --- diff --git a/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch b/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch deleted file mode 100644 index 0ebd31ef2a78..000000000000 --- a/nixpkgs/pkgs/development/libraries/gtkmathview/gcc-4.4-build-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Stefano Zacchiroli <zack@upsilon.cc> -Date: Fri, 11 Dec 2009 13:26:26 +0100 -Subject: [PATCH] gcc 4.4 build fixes - ---- - src/common/AbstractLogger.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/common/AbstractLogger.cc b/src/common/AbstractLogger.cc -index 6f638fb..c5b7e3d 100644 ---- a/src/common/AbstractLogger.cc -+++ b/src/common/AbstractLogger.cc -@@ -19,6 +19,7 @@ - #include <config.h> - - #include <stdarg.h> -+#include <stdio.h> - - #include "AbstractLogger.hh" - --- diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix index cf26e22da5bc..284ee83c2d4f 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { - name = "gtkmm-${minVer}.5"; - minVer = "2.24"; + pname = "gtkmm"; + version = "2.24.5"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz"; sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 2d0921cf097f..420dee6cbaaf 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.5"; + version = "3.24.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"; + sha256 = "Sz4ULpROFjO7oAiQBgXDQak8/XVaf6KgCwXQQTQfEdY="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index 81c0abd61b6d..307fb15e98d8 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.4.0"; + version = "5.4.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ADvCF+ZwqOyKo67OmUtw5wt9a4B0k4rdohcYVV2E5jc="; + sha256 = "rRQOB+uEGRDeSDwJK9SIWr0puq3W6V+iLZPtLfC3nec="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/nixpkgs/pkgs/development/libraries/gumbo/default.nix index 91053828b586..b8cfef1f3247 100644 --- a/nixpkgs/pkgs/development/libraries/gumbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/gumbo/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1"; }; - buildInputs = [ autoconf automake libtool ]; + strictDeps = true; + nativeBuildInputs = [ autoconf automake libtool ]; preConfigure = "./autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix index 52baba6bfa58..0ef4ac9a0192 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp-av"; - version = "0.14.0"; + version = "0.14.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IK7VRvyILnij8YagyLzlyEHMOkS36lKCmPvcgllvsVY="; + sha256 = "t5zgzEsMZtnFS8Ihg6EOVwmgAR0q8nICWUjvyrM6Pk8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gusb/default.nix b/nixpkgs/pkgs/development/libraries/gusb/default.nix index 449a7a17623b..e3dac6c4ec70 100644 --- a/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.3.7"; + version = "0.3.10"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "sha256-2l8l1oc2ImibM1FIbL4CjvwlRAP2Rt2BIl3+hULYxn0="; + sha256 = "sha256-DrC5qw+LugxZYxyAnDe2Fu806zyOAAsLm3HPEeSTG9w="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index e02a0be4d28d..28ced142caf4 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.0"; + version = "1.50.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "y8L1ZNLp8Ax2BnP0LWgDvOPggat/+0RW3v//upM5tN0="; + sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/half/default.nix b/nixpkgs/pkgs/development/libraries/half/default.nix index c0d11e9ce773..557ed1ffe90e 100644 --- a/nixpkgs/pkgs/development/libraries/half/default.nix +++ b/nixpkgs/pkgs/development/libraries/half/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "C++ library for half precision floating point arithmetics"; platforms = platforms.all; license = licenses.mit; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index b7ba05bb79b5..8c67ef0a156a 100644 --- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -30,11 +30,10 @@ }: let - version = "3.3.2"; + version = "5.0.1"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; - isNativeCompilation = stdenv.buildPlatform == stdenv.hostPlatform; in stdenv.mkDerivation { @@ -45,7 +44,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "sha256-UbYqV7Ch9ugTIwSsCpjnS8H7tcv4P3OVpFDFDZtQCk0="; + sha256 = "sha256-01hpSTesPpUO2T9v1sq3VvCSFEOMyaxbHhX0vS1ms/k="; }; postPatch = '' @@ -70,7 +69,10 @@ stdenv.mkDerivation { (mesonFeatureFlag "coretext" withCoreText) (mesonFeatureFlag "graphite" withGraphite2) (mesonFeatureFlag "icu" withIcu) - (mesonFeatureFlag "introspection" isNativeCompilation) + ]; + + depsBuildBuild = [ + pkg-config ]; nativeBuildInputs = [ @@ -85,9 +87,8 @@ stdenv.mkDerivation { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype ] - ++ lib.optionals withCoreText [ ApplicationServices CoreText ] - ++ lib.optionals isNativeCompilation [ gobject-introspection ]; + buildInputs = [ glib freetype gobject-introspection ] + ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; diff --git a/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/nixpkgs/pkgs/development/libraries/hidapi/default.nix index ffe534ede4af..b29b64c2a757 100644 --- a/nixpkgs/pkgs/development/libraries/hidapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/hidapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko="; + sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/highfive/default.nix b/nixpkgs/pkgs/development/libraries/highfive/default.nix index 5eb6ceb204e7..8d219b82e448 100644 --- a/nixpkgs/pkgs/development/libraries/highfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "qaIThJGdoLgs82h+W4BKQEu1yy1bB8bZFiuxI7IxInw="; + sha256 = "sha256-P60S3UR8wC3BHxRiqFdSjn6Akvykud40g5yEko5dIjw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/hivex/default.nix b/nixpkgs/pkgs/development/libraries/hivex/default.nix index 204af0a92b57..e5d44edb6e74 100644 --- a/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ - autoreconfHook makeWrapper libxml2 + libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) ++ lib.optionals stdenv.isDarwin [ libiconv ]; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Windows registry hive extraction library"; license = licenses.lgpl2; homepage = "https://github.com/libguestfs/hivex"; diff --git a/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix b/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix new file mode 100644 index 000000000000..3455cf250ce6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, blas +, lapack +}: + + +stdenv.mkDerivation rec { + pname = "hmat-oss"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "jeromerobert"; + repo = "hmat-oss"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Xc8AbeyEtM6R5I4HdgF4XR5/b8ZYBOv34kY1xrYk/Jw="; + }; + + cmakeFlags = [ + "-DHMAT_GIT_VERSION=OFF" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ blas lapack ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A hierarchical matrix C/C++ library"; + homepage = "https://github.com/jeromerobert/hmat-oss"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ gdinh ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/hpx/default.nix b/nixpkgs/pkgs/development/libraries/hpx/default.nix index 0474fd3bc487..2464e95c6b6d 100644 --- a/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "1knx7kr8iw4b7nh116ygd00y68y84jjb4fj58jkay7n5qlrxh604"; + sha256 = "sha256-YJ4wHaPE5E6ngUAYrQB1SkW4IoHW71tUDKKNANVA9Xw="; }; buildInputs = [ asio boost hwloc gperftools ]; diff --git a/nixpkgs/pkgs/development/libraries/hspell/dicts.nix b/nixpkgs/pkgs/development/libraries/hspell/dicts.nix index 83942c2c1dde..06f80bf5cf22 100644 --- a/nixpkgs/pkgs/development/libraries/hspell/dicts.nix +++ b/nixpkgs/pkgs/development/libraries/hspell/dicts.nix @@ -2,7 +2,7 @@ let dict = variant: a: stdenv.mkDerivation ({ - inherit (hspell) src patchPhase nativeBuildInputs; + inherit (hspell) version src patchPhase nativeBuildInputs; buildFlags = [ variant ]; meta = hspell.meta // { @@ -15,7 +15,7 @@ in recurseForDerivations = true; aspell = dict "aspell" { - name = "aspell-dict-he-${hspell.version}"; + pname = "aspell-dict-he"; installPhase = '' mkdir -p $out/lib/aspell @@ -23,7 +23,7 @@ in }; myspell = dict "myspell" { - name = "myspell-dict-he-${hspell.version}"; + pname = "myspell-dict-he"; installPhase = '' mkdir -p $out/lib/myspell @@ -31,7 +31,7 @@ in }; hunspell = dict "hunspell" { - name = "hunspell-dict-he-${hspell.version}"; + pname = "hunspell-dict-he"; installPhase = '' mkdir -p $out/lib diff --git a/nixpkgs/pkgs/development/libraries/htmlcxx/c++17.patch b/nixpkgs/pkgs/development/libraries/htmlcxx/c++17.patch new file mode 100644 index 000000000000..53fa9fbfc8c1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/htmlcxx/c++17.patch @@ -0,0 +1,24 @@ +diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc +--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000 ++++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100 +@@ -7,7 +7,7 @@ + using namespace std; + using namespace htmlcxx; + +-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception) ++CharsetConverter::CharsetConverter(const string &from, const string &to) + { + mIconvDescriptor = iconv_open(to.c_str(), from.c_str()); + if (mIconvDescriptor == (iconv_t)(-1)) +diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h +--- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000 ++++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100 +@@ -17,7 +17,7 @@ + : std::runtime_error(arg) {} + }; + +- CharsetConverter(const std::string &from, const std::string &to) throw (Exception); ++ CharsetConverter(const std::string &from, const std::string &to); + ~CharsetConverter(); + + std::string convert(const std::string &input); diff --git a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix index d9072e46e407..221ec7622ff4 100644 --- a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { pname = "htmlcxx"; - version = "0.86"; + version = "0.87"; src = fetchurl { - url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz"; - sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; + url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg="; }; buildInputs = [ libiconv ]; - patches = [ ./ptrdiff.patch ]; + patches = [ + ./ptrdiff.patch + ./c++17.patch + ]; meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/nixpkgs/pkgs/development/libraries/http-parser/default.nix index 36ca0b0ca0b7..146262a42582 100644 --- a/nixpkgs/pkgs/development/libraries/http-parser/default.nix +++ b/nixpkgs/pkgs/development/libraries/http-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "http-parser"; @@ -12,7 +12,15 @@ stdenv.mkDerivation rec { }; NIX_CFLAGS_COMPILE = "-Wno-error"; - patches = [ ./build-shared.patch ]; + patches = [ + ./build-shared.patch + ] ++ lib.optionals stdenv.isAarch32 [ + # https://github.com/nodejs/http-parser/pull/510 + (fetchpatch { + url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch"; + sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4="; + }) + ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; buildFlags = [ "library" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index ffa8c5d191b9..b6c4c4e6570c 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,8 +45,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ bash coreutils which zip ]; + nativeBuildInputs = [ bash coreutils which zip unzip ]; patchPhase = '' substituteInPlace ortograf/herramientas/make_dict.sh \ --replace /bin/bash bash \ @@ -234,7 +233,7 @@ let sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p"; }; - buildInputs = [ ispell perl hunspell ]; + nativeBuildInputs = [ ispell perl hunspell ]; dontBuild = true; @@ -846,4 +845,15 @@ rec { platforms = platforms.all; }; }; + + /* CROATIAN */ + + hr_HR = hr-hr; + hr-hr = mkDictFromLibreOffice { + shortName = "hr-hr"; + dictFileName = "hr_HR"; + shortDescription = "Croatian (Croatia)"; + readmeFile = "README_hr_HR.txt"; + license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ]; + }; } diff --git a/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix b/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix index 4ae177232751..d67fe2301039 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = (appendToName "with-dicts" hunspell).name; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' - makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} + makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${lib.escapeShellArg searchPath} ''; meta = removeAttrs hunspell.meta ["outputsToInstall"]; } diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix index a1119f4be2c6..308120f194d9 100644 --- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -8,11 +8,11 @@ with lib; stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "1q440fwvhnxz6j8k5bn3bxj86b3lzbr8fgib78l4iq6gxd9yx302"; + sha256 = "sha256-NIpy/NSMMqgj7h2hSa6ZIgPnrQM1SeZK7W6m7rAfQsE="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index 10a53ff1d98f..0e45b277a325 100644 --- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ragel, python3 -, coreutils, gnused, util-linux, fetchpatch +, util-linux, fetchpatch , boost , withStatic ? false # build only shared libs by default, build static+shared if true }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmake ragel python3 # Consider simply using busybox for these # Need at least: rev, sed, cut, nm - coreutils gnused util-linux + util-linux ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/icu/59.nix b/nixpkgs/pkgs/development/libraries/icu/59.nix deleted file mode 100644 index 9ca66ca525fd..000000000000 --- a/nixpkgs/pkgs/development/libraries/icu/59.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "59.1"; - sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; -} diff --git a/nixpkgs/pkgs/development/libraries/icu/65.nix b/nixpkgs/pkgs/development/libraries/icu/65.nix deleted file mode 100644 index c5074eea114d..000000000000 --- a/nixpkgs/pkgs/development/libraries/icu/65.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "65.1"; - sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk"; -} diff --git a/nixpkgs/pkgs/development/libraries/icu/71.nix b/nixpkgs/pkgs/development/libraries/icu/71.nix new file mode 100644 index 000000000000..456dffc322a4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/icu/71.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "71.1"; + sha256 = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8="; +} diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index 441646c43955..e36793debdff 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -12,7 +12,9 @@ , lapack , libxml2 , libxslt +, llvmPackages , pkg-config +, plfit , python3 , sourceHighlight , suitesparse @@ -21,19 +23,15 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-SL9PcT18vFvykCv4VRXxXtlcDAcybmwEImnnKXMciFQ="; + hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc="; }; - # Normally, igraph wants us to call bootstrap.sh, which will call - # tools/getversion.sh. Instead, we're going to put the version directly - # where igraph wants, and then let autoreconfHook do the rest of the - # bootstrap. ~ C. postPatch = '' echo "${version}" > IGRAPH_VERSION '' + lib.optionalString stdenv.isAarch64 '' @@ -65,7 +63,10 @@ stdenv.mkDerivation rec { gmp lapack libxml2 + plfit suitesparse + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp ]; cmakeFlags = [ @@ -75,8 +76,10 @@ stdenv.mkDerivation rec { "-DIGRAPH_USE_INTERNAL_GLPK=OFF" "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" "-DIGRAPH_USE_INTERNAL_GMP=OFF" + "-DIGRAPH_USE_INTERNAL_PLFIT=OFF" "-DIGRAPH_GLPK_SUPPORT=ON" "-DIGRAPH_GRAPHML_SUPPORT=ON" + "-DIGRAPH_OPENMP_SUPPORT=ON" "-DIGRAPH_ENABLE_LTO=AUTO" "-DIGRAPH_ENABLE_TLS=ON" "-DBUILD_SHARED_LIBS=ON" @@ -84,13 +87,6 @@ stdenv.mkDerivation rec { doCheck = true; - # needed to find libigraph, and liblas on darwin - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src" - '' else '' - export LD_LIBRARY_PATH="$PWD/src" - ''; - postInstall = '' mkdir -p "$out/share" cp -r doc "$out/share" @@ -103,6 +99,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The network analysis package"; homepage = "https://igraph.org/"; + changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; diff --git a/nixpkgs/pkgs/development/libraries/ijs/default.nix b/nixpkgs/pkgs/development/libraries/ijs/default.nix index b300731ce440..ad13daef788d 100644 --- a/nixpkgs/pkgs/development/libraries/ijs/default.nix +++ b/nixpkgs/pkgs/development/libraries/ijs/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, autoreconfHook, ghostscript }: stdenv.mkDerivation { - name = "ijs-${ghostscript.version}"; - - inherit (ghostscript) src; + pname = "ijs"; + inherit (ghostscript) version src; postPatch = "cd ijs"; diff --git a/nixpkgs/pkgs/development/libraries/ilixi/default.nix b/nixpkgs/pkgs/development/libraries/ilixi/default.nix deleted file mode 100644 index 385baaaf10df..000000000000 --- a/nixpkgs/pkgs/development/libraries/ilixi/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: - -# TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen, -# Reflex, Wnn, NLS - -stdenv.mkDerivation rec { - pname = "ilixi"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "ilixi"; - repo = "ilixi"; - rev = version; - sha256 = "05h862r9mhis26v8yf967n86qf8y1gdgfzhbqfsr6pjw1k3v3wdr"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; - - configureFlags = [ - "--enable-log-debug" - "--enable-debug" - "--enable-trace" - "--with-examples" - ]; - - meta = with lib; { - description = "Lightweight C++ GUI toolkit for embedded Linux systems"; - homepage = "https://github.com/ilixi/ilixi"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - broken = true; # broken by the directfb 1.6.3 -> 1.7.6 update - }; -} diff --git a/nixpkgs/pkgs/development/libraries/imath/default.nix b/nixpkgs/pkgs/development/libraries/imath/default.nix index b0a98f7b2638..d16bfbc466b9 100644 --- a/nixpkgs/pkgs/development/libraries/imath/default.nix +++ b/nixpkgs/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-FZXIIzAxhd0QlJAV0q7spEa1pNFXutI0WFZbT3izN4M="; + sha256 = "sha256-pniIhpq2eXAZemq8LavXXv6+tGrBkqZ09Kjvi4aZdu8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/imgui/default.nix b/nixpkgs/pkgs/development/libraries/imgui/default.nix index 62f750db62c9..8a5191aa5aea 100644 --- a/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.87"; + version = "1.88"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-H5rqXZFw+2PfVMsYvAK+K+pxxI8HnUC0GlPhooWgEYM="; + sha256 = "sha256-scG47rRE2qZuYYkgDiA3xnxn/9kQlZLRMb/4UjoknI0="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/imlib/default.nix b/nixpkgs/pkgs/development/libraries/imlib/default.nix index 4bc06a97a7b2..dc26eaf1001a 100644 --- a/nixpkgs/pkgs/development/libraries/imlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/imlib/default.nix @@ -1,13 +1,23 @@ -{ lib, stdenv, fetchurl, fetchpatch -, libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng +{ lib +, stdenv +, fetchurl +, fetchpatch +, giflib +, libX11 +, libXext +, libjpeg +, libpng +, libtiff +, xorgproto }: stdenv.mkDerivation rec { pname = "imlib"; version = "1.9.15"; + src = fetchurl { - url = "https://tarballs.nixos.org/imlib-${version}.tar.gz"; - sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; + url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz"; + hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0="; }; patches = [ @@ -34,7 +44,15 @@ stdenv.mkDerivation rec { "--x-libraries=${libX11.out}/lib" ]; - buildInputs = [ libjpeg libXext libX11 xorgproto libtiff giflib libpng ]; + buildInputs = [ + libjpeg + libXext + libX11 + xorgproto + libtiff + giflib + libpng + ]; meta = with lib; { description = "An image loading and rendering library for X11"; diff --git a/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 1447a327e0df..a5dc57c8ffd8 100644 --- a/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -2,9 +2,22 @@ # Image file formats , libjpeg, libtiff, giflib, libpng, libwebp # imlib2 can load images from ID3 tags. -, libid3tag +, libid3tag, librsvg, libheif , freetype , bzip2, pkg-config , x11Support ? true, xlibsWrapper ? null +# Compilation error on Darwin with librsvg. For more information see: +# https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 +, svgSupport ? !stdenv.isDarwin +, heifSupport ? !stdenv.isDarwin + +# for passthru.tests +, libcaca +, diffoscopeMinimal +, feh +, icewm +, openbox +, fluxbox +, enlightenment }: let @@ -12,17 +25,19 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.5"; + version = "1.9.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; - hash = "sha256-RY2DAKp6bUzjU1GDi7pdn9+wiES9WxU8WTjs/kP/Ngo="; + hash = "sha256-SiJAOL//vl1NJQxE4F9O5a4k3P74OVsWd8cVxY92TUM="; }; buildInputs = [ libjpeg libtiff giflib libpng libwebp bzip2 freetype libid3tag - ] ++ optional x11Support xlibsWrapper; + ] ++ optional x11Support xlibsWrapper + ++ optional heifSupport libheif + ++ optional svgSupport librsvg; nativeBuildInputs = [ pkg-config ]; @@ -31,10 +46,23 @@ stdenv.mkDerivation rec { # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors configureFlags = optional stdenv.isDarwin "--enable-amd64=no" + ++ optional (!svgSupport) "--without-svg" + ++ optional (!heifSupport) "--without-heif" ++ optional (!x11Support) "--without-x"; outputs = [ "bin" "out" "dev" ]; + passthru.tests = { + inherit + libcaca + diffoscopeMinimal + feh + icewm + openbox + fluxbox + enlightenment; + }; + meta = with lib; { description = "Image manipulation library"; diff --git a/nixpkgs/pkgs/development/libraries/inih/default.nix b/nixpkgs/pkgs/development/libraries/inih/default.nix index cc979732787b..aa2b3ec88d0e 100644 --- a/nixpkgs/pkgs/development/libraries/inih/default.nix +++ b/nixpkgs/pkgs/development/libraries/inih/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "inih"; - version = "r53"; + version = "53"; src = fetchFromGitHub { owner = "benhoyt"; repo = pname; - rev = version; + rev = "r${version}"; sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple .INI file parser in C, good for embedded systems"; homepage = "https://github.com/benhoyt/inih"; - changelog = "https://github.com/benhoyt/inih/releases/tag/${version}"; + changelog = "https://github.com/benhoyt/inih/releases/tag/r${version}"; license = licenses.bsd3; maintainers = with maintainers; [ TredwellGit ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 5875c8070e76..d3b2cf3992c5 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.1.2"; + version = "22.1.7"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-5exS0B2iRbmFkKtoHzL4NnZ7L3DaukthUYkoj2tpZuE="; + sha256 = "sha256-HRN4SSjP8h8nnCisysDM9V17012ECLz2GgdUok1AV24="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 380f0c1f7e25..5296b5ffa3d9 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.2.2"; + version = "22.5.0"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-ksh8xx46x9OgXBrhJr3FnBI9g4PHXUDhLPbgpvccffM="; + sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA="; }; patches = [ @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; }) + # fix compilation on i686-linux + (fetchpatch { + url = "https://github.com/intel/media-driver/commit/5ee502b84eb70f0d677a3b49d624c356b3f0c2b1.patch"; + revert = true; + sha256 = "sha256-yRS10BKD5IkW8U0PxmyB7ryQiLwrqeetm0NivnoM224="; + }) ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 71a4437397a5..a8591f40ee98 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.2.0"; + version = "22.5.1"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-Hcm48KTuBQbnVHd/T5XqQKbVS/XgJ4TYNbSCc8O53XQ="; + sha256 = "sha256-HTCqJG//byTTlTRdE8IyFGuUaLiNVDfl9swbH6d5gCk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix b/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix new file mode 100644 index 000000000000..752bdbe7b4b9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, zlib +, libpng +, libjpeg +, libGL +, libX11 +, withTouchSupport ? false +, libXi +, libXext +, Cocoa +, Kernel +}: +stdenv.mkDerivation rec { + pname = "irrlichtmt"; + version = "1.9.0mt7"; + + src = fetchFromGitHub { + owner = "minetest"; + repo = "irrlicht"; + rev = version; + sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10="; + }; + + nativeBuildInputs = [ + cmake + ]; + + # https://github.com/minetest/minetest/pull/10729 + postPatch = lib.optionalString (!withTouchSupport) '' + sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h + + # HACK: Fix mistake in build script + sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt + ''; + + buildInputs = [ + zlib + libpng + libjpeg + libGL + libX11 + ] ++ lib.optionals withTouchSupport [ + libXi + libXext + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + Kernel + ]; + + outputs = [ "out" "dev" ]; + + meta = { + homepage = "https://github.com/minetest/irrlicht"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ DeeUnderscore ]; + description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++"; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/isl/generic.nix b/nixpkgs/pkgs/development/libraries/isl/generic.nix index eb6fe5f9cd69..039d7138278b 100644 --- a/nixpkgs/pkgs/development/libraries/isl/generic.nix +++ b/nixpkgs/pkgs/development/libraries/isl/generic.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation { - name = "isl-${version}"; + pname = "isl"; + inherit version; src = fetchurl { inherit urls sha256; @@ -17,6 +18,7 @@ stdenv.mkDerivation { inherit patches; + strictDeps = true; buildInputs = [ gmp ]; inherit configureFlags; diff --git a/nixpkgs/pkgs/development/libraries/jabcode/default.nix b/nixpkgs/pkgs/development/libraries/jabcode/default.nix index 489b44a4e5c4..bc4df3f99ba5 100644 --- a/nixpkgs/pkgs/development/libraries/jabcode/default.nix +++ b/nixpkgs/pkgs/development/libraries/jabcode/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "jabcode-${subproject}"; - version = "unstable-2020-05-13"; + version = "unstable-2021-02-16"; src = fetchFromGitHub { repo = "jabcode"; owner = "jabcode"; - rev = "a7c25d4f248078f257b014e31c791bfcfcd083e1"; - sha256 = "1c4cv9b0d7r4bxzkwzdv9h651ziq822iya6fbyizm57n1nzdkk4s"; + rev = "e342b647525fa294127930d836b54a6b21957cdc"; + sha256 = "04ngw5aa43q7kxfn1v8drmir2i2qakvq0ni0lgf0zw8150mww52x"; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/development/libraries/jansson/default.nix b/nixpkgs/pkgs/development/libraries/jansson/default.nix index 21a697f1e3ab..fbc9a676a85c 100644 --- a/nixpkgs/pkgs/development/libraries/jansson/default.nix +++ b/nixpkgs/pkgs/development/libraries/jansson/default.nix @@ -1,18 +1,30 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "jansson"; - version = "2.13.1"; + version = "2.14"; - src = fetchurl { - url = "https://digip.org/jansson/releases/${pname}-${version}.tar.gz"; - sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl"; + src = fetchFromGitHub { + owner = "akheron"; + repo = "jansson"; + rev = "v${version}"; + sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4="; }; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # networkmanager relies on libjansson.so: + # https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453 + "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + meta = with lib; { - homepage = "http://www.digip.org/jansson/"; + homepage = "https://github.com/akheron/jansson"; description = "C library for encoding, decoding and manipulating JSON data"; + changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES"; license = licenses.mit; platforms = platforms.all; + maintainers = [ maintainers.marsam ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix b/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix new file mode 100644 index 000000000000..0cbfdcea6447 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, catch2_3 +}: + +stdenv.mkDerivation rec { + pname = "jarowinkler-cpp"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "jarowinkler-cpp"; + rev = "v${version}"; + hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = lib.optionals doCheck [ + "-DJARO_WINKLER_BUILD_TESTING=ON" + ]; + + checkInputs = [ + catch2_3 + ]; + + doCheck = true; + + meta = { + description = "Fast Jaro and Jaro-Winkler distance"; + homepage = "https://github.com/maxbachmann/jarowinkler-cpp"; + changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix index 104320a8d89f..0a121d923146 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ copumpkin ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix index 22a9fae358d2..f55029335e58 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Interface to scripting languages, including JSR-223"; homepage = "https://commons.apache.org/proper/commons-bsf/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix index c685eb691c5f..ba17eb1532d5 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix index f6f909904cf5..e41c475c829d 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.3.1"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "0bsy4xn3gncgrxj3vkpplvyhx06c1470kycj0j5gwq46ylgady9s"; + sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw="; }; installPhase = '' @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-daemon"; description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes."; maintainers = with lib.maintainers; [ rsynnest ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix index 73b5d0d140a2..40c66909213e 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix index d8b32607a9e5..7c1c9f361145 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-io"; description = "A library of utilities to assist with developing IO functionality"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix index 07e94148817e..b9ccfef8382c 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-lang"; description = "Provides additional methods to manipulate standard Java library classes"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix index f98c8bd72e0c..71832498c34a 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper around a variety of logging API implementations"; homepage = "https://commons.apache.org/proper/commons-logging"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix index 5543532015e0..4f928db4cf3b 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-math/"; description = "A library of lightweight, self-contained mathematics and statistics components"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix index 8f678ce7555b..e4041241dcf9 100644 --- a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.6.1"; + version = "2.7.0"; underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-cixyEwjEt68UOotd1TcJNyVUxTRDx4XyfyYg9k6kRtQ="; + sha256 = "sha256-nLBCigQMPF6QbjrUuSDjP2ir38TmzC5Pa8Rjpk1BkcQ="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://hsqldb.org"; description = "A relational, embedable database management system written in Java and a set of related tools"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/libraries/java/jffi/default.nix b/nixpkgs/pkgs/development/libraries/java/jffi/default.nix index c15a6ddb819c..ef1445da9903 100644 --- a/nixpkgs/pkgs/development/libraries/java/jffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/jffi/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Java Foreign Function Interface "; homepage = "https://github.com/jnr/jffi"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index 4eee98157d50..f7f2a619a1c9 100644 --- a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.22"; + version = "1.18.24"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-7O8VgUEdeoLMBCgWZ+4LrF18ClqudM/DhDA5bJHDGDE="; + sha256 = "sha256-01hLwtsD8Fn5hPsKnBGarB+g2leKRI5p/D9os2WEx0k="; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A library that can write a lot of boilerplate for your Java project"; platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; homepage = "https://projectlombok.org/"; maintainers = [ lib.maintainers.CrystalGamma ]; diff --git a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix index 93b222357840..022f68a9d351 100644 --- a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generic unit testing framework and methodology for testing any kind of code"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/development/libraries/java/saxon/default.nix b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix index da1e6120da63..484f9017ae70 100644 --- a/nixpkgs/pkgs/development/libraries/java/saxon/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix @@ -29,6 +29,7 @@ let meta = with lib; { inherit description license; homepage = "http://saxon.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/java/smack/default.nix b/nixpkgs/pkgs/development/libraries/java/smack/default.nix index 5c032f5469ce..fd263d91d426 100644 --- a/nixpkgs/pkgs/development/libraries/java/smack/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/smack/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A XMPP (Jabber) client library for instant messaging and presence"; homepage = "http://www.igniterealtime.org/projects/smack/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; license = lib.licenses.asl20; }; diff --git a/nixpkgs/pkgs/development/libraries/java/swt/default.nix b/nixpkgs/pkgs/development/libraries/java/swt/default.nix index b85b348a9640..4c900ed21ac6 100644 --- a/nixpkgs/pkgs/development/libraries/java/swt/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/swt/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { "R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip"; inherit (metadata) sha256; stripRoot = false; - extraPostFetch = '' + postFetch = '' mkdir "$unpackDir" cd "$unpackDir" diff --git a/nixpkgs/pkgs/development/libraries/jcal/default.nix b/nixpkgs/pkgs/development/libraries/jcal/default.nix index 4ce62ec67bc4..354a5518c43d 100644 --- a/nixpkgs/pkgs/development/libraries/jcal/default.nix +++ b/nixpkgs/pkgs/development/libraries/jcal/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "jcal"; + pname = "jcal"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix new file mode 100644 index 000000000000..1f422d9d6336 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -0,0 +1,38 @@ +{ ffmpeg_5-full +, nv-codec-headers-11 +, fetchFromGitHub +, lib +}: + +(ffmpeg_5-full.override { + nv-codec-headers = nv-codec-headers-11; +}).overrideAttrs (old: rec { + pname = "jellyfin-ffmpeg"; + version = "5.1-1"; + + src = fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-ffmpeg"; + rev = "v${version}"; + sha256 = "sha256-R3+SJ2RNaRRK6+N9eGOf/0qUgaXkT/cswkxf+7W2+Fo="; + }; + + configureFlags = old.configureFlags ++ [ + "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 + ]; + + postPatch = '' + for file in $(cat debian/patches/series); do + patch -p1 < debian/patches/$file + done + + ${old.postPatch or ""} + ''; + + meta = with lib; { + description = "${old.meta.description} (Jellyfin fork)"; + homepage = "https://github.com/jellyfin/jellyfin-ffmpeg"; + license = licenses.gpl3; + maintainers = with maintainers; [ justinas ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/jemalloc/default.nix b/nixpkgs/pkgs/development/libraries/jemalloc/default.nix index 8ed9219fb7b4..6f9cb774c2a8 100644 --- a/nixpkgs/pkgs/development/libraries/jemalloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/jemalloc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. @@ -13,21 +12,13 @@ stdenv.mkDerivation rec { pname = "jemalloc"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + sha256 = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo="; }; - patches = [ - # workaround https://github.com/jemalloc/jemalloc/issues/2091 - (fetchpatch { - url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff"; - sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI="; - }) - ]; - # see the comment on stripPrefix configureFlags = [] ++ lib.optional stripPrefix "--with-jemalloc-prefix=" @@ -41,6 +32,8 @@ stdenv.mkDerivation rec { ] ; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + doCheck = true; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/jose/default.nix b/nixpkgs/pkgs/development/libraries/jose/default.nix index b15fead62699..08fc7e6dc99e 100644 --- a/nixpkgs/pkgs/development/libraries/jose/default.nix +++ b/nixpkgs/pkgs/development/libraries/jose/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, asciidoc , zlib, jansson, openssl }: stdenv.mkDerivation rec { pname = "jose"; - version = "10"; + version = "11"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi"; + hash = "sha256-TKcXswF50B8MS+XHSEvqHaFSAct7VdsnZ0RtZCF04Lc="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; buildInputs = [ zlib jansson openssl ]; outputs = [ "out" "dev" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "C-language implementation of Javascript Object Signing and Encryption"; homepage = "https://github.com/latchset/jose"; - maintainers = with lib.maintainers; [ fpletz ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/libraries/json-c/default.nix b/nixpkgs/pkgs/development/libraries/json-c/default.nix index 5a77ea789afe..d6aac7161d4f 100644 --- a/nixpkgs/pkgs/development/libraries/json-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "json-c"; - version = "0.15"; + version = "0.16"; src = fetchurl { url = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz"; - sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q"; + sha256 = "sha256-jkWsj5bsd5Hq87t+5Q6cIQC7vIe40PHQMMW6igKI2Ws="; }; outputs = [ "out" "dev" ]; @@ -15,16 +15,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A JSON implementation in C"; - homepage = "https://github.com/json-c/json-c/wiki"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.mit; - longDescription = '' JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects. ''; + homepage = "https://github.com/json-c/json-c/wiki"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/nixpkgs/pkgs/development/libraries/json-glib/default.nix index e041908f3f48..1f8f4fd1acc0 100644 --- a/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -6,10 +6,10 @@ , ninja , pkg-config , gettext -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection -, fixDarwinDylibNames , gi-docgen +, libxslt +, fixDarwinDylibNames , gnome }: @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { pname = "json-glib"; version = "1.6.6"; - outputs = [ "out" "dev" ] - ++ lib.optional withIntrospection "devdoc"; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -37,22 +36,28 @@ stdenv.mkDerivation rec { pkg-config gettext glib - ] ++ lib.optional stdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ] ++ lib.optionals withIntrospection [ + libxslt gobject-introspection gi-docgen + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ glib ]; - mesonFlags = lib.optionals (!withIntrospection) [ - "-Dintrospection=disabled" - # gi-docgen relies on introspection data - "-Dgtk_doc=disabled" - ]; + + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + postPatch = '' + substituteInPlace doc/meson.build \ + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + ''; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 9adf509f8aaa..d9cf9a6c4346 100644 --- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, validatePkgConfig, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, validatePkgConfig +, fetchpatch +, secureMemory ? false +, enableStatic ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -30,22 +39,29 @@ stdenv.mkDerivation rec { export sourceRoot=${src.name} ''; - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + postPatch = lib.optionalString secureMemory '' + sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h ''; nativeBuildInputs = [ cmake python3 validatePkgConfig ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_STATIC_LIBS=OFF" "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" - ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DJSONCPP_WITH_TESTS=OFF"; + ] + # the test's won't compile if secureMemory is used because there is no + # comparison operators and conversion functions between + # std::basic_string<..., Json::SecureAllocator<char>> vs. + # std::basic_string<..., [default allocator]> + ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF" + ++ lib.optional (!enableStatic) "-DBUILD_STATIC_LIBS=OFF"; + + # this is fixed and no longer necessary in 1.9.5 but there they use + # memset_s without switching to a different c++ standard in the cmake files + postInstall = lib.optionalString enableStatic '' + (cd $out/lib && ln -sf libjsoncpp_static.a libjsoncpp.a) + ''; meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; diff --git a/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix b/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix index 75a07b17a7ee..4647d65882cd 100644 --- a/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix +++ b/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "kcolorpicker"; - version = "0.1.6"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ksnip"; repo = "kColorPicker"; rev = "v${version}"; - sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd"; + sha256 = "sha256-ahmMj/yzQiRP9oJwDuhJGxe849kxNsoGFDZ2CGQNhKs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix index e3d340955405..5ab33fcf46fd 100644 --- a/nixpkgs/pkgs/development/libraries/kdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix @@ -6,7 +6,7 @@ , qtbase , qttranslations , kcoreaddons -, python2 +, python3 , sqlite , postgresql , libmysqlclient @@ -36,7 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ]; + buildInputs = [ qttranslations kcoreaddons python3 sqlite postgresql libmysqlclient ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix index 8c71afd5dcf7..dbe4dd14b8f5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase }: mkDerivation { - name = "attica"; + pname = "attica"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix index 0c8f181a188a..73df056516e8 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "baloo"; + pname = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative @@ -14,4 +14,12 @@ mkDerivation { ]; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; + + # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` + # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one + # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) + postUnpack = '' + substituteInPlace "$sourceRoot"/src/file/kde-baloo.service.in \ + --replace @KDE_INSTALL_FULL_BINDIR@ /run/current-system/sw/bin + ''; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index c5764b4915ed..c07553f8493f 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bluez-qt"; + pname = "bluez-qt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtdeclarative ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 6e79a45ea921..7fd482ea0da0 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gtk3, qtsvg, hicolor-icon-theme }: mkDerivation { - name = "breeze-icons"; + pname = "breeze-icons"; nativeBuildInputs = [ extra-cmake-modules gtk3 ]; buildInputs = [ qtsvg ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix index a5b0bfdae8de..e9a333c98a19 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix @@ -70,8 +70,8 @@ let mkDerivation = args: let - inherit (args) name; - inherit (srcs.${name}) src version; + inherit (args) pname; + inherit (srcs.${pname}) src version; outputs = args.outputs or [ "bin" "dev" "out" ]; hasSeparateDev = lib.elem "dev" outputs; @@ -82,7 +82,7 @@ let meta = let meta = args.meta or {}; in meta // { - homepage = meta.homepage or "http://www.kde.org"; + homepage = meta.homepage or "https://kde.org"; license = meta.license or license; maintainers = (meta.maintainers or []) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; @@ -90,8 +90,7 @@ let }; in mkDerivation (args // { - name = "${name}-${version}"; - inherit meta outputs setupHook src version; + inherit pname meta outputs setupHook src version; }); }; @@ -153,8 +152,8 @@ let # TIER 3 baloo = callPackage ./baloo.nix {}; kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; + kcmutils = callPackage ./kcmutils.nix {}; + kconfigwidgets = callPackage ./kconfigwidgets.nix {}; kdav = callPackage ./kdav.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; kded = callPackage ./kded.nix {}; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index b74fb29e5f2a..b274999010a2 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, pkg-config }: mkDerivation { - name = "extra-cmake-modules"; + pname = "extra-cmake-modules"; patches = [ ./nix-lib-path.patch diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index cb4e4cc26298..c677884c01fb 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.91/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.97/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index c49eab2763c5..6cb700c77744 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "frameworkintegration"; + pname = "frameworkintegration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 88fde8c5fd6d..63a5b0357241 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kactivities-stats"; + pname = "kactivities-stats"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kactivities kconfig ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities.nix index b53de41455ad..f2f5d09cc8e6 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kactivities"; + pname = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kio kwindowsystem qtdeclarative diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix index 381dacaf4961..c7dde83bf611 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,9 +1,26 @@ -{ mkDerivation, lib, extra-cmake-modules, python3 }: +{ mkDerivation, python3, qtbase }: mkDerivation { - name = "kapidox"; - nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ]; - postFixup = '' - moveToOutput bin $bin + pname = "kapidox"; + nativeBuildInputs = [ python3.pkgs.setuptools qtbase ]; + + buildInputs = with python3.pkgs; [ jinja2 pyyaml requests ]; + + postPatch = '' + sed -i -e 's|"doxy\w\+", ||g' setup.py + ''; + + buildPhase = '' + runHook preBuild + ${python3.interpreter} setup.py build + runHook postBuild ''; + + installPhase = '' + runHook preInstall + ${python3.interpreter} setup.py install --prefix="$out" + runHook postInstall + ''; + + outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix index bd010f3f11cf..822b28f3deea 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "karchive"; + pname = "karchive"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ bzip2 xz zlib zstd ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 93c81525a148..f5ab518ce621 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kauth"; + pname = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 4d68c3694bd3..1c45a4acb097 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kbookmarks"; + pname = "kbookmarks"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index f4f2b05ad736..3f02765af8ea 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalendarcore"; + pname = "kcalendarcore"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ libical ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils.nix index 22e2929ae0cb..a275e7175713 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils.nix @@ -6,14 +6,11 @@ }: mkDerivation { - name = "kcmutils"; + pname = "kcmutils"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui qtdeclarative ]; propagatedBuildInputs = [ kconfigwidgets kservice ]; - patches = [ - ./0001-kcmutils-follow-symlinks.patch - ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch deleted file mode 100644 index 32adca6d2e05..000000000000 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Mon, 13 Jul 2020 11:23:36 -0500 -Subject: [PATCH] kcmutils follow symlinks - ---- - src/kpluginselector.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index 46deef5..2eacb9f 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - for (const QString &dir : dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } --- -2.25.4 - diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix index a62135150a0f..69a9e812494e 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase, qttools, gperf }: mkDerivation { - name = "kcodecs"; + pname = "kcodecs"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools gperf ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix index ffa612ffaa19..28b4715f98f9 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcompletion"; + pname = "kcompletion"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kwidgetsaddons qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix index ba16e97ef3a6..76d9a85e649c 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase, qttools }: mkDerivation { - name = "kconfig"; + pname = "kconfig"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix index fc10f3070b64..4b20daf052a0 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix @@ -4,11 +4,10 @@ }: mkDerivation { - name = "kconfigwidgets"; + pname = "kconfigwidgets"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kguiaddons ki18n qtbase qttools ]; propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; - patches = [ ./0001-QDirIterator-follow-symlinks.patch ]; outputs = [ "out" "dev" ]; outputBin = "dev"; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch deleted file mode 100644 index 30cfafafab97..000000000000 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 05c0eb5d803ac52c0dd97a98f6d2821650c3c14c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Sun, 28 Mar 2021 06:09:47 -0500 -Subject: [PATCH] QDirIterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index a053cd7..787d375 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -34,7 +34,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - for (const QString &dir : desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); --- -2.30.1 - diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcontacts.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcontacts.nix index 56887b775f4a..0d26d064dd2b 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcontacts.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcontacts.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcontacts"; + pname = "kcontacts"; meta = { license = [ lib.licenses.lgpl21 ]; }; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index a2102c7d7323..f790d802c0ca 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcoreaddons"; + pname = "kcoreaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcrash.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcrash.nix index 27dc6d65edff..4658ab5c6dae 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcrash"; + pname = "kcrash"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdav.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdav.nix index a03cca3fdf26..92d57158e320 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdav.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdav.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdav"; + pname = "kdav"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; }; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index 5c435b445414..b123129cf8d1 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdbusaddons"; + pname = "kdbusaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 1389df5eb152..08f7cb5d3785 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdeclarative"; + pname = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix index 250a999f4d6c..180d508acc58 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kded"; + pname = "kded"; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 392aa9ea9025..1e7b30738752 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdelibs4support"; + pname = "kdelibs4support"; patches = [ ./nix-kde-include-dir.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index f1305274070f..6244b82397a2 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kdesignerplugin"; + pname = "kdesignerplugin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix index 9a5f5a6942a8..fe506401da4e 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdesu"; + pname = "kdesu"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ]; propagatedBuildInputs = [ kpty ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix index 9f682b449752..b6d548cabfcd 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "kdewebkit"; + pname = "kdewebkit"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons kio kparts ]; propagatedBuildInputs = [ qtwebkit ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 8bb59bb36dba..545057e7ef1f 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdnssd"; + pname = "kdnssd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index a87bef40b1e2..83f3a04ee36a 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kdoctools"; + pname = "kdoctools"; nativeBuildInputs = [ extra-cmake-modules # The build system insists on having native Perl. diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kemoticons.nix index 66a0889b13d2..67613d274a75 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kemoticons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kemoticons"; + pname = "kemoticons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kcoreaddons ]; propagatedBuildInputs = [ kservice qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 7c16dcf46507..782b03322143 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -15,7 +15,7 @@ }: mkDerivation { - name = "kfilemetadata"; + pname = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attr diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 7001c98ee00f..ab181b8d902d 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kglobalaccel"; + pname = "kglobalaccel"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index bcd18ab614b6..98f7e178fb64 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,13 +1,13 @@ { mkDerivation , extra-cmake-modules -, qtbase, qtx11extras, wayland +, qtbase, qtx11extras, wayland, plasma-wayland-protocols }: mkDerivation { - name = "kguiaddons"; + pname = "kguiaddons"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras wayland ]; + buildInputs = [ qtx11extras wayland plasma-wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kholidays.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kholidays.nix index 2ede69e74953..9484dece57ed 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kholidays.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kholidays.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kholidays"; + pname = "kholidays"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = with lib.maintainers; [ bkchr ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/khtml.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/khtml.nix index 3ef3a043c4e1..9677ffb78a5e 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "khtml"; + pname = "khtml"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix index 46f502d06bb4..be8016155b87 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ki18n"; + pname = "ki18n"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python3 ]; buildInputs = [ qtdeclarative qtscript ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 122f3108da44..f807193718d5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kiconthemes"; + pname = "kiconthemes"; patches = [ ./default-theme-breeze.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix index 2678cf0804eb..6379a5e2e31b 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kidletime"; + pname = "kidletime"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 97b413e805c6..cbdaf1da892d 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,18 +1,21 @@ { mkDerivation, lib, extra-cmake-modules, - ilmbase, karchive, openexr, libavif, qtbase + ilmbase, karchive, openexr, libavif, libheif, qtbase }: let inherit (lib) getDev; in mkDerivation { - name = "kimageformats"; + pname = "kimageformats"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive openexr libavif qtbase ]; + buildInputs = [ karchive openexr libavif libheif qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; + cmakeFlags = [ + "-DKIMAGEFORMATS_HEIF=ON" + ]; meta = with lib; { broken = versionOlder qtbase.version "5.14"; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix index dcd84f1f35a1..9acd56f324cb 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -7,7 +7,7 @@ let inherit (lib) getLib; in mkDerivation { - name = "kinit"; + pname = "kinit"; outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index 5c05e0159b5b..7b2815945c8c 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kio"; + pname = "kio"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix index bb5a5a3fc80f..281a490bf90a 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }: mkDerivation { - name = "kirigami2"; + pname = "kirigami2"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 0f398b0f57d1..8abed8aaa090 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kitemmodels"; + pname = "kitemmodels"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 0e772978e191..ef350835f05d 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kitemviews"; + pname = "kitemviews"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 2e116b7bb793..a4a6d5bb1025 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kjobwidgets"; + pname = "kjobwidgets"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kjs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjs.nix index 33aeb284e167..a0f985323747 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kjs"; + pname = "kjs"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ pcre qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjsembed.nix index f552f963513d..576727e81d2f 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kjsembed.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kjsembed"; + pname = "kjsembed"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ ki18n qtsvg ]; propagatedBuildInputs = [ kjs ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 5de26e0c8dcb..f92c22956511 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmediaplayer"; + pname = "kmediaplayer"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kparts kxmlgui ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 6d170c0bb129..6e554b5faaad 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "knewstuff"; + pname = "knewstuff"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix index d1a809d9f516..363ca46d10ae 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "knotifications"; + pname = "knotifications"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 1971e3e8039b..b2415d731ff0 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "knotifyconfig"; + pname = "knotifyconfig"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfig ki18n kio phonon ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index d4edc09b2f00..c1d9bf387fc5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kpackage"; + pname = "kpackage"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kparts.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kparts.nix index e1d2a156160d..682c2da63132 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kparts.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kparts.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kparts"; + pname = "kparts"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kpeople.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpeople.nix index 52c16ea2b9c2..433cc6b6e113 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpeople.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kpeople"; + pname = "kpeople"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix index 68df24d0087b..eb26b252566b 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "kplotting"; + pname = "kplotting"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qttools ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kpty.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpty.nix index 2456f4e22fab..239407d6abdf 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kpty.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kpty.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }: mkDerivation { - name = "kpty"; + pname = "kpty"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 0ae30be653d4..20c1b2368a7b 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kquickcharts"; + pname = "kquickcharts"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtquickcontrols2 ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kross.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kross.nix index 189e100aa70c..7cc083e5a261 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kross.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kross.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kross"; + pname = "kross"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kcoreaddons kxmlgui ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix index 7db7c61db466..a56e56a2fe09 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -7,7 +7,7 @@ let self = mkDerivation { - name = "krunner"; + pname = "krunner"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kio kservice qtdeclarative solid diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix index c1488f728dd6..008c52cf0785 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kservice"; + pname = "kservice"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedNativeBuildInputs = [ bison flex ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 6a74dca7b4bd..5788c07cb05c 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "ktexteditor"; + pname = "ktexteditor"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 653d0ac8899b..6ce7aa88c3a6 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "ktextwidgets"; + pname = "ktextwidgets"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index de0d9aab922e..aa4c87a1e5f9 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kunitconversion.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, ki18n, qtbase, }: mkDerivation { - name = "kunitconversion"; + pname = "kunitconversion"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwallet.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwallet.nix index f93f0437dbd1..01ad788ba112 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -3,15 +3,16 @@ extra-cmake-modules, kdoctools, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n, kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem, - libgcrypt, qgpgme, qtbase, + libgcrypt, qgpgme, qtbase, qca-qt5 }: mkDerivation { - name = "kwallet"; + pname = "kwallet"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes - knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme + knotifications kservice kwidgetsaddons kwindowsystem + libgcrypt qgpgme qca-qt5 ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix index 749735c4ad58..6a070d227808 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kwayland"; + pname = "kwayland"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index ee347df18ab8..0fead3bfd6ba 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kwidgetsaddons"; + pname = "kwidgetsaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 7643572a7ec0..ec102dbb342a 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwindowsystem"; + pname = "kwindowsystem"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index 0b29158e4b06..c666edbc196d 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kxmlgui"; + pname = "kxmlgui"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index aa334d69ef1d..3b2d869d1777 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, ki18n, kio }: mkDerivation { - name = "kxmlrpcclient"; + pname = "kxmlrpcclient"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n ]; propagatedBuildInputs = [ kio ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index 5ecb5317cfcc..507e24e8f61e 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "modemmanager-qt"; + pname = "modemmanager-qt"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 2ff4b2c2b408..b79c79b084da 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "networkmanager-qt"; + pname = "networkmanager-qt"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 32b219ab7e1c..7121944d5d39 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "oxygen-icons5"; + pname = "oxygen-icons5"; meta.license = lib.licenses.lgpl3Plus; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 12540b07007c..cf118beaabce 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "plasma-framework"; + pname = "plasma-framework"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/prison.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/prison.nix index 670fd02d6161..c2063e22bba7 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/prison.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/prison.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "prison"; + pname = "prison"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libdmtx qrencode ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix index 0f376ce9ec3a..ee4e9584641c 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "purpose"; + pname = "purpose"; nativeBuildInputs = [ extra-cmake-modules intltool ]; buildInputs = [ qtbase accounts-qt qtdeclarative kaccounts-integration kconfig kcoreaddons diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix index e400967407c6..6d8635c4f283 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "qqc2-desktop-style"; + pname = "qqc2-desktop-style"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix index aa1b1ebe3458..69ef8c8adca3 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "solid"; + pname = "solid"; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix index 2eff7bad2402..78aa189559fc 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "sonnet"; + pname = "sonnet"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ aspell qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 2b3983a892c8..eb49fa51b862 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/attica-5.91.0.tar.xz"; - sha256 = "0svvy7qflidwxns12y2lra54gg6lhglcddzmrw7ccvbdyqcy2pn0"; - name = "attica-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/attica-5.97.0.tar.xz"; + sha256 = "0ciq7dbr027g8dgkfs4l3ys9fdhxlgkr0hd1mip3fngwcjn2my65"; + name = "attica-5.97.0.tar.xz"; }; }; baloo = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/baloo-5.91.0.tar.xz"; - sha256 = "1cqjbaiwqba707xaz9zsrdz9cms2mdrhv6jpwsq8q7f4g4rxcx3m"; - name = "baloo-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/baloo-5.97.0.tar.xz"; + sha256 = "0s2rpaz5dk0zixm6x51h6h9g4997g3sjj6mmqjx2fnyaxh79r1hz"; + name = "baloo-5.97.0.tar.xz"; }; }; bluez-qt = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/bluez-qt-5.91.0.tar.xz"; - sha256 = "0p37jrmppwahh4vaq3wkw6xn0ms8dxcxpfd4glzjlnw426zrwnjr"; - name = "bluez-qt-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/bluez-qt-5.97.0.tar.xz"; + sha256 = "16gawrq75008r70hjf38fk7w9y1ns2x9vrxs953gbg58ygaryfh3"; + name = "bluez-qt-5.97.0.tar.xz"; }; }; breeze-icons = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/breeze-icons-5.91.0.tar.xz"; - sha256 = "0aj24gn48c17n9jzrj0az04ph4hpx7zf2rj4vgwl19iip69vfzf1"; - name = "breeze-icons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/breeze-icons-5.97.0.tar.xz"; + sha256 = "18vij7ihdyd6mar971yci2925c2j5l9q0479931h563ph8i49bkf"; + name = "breeze-icons-5.97.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/extra-cmake-modules-5.91.0.tar.xz"; - sha256 = "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp"; - name = "extra-cmake-modules-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/extra-cmake-modules-5.97.0.tar.xz"; + sha256 = "02n5xywig2pksbkxfckd0dn97mdn6qjv3shyqryscayqvbrkblly"; + name = "extra-cmake-modules-5.97.0.tar.xz"; }; }; frameworkintegration = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/frameworkintegration-5.91.0.tar.xz"; - sha256 = "1176ql8f96ap4gzjaj8vm4cr6f2rsx9z93gpc4hx4jcqjhxqrg3z"; - name = "frameworkintegration-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/frameworkintegration-5.97.0.tar.xz"; + sha256 = "1srj8gnvb3mhppiiy2p489vwj0rcq0j91h4q4halmbl3hd9j4s1v"; + name = "frameworkintegration-5.97.0.tar.xz"; }; }; kactivities = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kactivities-5.91.0.tar.xz"; - sha256 = "03y4hx7jgrhac12ys8pm22h0f49kms8b71gck4xv577p3ywi3j60"; - name = "kactivities-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kactivities-5.97.0.tar.xz"; + sha256 = "0dyg0rd8cwc3vyb7p3d1n5c670d4f87s09q017ml88pndxpbnbfi"; + name = "kactivities-5.97.0.tar.xz"; }; }; kactivities-stats = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kactivities-stats-5.91.0.tar.xz"; - sha256 = "0864qfljh20723djfzdv8h6nipw01825lhiknyqz17aj2x2ymzcq"; - name = "kactivities-stats-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kactivities-stats-5.97.0.tar.xz"; + sha256 = "1nwbp36p8hk6wwyf4mq4ijy57ig6lass8kyla31dkhy95nqc79p8"; + name = "kactivities-stats-5.97.0.tar.xz"; }; }; kapidox = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kapidox-5.91.0.tar.xz"; - sha256 = "1xxpl8rn49d2cr7ld94j3wsg21019l2kq14p5bvilisnj3salka3"; - name = "kapidox-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kapidox-5.97.0.tar.xz"; + sha256 = "0rg91cv60r4my7cvj9kjrp06jghgk5kwslqi8b5s9hjh2c0w73wx"; + name = "kapidox-5.97.0.tar.xz"; }; }; karchive = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/karchive-5.91.0.tar.xz"; - sha256 = "1kjc47zzdd9jhcmynq6zw6y6zaj2c1i8pxvszx3d9x5asaz2qq53"; - name = "karchive-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/karchive-5.97.0.tar.xz"; + sha256 = "14ldrbkzlm59sjysirvj8yhihgyy4x85w54ydj8khnmvvm4q5zqv"; + name = "karchive-5.97.0.tar.xz"; }; }; kauth = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kauth-5.91.0.tar.xz"; - sha256 = "001svdyvs8qc6h8zkb9x072npkz6xabz6j0djjb380gl9h9wnrgq"; - name = "kauth-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kauth-5.97.0.tar.xz"; + sha256 = "1xa2r9qwi0h3740f07dj4qxzvr9qgaqjjwbf3lj5g1k2nd9wakfp"; + name = "kauth-5.97.0.tar.xz"; }; }; kbookmarks = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kbookmarks-5.91.0.tar.xz"; - sha256 = "0iqfngsvpbgxk6h8l68idcp97df28sa2zwj707zs0mf2bl9k68m4"; - name = "kbookmarks-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kbookmarks-5.97.0.tar.xz"; + sha256 = "0skbw5m3ihg8v4g46gfvbvgrhdfav6sx26l9jcjx0pfi85ksqvbp"; + name = "kbookmarks-5.97.0.tar.xz"; }; }; kcalendarcore = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcalendarcore-5.91.0.tar.xz"; - sha256 = "0gkn0mzk3za86pjrpi8gd9d71bfv0ihzkgn8yy1ik3dw1rf9gxip"; - name = "kcalendarcore-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcalendarcore-5.97.0.tar.xz"; + sha256 = "1476yjbww2cwxnc84nmdgc3r7wi50hj2jjmh6qgfa8067w2sx9yq"; + name = "kcalendarcore-5.97.0.tar.xz"; }; }; kcmutils = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcmutils-5.91.0.tar.xz"; - sha256 = "009r9r7fz1588g2cnqw585d2fz170x8j8bip1zqr7i4jl21ms68s"; - name = "kcmutils-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcmutils-5.97.0.tar.xz"; + sha256 = "0xasda9bi455fmmqdhmapdm6n7sg5m1kgvzh5zx7r43s6jshf6dd"; + name = "kcmutils-5.97.0.tar.xz"; }; }; kcodecs = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcodecs-5.91.0.tar.xz"; - sha256 = "0qkwvbp4vp3w57f3fyjknxd66qac77hl77mf042c7jxjl5vq7h1y"; - name = "kcodecs-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcodecs-5.97.0.tar.xz"; + sha256 = "0w16il3gqy76x4l7135jgi1sfxz4yl9zss2r53mgm583m0bybrk3"; + name = "kcodecs-5.97.0.tar.xz"; }; }; kcompletion = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcompletion-5.91.0.tar.xz"; - sha256 = "1l6z85a4rh3vrf4x5g3pqvp0q36gwmw0fbp9ny1iaqyy21dlh8i4"; - name = "kcompletion-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcompletion-5.97.0.tar.xz"; + sha256 = "19lygg1x12yx41rrh1fklzhrg86nbhg6cji2i25g50ycsd7f1cba"; + name = "kcompletion-5.97.0.tar.xz"; }; }; kconfig = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kconfig-5.91.0.tar.xz"; - sha256 = "0axdnqipa8xgx864zylxllnzchlp50q59bbfw3c98svvvkm3yg56"; - name = "kconfig-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kconfig-5.97.0.tar.xz"; + sha256 = "0bgnagh8kljakvx9rg461fvispf1f37pcd8z9qxr6flwgw67gzlh"; + name = "kconfig-5.97.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kconfigwidgets-5.91.0.tar.xz"; - sha256 = "01mvv01hv64wadjh8xk3hhp1vbs04cvbrjpfl1g9cv2sa6hr7102"; - name = "kconfigwidgets-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kconfigwidgets-5.97.0.tar.xz"; + sha256 = "0a44qp3c3isi7xgjcqhs0npiisgf379nxlswmyblmlm00rn03ii0"; + name = "kconfigwidgets-5.97.0.tar.xz"; }; }; kcontacts = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcontacts-5.91.0.tar.xz"; - sha256 = "1c839c9rvys3jwmi3fzw06r1nhgvrb4z8sdh8gda0w03vqh7h1hv"; - name = "kcontacts-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcontacts-5.97.0.tar.xz"; + sha256 = "026rjgmi6lgvm30799klkbcmwfhzlixsbdqyjvzcpsszxh0nj6dq"; + name = "kcontacts-5.97.0.tar.xz"; }; }; kcoreaddons = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcoreaddons-5.91.0.tar.xz"; - sha256 = "16vimllvcs6rnb1ccbv9zg8hxbzacisgrlffyvwm608f4q1xmqyz"; - name = "kcoreaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcoreaddons-5.97.0.tar.xz"; + sha256 = "1ah28900l7j8nb3v3q7xsmmvrq6cv63b8gyisbcw6kryhw9kah09"; + name = "kcoreaddons-5.97.0.tar.xz"; }; }; kcrash = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcrash-5.91.0.tar.xz"; - sha256 = "0gdknmp5a36ipvzms4jhxywyxpjh0vy26861c54jfsk13yircjal"; - name = "kcrash-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcrash-5.97.0.tar.xz"; + sha256 = "1ipmm012v9zvxf7fxcl811xzxw9h6a6d6lzmnn589h9h3n6j8wgg"; + name = "kcrash-5.97.0.tar.xz"; }; }; kdav = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdav-5.91.0.tar.xz"; - sha256 = "026w3bk2lmc7lqzra8w9jq8i2l1hvqsxz36r1jzj9p01skhdm32v"; - name = "kdav-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdav-5.97.0.tar.xz"; + sha256 = "1nx5zks5svxszhnm4732w9kh17p20bh66z90gl77zxgixqsq93fm"; + name = "kdav-5.97.0.tar.xz"; }; }; kdbusaddons = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdbusaddons-5.91.0.tar.xz"; - sha256 = "18qhpj0s4abypkb8ix2d84wv1kqv6qxyblninn2f9hjkl2dnlwis"; - name = "kdbusaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdbusaddons-5.97.0.tar.xz"; + sha256 = "0b8j2bj4zn7a9yhba44almsvq1s6vg7s3s5gr97mj7mz2hlyiiqk"; + name = "kdbusaddons-5.97.0.tar.xz"; }; }; kdeclarative = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdeclarative-5.91.0.tar.xz"; - sha256 = "183df5c0xyjqsip0izqvvk4wy2bjb973900s1wqsldhhvc7gpf7z"; - name = "kdeclarative-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdeclarative-5.97.0.tar.xz"; + sha256 = "0w2s3139xz7001awzs9wpjd23qp5hxzw0k3sgljnwqa36scd4s5y"; + name = "kdeclarative-5.97.0.tar.xz"; }; }; kded = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kded-5.91.0.tar.xz"; - sha256 = "1zi0sixlzaxvw4lfil2r36i3xrav3vfwxp2r1lp4n65dpl7nv7p5"; - name = "kded-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kded-5.97.0.tar.xz"; + sha256 = "19znbzhifix0r2wzsr5f7fj839ymlpjwlpagpkwsx57pg21k9p2b"; + name = "kded-5.97.0.tar.xz"; }; }; kdelibs4support = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kdelibs4support-5.91.0.tar.xz"; - sha256 = "1373fi9vi7ki8frr0lsw6yp335i95v8yq2j41s7ip003dpy4hr2g"; - name = "kdelibs4support-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kdelibs4support-5.97.0.tar.xz"; + sha256 = "04a14i0g59wj54lzq34s8av9mxkfw8jcvlgv3pg87l8xwq4xvpqs"; + name = "kdelibs4support-5.97.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kdesignerplugin-5.91.0.tar.xz"; - sha256 = "07lvvryc3k418hd0j7ddlqhid26c51isa8mvk7g6gd0v2x3gp76q"; - name = "kdesignerplugin-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kdesignerplugin-5.97.0.tar.xz"; + sha256 = "087xycnizfw7psnha2f9v16nxphvdnly3ymqywcjwv213cd7y1r8"; + name = "kdesignerplugin-5.97.0.tar.xz"; }; }; kdesu = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdesu-5.91.0.tar.xz"; - sha256 = "1wj099w810dabqn43pqis4sism3zwq3d1qa9mvcdyjafqbl7xnjm"; - name = "kdesu-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdesu-5.97.0.tar.xz"; + sha256 = "1csgsrj1jld4p9rqpda4c9wckk224m6zyhhybfqh0mhz78pvcbk5"; + name = "kdesu-5.97.0.tar.xz"; }; }; kdewebkit = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kdewebkit-5.91.0.tar.xz"; - sha256 = "1mln0w1dzrbpm373vfpcyss4xxnrfgwh9nhzr8wmzs8965bn3wqq"; - name = "kdewebkit-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kdewebkit-5.97.0.tar.xz"; + sha256 = "1dijacbg76mn9l13fk8cl0kgj98g8wkky3z1210x65gjgqgzl97f"; + name = "kdewebkit-5.97.0.tar.xz"; }; }; kdnssd = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdnssd-5.91.0.tar.xz"; - sha256 = "1smzwh7lvz8g7vydxnd2kkh0ymg7yp6akc7k2vg8q65pa6pxqn3g"; - name = "kdnssd-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdnssd-5.97.0.tar.xz"; + sha256 = "0lmlwb4b06fy8myvai76srx4i1w60vw58mn14sy7l88kr28xc12d"; + name = "kdnssd-5.97.0.tar.xz"; }; }; kdoctools = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdoctools-5.91.0.tar.xz"; - sha256 = "02lr4l4n5gnv7ffzml8lbrdwgfpq6m7ayhz3bdqqijdfvw6h283n"; - name = "kdoctools-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdoctools-5.97.0.tar.xz"; + sha256 = "1xha2l0sqf4zyqbwglfc946pw483fcl9g43vlmnxrk9qsfr75b31"; + name = "kdoctools-5.97.0.tar.xz"; }; }; kemoticons = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kemoticons-5.91.0.tar.xz"; - sha256 = "1jznkiq87rkndv10xs6974b5k0v82ly32agy5acxc2xy9wq7la0h"; - name = "kemoticons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kemoticons-5.97.0.tar.xz"; + sha256 = "02ii85h7l508xhf9f05pfw0c4vldr102v7lbygk5mlrcpgmgqnp2"; + name = "kemoticons-5.97.0.tar.xz"; }; }; kfilemetadata = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kfilemetadata-5.91.0.tar.xz"; - sha256 = "1z030irzcvmjq329nwfk3h8cd51dwy9mppnwbgcd0lw6y3bka0rq"; - name = "kfilemetadata-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kfilemetadata-5.97.0.tar.xz"; + sha256 = "08bhs3nq5q362qfqhz3z4znm0svbjy8blcdgy3l0smfpfr8xhbrz"; + name = "kfilemetadata-5.97.0.tar.xz"; }; }; kglobalaccel = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kglobalaccel-5.91.0.tar.xz"; - sha256 = "09wscg6f19sh314ywpxp47pdr1xf1wzpjchg9rcjg207zrfhqqf0"; - name = "kglobalaccel-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kglobalaccel-5.97.0.tar.xz"; + sha256 = "0cdbwyckad5a7rlv1kcmpp51q32clbi86cbggap9l9r8h99x7i75"; + name = "kglobalaccel-5.97.0.tar.xz"; }; }; kguiaddons = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kguiaddons-5.91.0.tar.xz"; - sha256 = "0gn8lvpm4i11s5vavlpm162bizjkmh5cb4dhj3p34dlp4vcc4mky"; - name = "kguiaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kguiaddons-5.97.0.tar.xz"; + sha256 = "10kmjq38ykbxhp5vr797vmgcv8jf28g2nrkx0j3myhwq1xgmjy7v"; + name = "kguiaddons-5.97.0.tar.xz"; }; }; kholidays = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kholidays-5.91.0.tar.xz"; - sha256 = "165vfmi5y8l00ng494469w5s1gjnf9zkggqrzmq65dfkdis3amdm"; - name = "kholidays-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kholidays-5.97.0.tar.xz"; + sha256 = "0b5qr7vmrshp5hghxbab0q26i01aafw2za4qmj779cj9givpm3vj"; + name = "kholidays-5.97.0.tar.xz"; }; }; khtml = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/khtml-5.91.0.tar.xz"; - sha256 = "1ldkk1f954mmgz30vqa895z1nw2jaknnb53lsd5vqxzxi3cmc054"; - name = "khtml-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/khtml-5.97.0.tar.xz"; + sha256 = "14dv3734z0m53rc1clx4qdm020pwc251ac9dvmpvg2x294vlj5kc"; + name = "khtml-5.97.0.tar.xz"; }; }; ki18n = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/ki18n-5.91.0.tar.xz"; - sha256 = "11gdd2gvzsz3r8zvqbxxwbpwjvjwnzzhzyrd4spbpdy0w7j8n6ly"; - name = "ki18n-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/ki18n-5.97.0.tar.xz"; + sha256 = "07hyz3vaqwd12g92gwrmzd3p2wx3qksfnnd560kan5f8g1pnsbq3"; + name = "ki18n-5.97.0.tar.xz"; }; }; kiconthemes = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kiconthemes-5.91.0.tar.xz"; - sha256 = "1khh4ngivwdj9rxxcpx08ka8anskc9i1z9n2zijp4m5ix8mmj3c2"; - name = "kiconthemes-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kiconthemes-5.97.0.tar.xz"; + sha256 = "04csm9hb6inp1v0471xsqgxim5748s2k1fxl5lzmpzmbmslcdwcl"; + name = "kiconthemes-5.97.0.tar.xz"; }; }; kidletime = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kidletime-5.91.0.tar.xz"; - sha256 = "12qmiwc8p3izj1y5h0rndj2s496ckm1p85dv4g51zbpg7m8a48qv"; - name = "kidletime-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kidletime-5.97.0.tar.xz"; + sha256 = "0aq4qpplafzsipflfjf463xp5p68gpcfssdr8lpkx84lqqa0k89m"; + name = "kidletime-5.97.0.tar.xz"; }; }; kimageformats = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kimageformats-5.91.0.tar.xz"; - sha256 = "0df8in33xwajqay487w0hjfsplz8y51w9sjb75na7yqsn75p38xb"; - name = "kimageformats-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kimageformats-5.97.0.tar.xz"; + sha256 = "04ajq25xh4iyxfnm658h6fd9z8ipn5dgwd640ax9walbp4pkd0zb"; + name = "kimageformats-5.97.0.tar.xz"; }; }; kinit = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kinit-5.91.0.tar.xz"; - sha256 = "1y62k24mwzbg4gchvjb8wn6ygq57wc72clb3jgyipw034czdihvi"; - name = "kinit-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kinit-5.97.0.tar.xz"; + sha256 = "19ac8i0dvh6q2sqrgk3rjg231x5n4k6d4hd0vgjycyxjmi3aqmjq"; + name = "kinit-5.97.0.tar.xz"; }; }; kio = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kio-5.91.0.tar.xz"; - sha256 = "14v28qilb5ayv9shw86hb88k60nr4bbd2pa4vwsqij9xkwlympgj"; - name = "kio-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kio-5.97.0.tar.xz"; + sha256 = "11sqcy0m3867ss9hgs5n7jmwck0rmdql2b1mp5q99d4fg98816yc"; + name = "kio-5.97.0.tar.xz"; }; }; kirigami2 = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kirigami2-5.91.0.tar.xz"; - sha256 = "0ifljwa6hli2rndfadpzs30dpwc99nnvcm3yi9j5dim2bdf6glwc"; - name = "kirigami2-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kirigami2-5.97.0.tar.xz"; + sha256 = "016ny2pf34cll4zwxxfj0r4fjkvbm0mmac5z7d22dq6cgqrdz7j4"; + name = "kirigami2-5.97.0.tar.xz"; }; }; kitemmodels = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kitemmodels-5.91.0.tar.xz"; - sha256 = "189kgrw2vjr9067mqr4f2sv06xmnjaapry0bf8s41v6r9v7py708"; - name = "kitemmodels-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kitemmodels-5.97.0.tar.xz"; + sha256 = "0vxlajl8lvddxrwnq3zdcm4sj36r6nyczplwk97xsr5q52minpbw"; + name = "kitemmodels-5.97.0.tar.xz"; }; }; kitemviews = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kitemviews-5.91.0.tar.xz"; - sha256 = "16cm4zmv1ngrsmy6k0ybv5wxd0g8cc8zwq6ab7jvs7a04sykv238"; - name = "kitemviews-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kitemviews-5.97.0.tar.xz"; + sha256 = "1ggv3lf1z5986g837kq0dw2pkwd032zzdx2c9zs5zal1y7aid6f5"; + name = "kitemviews-5.97.0.tar.xz"; }; }; kjobwidgets = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kjobwidgets-5.91.0.tar.xz"; - sha256 = "14pkyd6j78kignr62xfkvpyi2fwvzcvcsdnn23h8jxkhwm2ri42v"; - name = "kjobwidgets-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kjobwidgets-5.97.0.tar.xz"; + sha256 = "16s2rjbmxz6x1kmnx9mg8sa42p65ps5jk074s86vg9qnhk0jxkf9"; + name = "kjobwidgets-5.97.0.tar.xz"; }; }; kjs = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kjs-5.91.0.tar.xz"; - sha256 = "0jbwlnmf8whzgjkrbnsvdsnn3kv0h44ghf63m2qcgg2l9wb0j8rj"; - name = "kjs-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kjs-5.97.0.tar.xz"; + sha256 = "1y6wgfc85smlp3kqxyma0h0nnn5z5hzszy0xdvbl76c1azby2n8f"; + name = "kjs-5.97.0.tar.xz"; }; }; kjsembed = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kjsembed-5.91.0.tar.xz"; - sha256 = "124y7518jhjg3y2x7bcyl6b3c0bfxfbgd2sz6dwk45y4byx7rl60"; - name = "kjsembed-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kjsembed-5.97.0.tar.xz"; + sha256 = "07s0xpcvxslnyk6z6ilz2h57in5g4a1xa6yi896isqwihqc28kxx"; + name = "kjsembed-5.97.0.tar.xz"; }; }; kmediaplayer = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kmediaplayer-5.91.0.tar.xz"; - sha256 = "0rn9azrj8k1m67y9ni0f3nwl9ldf1ksiqv6dgnzrx6xh0rxfm2h1"; - name = "kmediaplayer-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kmediaplayer-5.97.0.tar.xz"; + sha256 = "14hc5kz98smihlnnf5lg5i6mw8xnblix7jaql2x1ym6vj7vbnjks"; + name = "kmediaplayer-5.97.0.tar.xz"; }; }; knewstuff = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/knewstuff-5.91.0.tar.xz"; - sha256 = "0akaxi9klmpwn4pyr6ys5sxcapdspldq1f64im7vd6byzqrgpnax"; - name = "knewstuff-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/knewstuff-5.97.0.tar.xz"; + sha256 = "0k49zbypxw0b79nbmhc59q2bz4h0whaq72if5nfa4jdxrvfvn9yp"; + name = "knewstuff-5.97.0.tar.xz"; }; }; knotifications = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/knotifications-5.91.0.tar.xz"; - sha256 = "1207rimq8si1zxnn827631a1hskrd3m3ilgaj3wj859qrbkqmxzm"; - name = "knotifications-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/knotifications-5.97.0.tar.xz"; + sha256 = "07ylq0ynb66cp5v7p26j49w65kadza8zkww3wl32nnvi3qa68qz3"; + name = "knotifications-5.97.0.tar.xz"; }; }; knotifyconfig = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/knotifyconfig-5.91.0.tar.xz"; - sha256 = "07m5mphd8mrak5sdqlldbcd51946v49xpcwi9fhn7w0kx29hknyf"; - name = "knotifyconfig-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/knotifyconfig-5.97.0.tar.xz"; + sha256 = "1yldfc44k1z7s1f3yqzdm0dgg84xlzqddllkrxc60cf6aaq7pnhv"; + name = "knotifyconfig-5.97.0.tar.xz"; }; }; kpackage = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kpackage-5.91.0.tar.xz"; - sha256 = "12w8lfwifa107wlrld3zz774hczn9mkib6wqxw24yxxmzfw9lc2i"; - name = "kpackage-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kpackage-5.97.0.tar.xz"; + sha256 = "03j184bnv7lnbx2srqxhv9q5klgr0dvrfdwhx1b56jpmxjrdf79c"; + name = "kpackage-5.97.0.tar.xz"; }; }; kparts = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kparts-5.91.0.tar.xz"; - sha256 = "10ni6b114acjnmrahvvqw75iqkc10ii97y3z7lirj2727a3qmzzj"; - name = "kparts-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kparts-5.97.0.tar.xz"; + sha256 = "0l95af7c9m79z1pwyzzhdihd2wksjxy0vnl6h4a5qi35a553v0zg"; + name = "kparts-5.97.0.tar.xz"; }; }; kpeople = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kpeople-5.91.0.tar.xz"; - sha256 = "09l2q8cg9p8g7zkd1mjx6x08bqkr4ykxjibskc184asff7v47gvp"; - name = "kpeople-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kpeople-5.97.0.tar.xz"; + sha256 = "1fy2dpfbhcmi0v08ik6pbb31z29m1g91l14p98ny3g6sy6r1l83v"; + name = "kpeople-5.97.0.tar.xz"; }; }; kplotting = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kplotting-5.91.0.tar.xz"; - sha256 = "0rgmmliw9cfi0j2miszqz2kphqm04r5nfs8dqq6pnvclk1k9kss6"; - name = "kplotting-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kplotting-5.97.0.tar.xz"; + sha256 = "03pa2qbpm6qsc9v6i6wqr15jwjkgywzdwy7jl6cxrh9acdmy3ljy"; + name = "kplotting-5.97.0.tar.xz"; }; }; kpty = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kpty-5.91.0.tar.xz"; - sha256 = "1yy1k96kikvvnlyd00krc08ifiqbrz0x5vwv3pgdbpnwgl8p580d"; - name = "kpty-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kpty-5.97.0.tar.xz"; + sha256 = "1i0a53l1ik44blxy7xg3lf2l2x2idxfrxn1rnjdgm119klysdic7"; + name = "kpty-5.97.0.tar.xz"; }; }; kquickcharts = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kquickcharts-5.91.0.tar.xz"; - sha256 = "1ghiymm257b8xgmkibb7s7bwb28x3zhnrgrrsya47q5njb87h0ck"; - name = "kquickcharts-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kquickcharts-5.97.0.tar.xz"; + sha256 = "1v2zky53hvwbqnbh0wj8n6rp0lp59qii4k5gm3j2pfcjzrdj8an1"; + name = "kquickcharts-5.97.0.tar.xz"; }; }; kross = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kross-5.91.0.tar.xz"; - sha256 = "06f8220jmvjsfbzjkr2ybwicwjffbi3yw9sr3bcyrilchrrpgqal"; - name = "kross-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kross-5.97.0.tar.xz"; + sha256 = "0143l7nxq0j207cjvs0srcllvfyzpwrzxmcrdl22hrj951j1aq5s"; + name = "kross-5.97.0.tar.xz"; }; }; krunner = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/krunner-5.91.0.tar.xz"; - sha256 = "17iaw55rkzyfpgkbw2an6pa4wid79b0dnb3310vfaq0xkm0gjxq6"; - name = "krunner-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/krunner-5.97.0.tar.xz"; + sha256 = "0addv0whngqzfvsi1gcsiissin3sa7gg8n5kd3nnp03w7kqbapr9"; + name = "krunner-5.97.0.tar.xz"; }; }; kservice = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kservice-5.91.0.tar.xz"; - sha256 = "0m4j7djiyapi1hm23lz9nd238rrlldxlggzkqq056z486v2137bp"; - name = "kservice-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kservice-5.97.0.tar.xz"; + sha256 = "0bi07qdnl99g4kwxikh5nb4n6ihnn5hg8g1sl64jkggd06l1c03d"; + name = "kservice-5.97.0.tar.xz"; }; }; ktexteditor = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/ktexteditor-5.91.0.tar.xz"; - sha256 = "1bkz6v1y5vyxav398a6224ldqa9pqhbad3vmhxrjb2hxcbha2cpm"; - name = "ktexteditor-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/ktexteditor-5.97.0.tar.xz"; + sha256 = "02hwh736zlb98vkd83sz8a2ywqcv3wbik2pscdg746ff2pvqnwlb"; + name = "ktexteditor-5.97.0.tar.xz"; }; }; ktextwidgets = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/ktextwidgets-5.91.0.tar.xz"; - sha256 = "0xmzrak5mwg1l4v38g14i7j1yr3j6sj13q2iqa433hs5agl6l6n4"; - name = "ktextwidgets-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/ktextwidgets-5.97.0.tar.xz"; + sha256 = "1kwa52f1nyidxjkcipp5r3p1cp5m4xdm57cr77vv9krzhcaznhmx"; + name = "ktextwidgets-5.97.0.tar.xz"; }; }; kunitconversion = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kunitconversion-5.91.0.tar.xz"; - sha256 = "0n2v0f08s71z2imhn41jkm2knjvk7bkwmcz70gs8h97ykrj6niap"; - name = "kunitconversion-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kunitconversion-5.97.0.tar.xz"; + sha256 = "1pspm7ka6yvy7pbdsfliyzr0xi20m8krd4qvy24jy4rn0wa5xy6v"; + name = "kunitconversion-5.97.0.tar.xz"; }; }; kwallet = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwallet-5.91.0.tar.xz"; - sha256 = "1z1qb6a2b5rqj7js88ms8n67fbs885pw6djbf1l86na2zhf0adip"; - name = "kwallet-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwallet-5.97.0.tar.xz"; + sha256 = "08fqjxsnqiifp5knsb0w5ajx5713c1z4p5s7cbg6395bqsq7i6xb"; + name = "kwallet-5.97.0.tar.xz"; }; }; kwayland = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwayland-5.91.0.tar.xz"; - sha256 = "1a03ckacp39lpsqyykkm6lxajxm71s6ifpzgj8q0a37v75jzmz9y"; - name = "kwayland-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwayland-5.97.0.tar.xz"; + sha256 = "0g6a618kdgsra0b7mkg3hyvxm3lzwnmz5j2mlkhmmkfci5n02wg5"; + name = "kwayland-5.97.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwidgetsaddons-5.91.0.tar.xz"; - sha256 = "03pj98sgybkcz487vr774x05w46imnipq2794nkv426nnhyxrd73"; - name = "kwidgetsaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwidgetsaddons-5.97.0.tar.xz"; + sha256 = "05xcnrv27m7xfhgkfmgrbrfg6m6bb3p65iqb8gxjjs0357jcgh3s"; + name = "kwidgetsaddons-5.97.0.tar.xz"; }; }; kwindowsystem = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwindowsystem-5.91.0.tar.xz"; - sha256 = "1yy02fvfabrsvdpmrkdnjdsdd3d2crxavsl47si6ry8fdxb90y95"; - name = "kwindowsystem-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwindowsystem-5.97.0.tar.xz"; + sha256 = "1wgybsf3n16q66pkgcg3hjypmfl9cam69bcz98xf074s6ybaf8mq"; + name = "kwindowsystem-5.97.0.tar.xz"; }; }; kxmlgui = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kxmlgui-5.91.0.tar.xz"; - sha256 = "1qww2isx99lx0mn1dv0vzrvmr2xdp8zgikyvgw1wf8hfay3v2s1g"; - name = "kxmlgui-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kxmlgui-5.97.0.tar.xz"; + sha256 = "1xdd30r9a3f611h8kmk53mybyil870159b7qr7v13g5asqlpkwds"; + name = "kxmlgui-5.97.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kxmlrpcclient-5.91.0.tar.xz"; - sha256 = "1bnymf5wq4apjsgshvbhcggdw7jc0yxv4jag3k19ff9820lskhph"; - name = "kxmlrpcclient-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kxmlrpcclient-5.97.0.tar.xz"; + sha256 = "02fkzf9z983r2mfyjwyhpzf9b3qpk8bavh1pixbvwd6iddmqhnj9"; + name = "kxmlrpcclient-5.97.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/modemmanager-qt-5.91.0.tar.xz"; - sha256 = "15l46lkh8nkal1nai494dabaysy581jzi8nwrv4kjvc6qwc3yrx2"; - name = "modemmanager-qt-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/modemmanager-qt-5.97.0.tar.xz"; + sha256 = "0qg56r4j3mlyp27zjdrhwckw4a10zfp4bpzwr35m37ccsb80304k"; + name = "modemmanager-qt-5.97.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/networkmanager-qt-5.91.0.tar.xz"; - sha256 = "0f27qin2ks3q7rin53sk9vjjnadjnax99d9k245sjr6fjpczy81f"; - name = "networkmanager-qt-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/networkmanager-qt-5.97.0.tar.xz"; + sha256 = "10bczach9x3az29h32rn6h0gnz4ghj8dn8ynm93jkkjmw87asml5"; + name = "networkmanager-qt-5.97.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/oxygen-icons5-5.91.0.tar.xz"; - sha256 = "0j3j2lyxr2iz68vasvpjqkix4bnnj6wc4sr97i6x6z06zq0kawai"; - name = "oxygen-icons5-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/oxygen-icons5-5.97.0.tar.xz"; + sha256 = "1ypr4l1205jzc9cpdin64a2rk0bz4x0wjy7k87lswm2643w6sjsm"; + name = "oxygen-icons5-5.97.0.tar.xz"; }; }; plasma-framework = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/plasma-framework-5.91.0.tar.xz"; - sha256 = "0ydhhpnwf7lfl3kdjsw92mgsza5gy292f7v6kyby4ygjnir1hizl"; - name = "plasma-framework-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/plasma-framework-5.97.0.tar.xz"; + sha256 = "09xmjmv9l26dpyngwks66lb48clfwfagpndavf2djcfjid4pv63k"; + name = "plasma-framework-5.97.0.tar.xz"; }; }; prison = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/prison-5.91.0.tar.xz"; - sha256 = "0k1zp3jzh8gjsji6wh5g8k41zdl8s1vd58ipm0lxy670a71wcqcg"; - name = "prison-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/prison-5.97.0.tar.xz"; + sha256 = "06skmwxb1hkg2h1q2fhgkbbsdnvhg6l930533n446g42p7qlzw56"; + name = "prison-5.97.0.tar.xz"; }; }; purpose = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/purpose-5.91.0.tar.xz"; - sha256 = "1z6wpz7d9byx4n5zx6chmyy9k1jkmghdgahsvkqsc33z6hnh2b4m"; - name = "purpose-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/purpose-5.97.0.tar.xz"; + sha256 = "17sih5a5v28qpwrvc1jq3b2hhi7qrbwaw14swg0iz89icbaxizl3"; + name = "purpose-5.97.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/qqc2-desktop-style-5.91.0.tar.xz"; - sha256 = "0rd9rvffhif8yckwr7axjcv5iqn5b0jdviij7f9y8vjpkzyjvm8i"; - name = "qqc2-desktop-style-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/qqc2-desktop-style-5.97.0.tar.xz"; + sha256 = "19ily5hn1hmyqw9d2qwm7440zzr3kjdz1qf2n073w2miqgp6fsa6"; + name = "qqc2-desktop-style-5.97.0.tar.xz"; }; }; solid = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/solid-5.91.0.tar.xz"; - sha256 = "1a4k0amyg8mvfr2ld7v8zyphhxv33yybh55vqcshwv4a0jm1wmjg"; - name = "solid-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/solid-5.97.0.tar.xz"; + sha256 = "17aclbb8jwdj4hd6kz3svgla5i5rm03xj7cavdinbvy2g13avh44"; + name = "solid-5.97.0.tar.xz"; }; }; sonnet = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/sonnet-5.91.0.tar.xz"; - sha256 = "067xj5mllpzl0gnxxljhfi9y4xdgrpqbckm7pykczzqrklrrx8dx"; - name = "sonnet-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/sonnet-5.97.0.tar.xz"; + sha256 = "14qijjhm0ar14nw03dp192gnmlx13xgybw2iv71nrxg7cybp74m3"; + name = "sonnet-5.97.0.tar.xz"; }; }; syndication = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/syndication-5.91.0.tar.xz"; - sha256 = "1f2kb6mh1xc1k1bn536lq9gq0j2lb65qw4vpp4ixynlfij4zq1gy"; - name = "syndication-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/syndication-5.97.0.tar.xz"; + sha256 = "0qcxmsirzqbycndw4grvpcmvyfz01crj7cdlazj92a5gckz640jn"; + name = "syndication-5.97.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/syntax-highlighting-5.91.0.tar.xz"; - sha256 = "0fprqi2z8issh3jkql6labszkwd3cpvd6qadsg9fi46vfjr4a2ip"; - name = "syntax-highlighting-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/syntax-highlighting-5.97.0.tar.xz"; + sha256 = "17d9a2mr0g3l62nqvrsmwkhraxjc26bw8hxf27xwpngazy8rd2z8"; + name = "syntax-highlighting-5.97.0.tar.xz"; }; }; threadweaver = { - version = "5.91.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/threadweaver-5.91.0.tar.xz"; - sha256 = "1900kqglkwzkjc24mvl0j7jf7xcx6cr6b1g78s5b5m18rw050j12"; - name = "threadweaver-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/threadweaver-5.97.0.tar.xz"; + sha256 = "13s0zjmjwqpzxv14h7x8d12av4icgdnhgzb9qcdc82gazq1mv5s6"; + name = "threadweaver-5.97.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/syndication.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/syndication.nix index fd5a9b9db846..1d32f9b70219 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/syndication.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/syndication.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "syndication"; + pname = "syndication"; meta.maintainers = [ lib.maintainers.bkchr ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index a295b23f3210..fee392140f7e 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "syntax-highlighting"; + pname = "syntax-highlighting"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix index bfa529c9267a..fb43b9f28b06 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "threadweaver"; + pname = "threadweaver"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index c632c2fdac9e..7397824f9a76 100644 --- a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds , openssl, openldap, libedit, keyutils +, nixosTests # Extra Arguments , type ? "" @@ -16,56 +17,62 @@ let libOnly = type == "lib"; in -with lib; stdenv.mkDerivation rec { - name = "${type}krb5-${version}"; - version = "1.19.2"; + pname = "${type}krb5"; + version = "1.20"; src = fetchurl { - url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h"; + url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; + sha256 = "sha256-fgIr3TyFGDAXP5+qoAaiMKDg/a1MlT6Fv/S/DaA24S8"; }; outputs = [ "out" "dev" ]; - configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] + configureFlags = [ "--localstatedir=/var/lib" ] # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time. # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737 - ++ optional staticOnly [ "--enable-static" "--disable-shared" ] - ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' - ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) + ++ lib.optional staticOnly [ "--enable-static" "--disable-shared" ] + ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" "ac_cv_printf_positional=yes" ]; nativeBuildInputs = [ pkg-config perl ] - ++ optional (!libOnly) bison + ++ lib.optional (!libOnly) bison # Provides the mig command used by the build scripts - ++ optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.isDarwin bootstrap_cmds; buildInputs = [ openssl ] - ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] - ++ optionals (!libOnly) [ openldap libedit ]; + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] + ++ lib.optionals (!libOnly) [ openldap libedit ]; - preConfigure = "cd ./src"; + sourceRoot = "krb5-${version}/src"; + + libFolders = [ "util" "include" "lib" "build-tools" ]; + + buildPhase = lib.optionalString libOnly '' + runHook preBuild - buildPhase = optionalString libOnly '' MAKE="make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES" - (cd util; $MAKE) - (cd include; $MAKE) - (cd lib; $MAKE) - (cd build-tools; $MAKE) + for folder in $libFolders; do + $MAKE -C $folder + done + + runHook postBuild ''; - installPhase = optionalString libOnly '' + installPhase = lib.optionalString libOnly '' + runHook preInstall + mkdir -p "$out"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}} \ "$dev"/include/{gssapi,gssrpc,kadm5,krb5} - (cd util; $MAKE install) - (cd include; $MAKE install) - (cd lib; $MAKE install) - (cd build-tools; $MAKE install) - ${postInstall} + for folder in $libFolders; do + $MAKE -C $folder install + done + + runHook postInstall ''; # not via outputBin, due to reference from libkrb5.so @@ -76,12 +83,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # fails with "No suitable file for testing purposes" - meta = { + meta = with lib; { description = "MIT Kerberos 5"; homepage = "http://web.mit.edu/kerberos/"; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; }; - passthru.implementation = "krb5"; + passthru = { + implementation = "krb5"; + tests = { inherit (nixosTests) kerberos; }; + }; } diff --git a/nixpkgs/pkgs/development/libraries/keybinder/default.nix b/nixpkgs/pkgs/development/libraries/keybinder/default.nix index 95eb0ce4de0a..ee1b4fb8ce8a 100644 --- a/nixpkgs/pkgs/development/libraries/keybinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/keybinder/default.nix @@ -15,9 +15,9 @@ in stdenv.mkDerivation rec { sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ - autoconf automake libtool gnome.gnome-common gtk-doc gtk2 + libtool gnome.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/keystone/default.nix b/nixpkgs/pkgs/development/libraries/keystone/default.nix index 70864bcf24a9..0bb979f7a550 100644 --- a/nixpkgs/pkgs/development/libraries/keystone/default.nix +++ b/nixpkgs/pkgs/development/libraries/keystone/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keystone-engine.org"; license = licenses.gpl2Only; maintainers = with maintainers; [ luc65r ]; + mainProgram = "kstool"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 732efda1df46..8ff7b9332476 100644 --- a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { - name = "khronos-ocl-icd-loader-${version}"; + pname = "khronos-ocl-icd-loader"; version = "2022.01.04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix b/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix index 508f795edfed..66d1fc9a4788 100644 --- a/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix +++ b/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "kimageannotator"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ksnip"; repo = "kImageAnnotator"; rev = "v${version}"; - sha256 = "sha256-dkZa+OhU3w4dUy/Edd0R2UFNYuIdeYe3H1SOtW5ario="; + sha256 = "sha256-fWMaat5IguEZwoEJiEjGrWIbOqdJhs25qOebxpWVQQk="; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kompute/default.nix b/nixpkgs/pkgs/development/libraries/kompute/default.nix new file mode 100644 index 000000000000..426aaf3c581e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kompute/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, vulkan-headers +, vulkan-loader +, fmt +, glslang +, ninja +}: + +stdenv.mkDerivation rec { + pname = "kompute"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "KomputeProject"; + repo = "kompute"; + rev = "v${version}"; + sha256 = "sha256-OkVGYh8QrD7JNqWFBLrDTYlk6IYHdvt4i7UtC4sQTzo="; + }; + + cmakeFlags = [ + "-DKOMPUTE_OPT_INSTALL=1" + "-DRELEASE=1" + "-DKOMPUTE_ENABLE_SPDLOG=1" + ]; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ fmt ]; + propagatedBuildInputs = [ glslang vulkan-headers vulkan-loader ]; + + meta = with lib; { + description = "General purpose GPU compute framework built on Vulkan"; + longDescription = '' + General purpose GPU compute framework built on Vulkan to + support 1000s of cross vendor graphics cards (AMD, + Qualcomm, NVIDIA & friends). Blazing fast, mobile-enabled, + asynchronous and optimized for advanced GPU data + processing usecases. Backed by the Linux Foundation" + ''; + homepage = "https://kompute.cc/"; + license = licenses.asl20; + maintainers = with maintainers; [ atila ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix index c3621d375870..b4ebf5708dce 100644 --- a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules +{ stdenv, lib, fetchurl, extra-cmake-modules , qca-qt5, kauth, kio, polkit-qt, qtbase , util-linux }: @@ -6,25 +6,14 @@ stdenv.mkDerivation rec { pname = "kpmcore"; # NOTE: When changing this version, also change the version of `partition-manager`. - version = "4.2.0"; + version = "22.04.3"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54="; + url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-LmKglUgXhLOBLSpzfXvK/UXFqY3L+p/EoHbZTSKlGhM="; }; - patches = [ - # Fix build with `kcoreaddons` >= 5.77.0 - (fetchpatch { - url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch"; - sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s="; - }) - # Fix crash when `fstab` omits mount options. - (fetchpatch { - url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch"; - sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0="; - }) - ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qca-qt5 @@ -35,10 +24,13 @@ stdenv.mkDerivation rec { util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat) ]; - nativeBuildInputs = [ extra-cmake-modules ]; - dontWrapQtApps = true; + preConfigure = '' + substituteInPlace src/util/CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + ''; + meta = with lib; { description = "KDE Partition Manager core library"; homepage = "https://invent.kde.org/system/kpmcore"; diff --git a/nixpkgs/pkgs/development/libraries/kreport/default.nix b/nixpkgs/pkgs/development/libraries/kreport/default.nix index 46d55b1f550d..1c8470204f80 100644 --- a/nixpkgs/pkgs/development/libraries/kreport/default.nix +++ b/nixpkgs/pkgs/development/libraries/kreport/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 + qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python3 }: mkDerivation rec { @@ -15,7 +15,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python2 ]; + buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python3 ]; meta = with lib; { description = "A framework for creation and generation of reports in multiple formats"; diff --git a/nixpkgs/pkgs/development/libraries/lame/default.nix b/nixpkgs/pkgs/development/libraries/lame/default.nix index 8ed0962bece8..674defc42e2a 100644 --- a/nixpkgs/pkgs/development/libraries/lame/default.nix +++ b/nixpkgs/pkgs/development/libraries/lame/default.nix @@ -1,25 +1,16 @@ { lib, stdenv, fetchurl -, nasmSupport ? true, nasm ? null # Assembly optimizations +, nasmSupport ? true, nasm # Assembly optimizations , cpmlSupport ? true # Compaq's fast math library -#, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging -, sndfileFileIOSupport ? false, libsndfile ? null # Use libsndfile, instead of lame's internal routines +#, efenceSupport ? false, libefence # Use ElectricFence for malloc debugging +, sndfileFileIOSupport ? false, libsndfile # Use libsndfile, instead of lame's internal routines , analyzerHooksSupport ? true # Use analyzer hooks , decoderSupport ? true # mpg123 decoder , frontendSupport ? true # Build the lame executable -#, mp3xSupport ? false, gtk1 ? null # Build GTK frame analyzer +#, mp3xSupport ? false, gtk1 # Build GTK frame analyzer , mp3rtpSupport ? false # Build mp3rtp , debugSupport ? false # Debugging (disables optimizations) }: -assert nasmSupport -> (nasm != null); -#assert efenceSupport -> (libefence != null); -assert sndfileFileIOSupport -> (libsndfile != null); -#assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null)); - -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with lib; stdenv.mkDerivation rec { pname = "lame"; @@ -42,16 +33,16 @@ stdenv.mkDerivation rec { ++ optional sndfileFileIOSupport libsndfile; configureFlags = [ - (mkFlag nasmSupport "nasm") - (mkFlag cpmlSupport "cpml") - #(mkFlag efenceSupport "efence") + (enableFeature nasmSupport "nasm") + (enableFeature cpmlSupport "cpml") + #(enableFeature efenceSupport "efence") (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (mkFlag analyzerHooksSupport "analyzer-hooks") - (mkFlag decoderSupport "decoder") - (mkFlag frontendSupport "frontend") - (mkFlag frontendSupport "dynamic-frontends") - #(mkFlag mp3xSupport "mp3x") - (mkFlag mp3rtpSupport "mp3rtp") + (enableFeature analyzerHooksSupport "analyzer-hooks") + (enableFeature decoderSupport "decoder") + (enableFeature frontendSupport "frontend") + (enableFeature frontendSupport "dynamic-frontends") + #(enableFeature mp3xSupport "mp3x") + (enableFeature mp3rtpSupport "mp3rtp") (if debugSupport then "--enable-debug=alot" else "") ]; @@ -65,7 +56,7 @@ stdenv.mkDerivation rec { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; - maintainers = with maintainers; [ codyopel fpletz ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix b/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix index 130fc60a12c9..50167f28a9db 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/frog.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation { - name = "frog-${release.version}"; + pname = "frog"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-v${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 icu languageMachines.ticcutils languageMachines.timbl diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix b/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix index 61134a8ebfb3..5b1b07e79277 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/frogdata.nix @@ -7,12 +7,12 @@ let in stdenv.mkDerivation { - name = "frogdata-${release.version}"; + pname = "frogdata"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ libtool autoconf-archive ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix index 3137d8646833..6cc5bcade205 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix @@ -8,12 +8,12 @@ let in stdenv.mkDerivation { - name = "libfolia-${release.version}"; + pname = "libfolia"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix b/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix index 49fc3c850ae8..9556c1d56701 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/mbt.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation { - name = "mbt-${release.version}"; + pname = "mbt"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix b/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix index 53bbd131bfaf..0b5fef292fcf 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -7,12 +7,12 @@ let in stdenv.mkDerivation { - name = "ticcutils-${release.version}"; + pname = "ticcutils"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool autoconf-archive libxml2 + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ libtool autoconf-archive libxml2 # optional: zlib bzip2 libtar # broken but optional: boost diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix index 9ca0b080a21d..1585798170b3 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation { - name = "timbl-${release.version}"; + pname = "timbl"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils ]; diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix b/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix index 42bc5edb43f7..ea40d017d471 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/timblserver.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation { - name = "timblserver-${release.version}"; + pname = "timblserver"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix index 429858256068..f707d9fb8b6e 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation { - name = "ucto-${release.version}"; + pname = "ucto"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtool autoconf-archive icu libtar libxml2 languageMachines.ticcutils languageMachines.libfolia diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix b/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix index 7f8d4889c62e..a274b6193edd 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/uctodata.nix @@ -7,12 +7,12 @@ let in stdenv.mkDerivation { - name = "uctodata-${release.version}"; + pname = "uctodata"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool autoconf-archive ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/lasso/default.nix b/nixpkgs/pkgs/development/libraries/lasso/default.nix index e5503169fd5f..06825c5379d9 100644 --- a/nixpkgs/pkgs/development/libraries/lasso/default.nix +++ b/nixpkgs/pkgs/development/libraries/lasso/default.nix @@ -1,22 +1,49 @@ -{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }: +{ lib, stdenv +, autoreconfHook +, fetchurl +, glib +, gobject-introspection +, gtk-doc +, libtool +, libxml2 +, libxslt +, openssl +, pkg-config +, python3 +, xmlsec +, zlib +}: stdenv.mkDerivation rec { - pname = "lasso"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "138x8pmj4k1pbah32z14rd8ylyx4lgz70s93m39vd17f8sjz50lj"; - + hash = "sha256-/8vVhR2YWGx+HK9DutZhZCEaO2HRK/hgoFmESP+fKzg="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + glib + gobject-introspection + gtk-doc + libtool + libxml2 + libxslt + openssl + python3.pkgs.six + xmlsec + zlib + ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ - --disable-python \ --disable-perl \ --prefix=$out ''; @@ -28,5 +55,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ womfoo ]; }; - } diff --git a/nixpkgs/pkgs/development/libraries/lcm/default.nix b/nixpkgs/pkgs/development/libraries/lcm/default.nix new file mode 100644 index 000000000000..64d22f4c7dcd --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/lcm/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, cmake, glib, pkg-config }: + +stdenv.mkDerivation rec { + pname = "lcm"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "lcm-proj"; + repo = "lcm"; + rev = "v${version}"; + hash = "sha256-ujz52m7JuE5DYGM9QHLwVWVVBcny4w05J6Eu6DI2HBI="; + }; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + glib + ]; + + meta = with lib; { + description = "Lightweight Communications and Marshalling (LCM)"; + homepage = "https://github.com/lcm-proj/lcm"; + license = licenses.lgpl21; + maintainers = with maintainers; [ kjeremy ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix index 961760753abd..d81e3eeabe6d 100644 --- a/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "lib" "modules" ]; meta = with lib; { + broken = stdenv.isDarwin; description = "A LDAP-like embedded database"; homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; diff --git a/nixpkgs/pkgs/development/libraries/ldns/default.nix b/nixpkgs/pkgs/development/libraries/ldns/default.nix index 1ccb0e41e708..ba0c5e606ffc 100644 --- a/nixpkgs/pkgs/development/libraries/ldns/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldns/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ldns"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; - sha256 = "sha256-lYIpq85NOqoZp1wNEnZmVksXIWkCGG6VLKSu9Hxtf6M="; + sha256 = "sha256-w/ct0QNrKQfjpW5qz537LlUSVrPBu9l4eULe7rcOeGA="; }; postPatch = '' @@ -42,9 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with the aim of simplifying DNS programming in C"; - license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; - platforms = platforms.unix; + license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "drill"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 874c567ed42e..05cf84144feb 100644 --- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/nixpkgs/pkgs/development/libraries/leveldb/default.nix index c29a32327278..8cac5df55ea2 100644 --- a/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/leveldb/default.nix @@ -36,15 +36,10 @@ stdenv.mkDerivation rec { # NOTE: disabling tests due to gtest issue cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DLEVELDB_BUILD_TESTS=OFF" + "-DLEVELDB_BUILD_BENCHMARKS=OFF" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' - # remove shared objects from "all" target - sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile - ''; - postInstall = '' substituteInPlace "$out"/lib/cmake/leveldb/leveldbTargets.cmake \ --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' diff --git a/nixpkgs/pkgs/development/libraries/lib2geom/default.nix b/nixpkgs/pkgs/development/libraries/lib2geom/default.nix index 755ed6b814e6..72d21ed0d2c4 100644 --- a/nixpkgs/pkgs/development/libraries/lib2geom/default.nix +++ b/nixpkgs/pkgs/development/libraries/lib2geom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.1"; + version = "1.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-u9pbpwVzAXzrM2/tQnd1B6Jo9Fzg6UZBr9AtUsNMfQ0="; + sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; }; nativeBuildInputs = [ @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests "-D2GEOM_BUILD_SHARED=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/libHX/default.nix b/nixpkgs/pkgs/development/libraries/libHX/default.nix index 8761ac1e5ef8..8b9190fc8274 100644 --- a/nixpkgs/pkgs/development/libraries/libHX/default.nix +++ b/nixpkgs/pkgs/development/libraries/libHX/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = []; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; preConfigure = '' sh autogen.sh @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { and functions commonly needed, such as maps, deques, linked lists, string formatting and autoresizing, option and config file parsing, type checking casts and more. ''; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl21Plus wtfpl ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 447ad06e9b87..a9185f0b4fec 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -1,10 +1,7 @@ { lib , stdenv , fetchFromGitLab -, docbook-xsl-nons , gi-docgen -, gtk-doc -, libxml2 , meson , ninja , pkg-config @@ -17,11 +14,13 @@ , gnome , gsettings-desktop-schemas , xvfb-run +, AppKit +, Foundation }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.0"; + version = "1.1.4"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,14 +30,11 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-+bgCD2jy3M0gEAtbB+nOptQGEXXkvk1idoggJz4UMy0="; + hash = "sha256-xxnLgPKPOND/ITvDC6SOD2GlkzlIX3BzBbt6p2AEjgY="; }; nativeBuildInputs = [ - docbook-xsl-nons gi-docgen - gtk-doc - libxml2 # for xmllint meson ninja pkg-config @@ -48,11 +44,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + ] ++ lib.optionals (!doCheck) [ + "-Dtests=false" ]; buildInputs = [ fribidi gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Foundation ]; propagatedBuildInputs = [ @@ -61,10 +62,15 @@ stdenv.mkDerivation rec { checkInputs = [ gnome.adwaita-icon-theme + ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run ]; - doCheck = true; + # Tests had to be disabled on Darwin because they fail with the same error as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264947 on Hydra: + # + # In file included from ../tests/test-style-manager.c:10: + # ../src/adw-settings-private.h:16:10: fatal error: 'adw-enums-private.h' file not found + doCheck = !stdenv.isDarwin; checkPhase = '' runHook preCheck @@ -81,14 +87,15 @@ stdenv.mkDerivation rec { # Tests need a cache directory "HOME=$TMPDIR" ) - env "''${testEnvironment[@]}" xvfb-run \ + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \ meson test --print-errorlogs runHook postCheck ''; - postInstall = '' - mv $out/share/{doc,gtk-doc} + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { @@ -102,6 +109,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]); - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix index 2b31da7aa535..19efea263c07 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix @@ -7,6 +7,12 @@ stdenv.mkDerivation { sourceRoot = "agar-1.5.0/tests"; + # Workaround build failure on -fno-common toolchains: + # ld: textdlg.o:(.bss+0x0): multiple definition of `someString'; + # configsettings.o:(.bss+0x0): first defined here + # TODO: the workaround can be removed once nixpkgs updates to 1.6.0. + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' substituteInPlace configure.in \ --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' @@ -18,6 +24,7 @@ stdenv.mkDerivation { buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Tests for libagar"; homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 3a3866911b8d..575c2613e5b1 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 }: +{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 +, enableButteraugli ? true, libjxl +, enableVmaf ? true, libvmaf +}: stdenv.mkDerivation rec { pname = "libaom"; - version = "3.3.0"; + version = "3.4.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-g6QkKLrk+SH1s5fRmseAQMmM6y4QwmKmVDPxdbqGmwg="; + sha256 = "sha256-NgzpVxQmsgOPzKkGpJIJrLiNQcruhpEoCi/CYJx5b3A="; stripRoot = false; }; @@ -16,6 +19,9 @@ stdenv.mkDerivation rec { yasm perl cmake pkg-config python3 ]; + propagatedBuildInputs = lib.optional enableButteraugli libjxl + ++ lib.optional enableVmaf libvmaf; + preConfigure = '' # build uses `git describe` to set the build version cat > $NIX_BUILD_TOP/git << "EOF" @@ -32,6 +38,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DENABLE_TESTS=OFF" + ] ++ lib.optionals enableButteraugli [ + "-DCONFIG_TUNE_BUTTERAUGLI=1" + ] ++ lib.optionals enableVmaf [ + "-DCONFIG_TUNE_VMAF=1" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" @@ -58,7 +68,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://aomedia.org/av1-features/get-started/"; changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG"; - maintainers = with maintainers; [ primeos kiloreux ]; + maintainers = with maintainers; [ primeos kiloreux dandellion ]; platforms = platforms.all; license = licenses.bsd2; }; diff --git a/nixpkgs/pkgs/development/libraries/libappindicator/default.nix b/nixpkgs/pkgs/development/libraries/libappindicator/default.nix index 469235e2e6af..8ca2acc11c71 100644 --- a/nixpkgs/pkgs/development/libraries/libappindicator/default.nix +++ b/nixpkgs/pkgs/development/libraries/libappindicator/default.nix @@ -13,8 +13,8 @@ with lib; stdenv.mkDerivation rec { - name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; - in "libappindicator-${postfix}-${version}"; + pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; + in "libappindicator-${postfix}"; version = "12.10.1+20.10.20200706.1"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index 2c8faaf93e8b..066ea8b60ddc 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -1,36 +1,79 @@ -{ - fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, - acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, +{ lib +, stdenv +, fetchFromGitHub +, acl +, attr +, autoreconfHook +, bzip2 +, e2fsprogs +, lzo +, openssl +, pkg-config +, sharutils +, xz +, zlib +, zstd +# Optional but increases closure only negligibly. Also, while libxml2 builds +# fine on windows, libarchive has trouble linking windows things it depends on +# for some reason. +, xarSupport ? stdenv.hostPlatform.isUnix, libxml2 - # Optional but increases closure only negligibly. Also, while libxml2 - # builds fine on windows, but libarchive has trouble linking windows - # things it depends on for some reason. - xarSupport ? stdenv.hostPlatform.isUnix, - - # for passthru.tests - cmake, nix, samba +# for passthru.tests +, cmake +, nix +, samba }: assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "sha256-u6Zeu9yTjhx5U7KZVUkuuUsQPjWN71mE5egG4T+FGfY="; + hash = "sha256-G4wL5DDbX0FqaA4cnOlVLZ25ObN8dNsRtxyas29tpDA="; }; + postPatch = '' + substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)" + + declare -a skip_test_paths=( + # test won't work in nix sandbox + 'libarchive/test/test_write_disk_perms.c' + # can't be sure builder will have sparse-capable fs + 'libarchive/test/test_sparse_basic.c' + # can't even be sure builder will have hardlink-capable fs + 'libarchive/test/test_write_disk_hardlink.c' + # access-time-related tests flakey on some systems + 'cpio/test/test_option_a.c' + 'cpio/test/test_option_t.c' + ) + + for test_path in "''${skip_test_paths[@]}" ; do + substituteInPlace Makefile.am --replace "$test_path" "" + rm "$test_path" + done + ''; + outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = - lib.optional stdenv.hostPlatform.isUnix sharutils - ++ [ zlib bzip2 openssl xz lzo zstd ] - ++ lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + bzip2 + lzo + openssl + xz + zlib + zstd + ] ++ lib.optional stdenv.hostPlatform.isUnix sharutils + ++ lib.optionals stdenv.isLinux [ acl attr e2fsprogs ] ++ lib.optional xarSupport libxml2; # Without this, pkg-config-based dependencies are unhappy @@ -38,35 +81,37 @@ stdenv.mkDerivation rec { configureFlags = lib.optional (!xarSupport) "--without-xml2"; - preBuild = if stdenv.isCygwin then '' + preBuild = lib.optionalString stdenv.isCygwin '' echo "#include <windows.h>" >> config.h - '' else null; + ''; - doCheck = false; # fails + # https://github.com/libarchive/libarchive/issues/1475 + doCheck = !stdenv.hostPlatform.isMusl; preFixup = '' sed -i $lib/lib/libarchive.la \ - -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \ + -e 's|-lcrypto|-L${lib.getLib openssl}/lib -lcrypto|' \ -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; enableParallelBuilding = true; - passthru.tests = { - inherit cmake nix samba; - }; - - meta = { + meta = with lib; { + homepage = "http://libarchive.org"; description = "Multi-format archive and compression library"; longDescription = '' - This library has code for detecting and reading many archive formats and - compressions formats including (but not limited to) tar, shar, cpio, zip, and - compressed with gzip, bzip2, lzma, xz, ... + The libarchive project develops a portable, efficient C library that can + read and write streaming archives in a variety of formats. It also + includes implementations of the common tar, cpio, and zcat command-line + tools that use the libarchive library. ''; - homepage = "http://libarchive.org"; changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}"; - license = lib.licenses.bsd3; - platforms = with lib.platforms; all; - maintainers = with lib.maintainers; [ jcumming ]; + license = licenses.bsd3; + maintainers = with maintainers; [ jcumming AndersonTorres ]; + platforms = platforms.all; + }; + + passthru.tests = { + inherit cmake nix samba; }; } diff --git a/nixpkgs/pkgs/development/libraries/libargon2/default.nix b/nixpkgs/pkgs/development/libraries/libargon2/default.nix index 2003c8957ffa..19ca4fab4013 100644 --- a/nixpkgs/pkgs/development/libraries/libargon2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libargon2/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; - nativeBuildInputs = [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; patches = [ # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://www.argon2.com/"; license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; + mainProgram = "argon2"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/libargs/default.nix b/nixpkgs/pkgs/development/libraries/libargs/default.nix index dd3f304ef8b8..f75f556fb0de 100644 --- a/nixpkgs/pkgs/development/libraries/libargs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libargs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.2.7"; + version = "6.3.0"; src = fetchFromGitHub { owner = "Taywee"; repo = pname; rev = version; - sha256 = "sha256-I297qPXs8Fj7Ibq2PN6y/Eas3DiW5Ecvqot0ePwFNTI="; + sha256 = "sha256-fEM9KNqqxYbafMcHCW46Y//8Hrvd7gZrCIQhH5lhpFc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libass/default.nix b/nixpkgs/pkgs/development/libraries/libass/default.nix index 704dcd2c73d0..118238f5f5a9 100644 --- a/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -8,24 +8,20 @@ assert fontconfigSupport -> fontconfig != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with lib; stdenv.mkDerivation rec { pname = "libass"; - version = "0.15.2"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-G+LfnESFpX14uxjAqO0Ve8h6Wo3UjGYZYcYlyxEoMv0="; + sha256 = "sha256-Xb3p4iM5EZz47tWe6mxiOgdG71qQtonmigkBCQeOPAg="; }; configureFlags = [ - (mkFlag fontconfigSupport "fontconfig") - (mkFlag rasterizerSupport "rasterizer") - (mkFlag largeTilesSupport "large-tiles") + (enableFeature fontconfigSupport "fontconfig") + (enableFeature rasterizerSupport "rasterizer") + (enableFeature largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkg-config yasm ]; diff --git a/nixpkgs/pkgs/development/libraries/libast/default.nix b/nixpkgs/pkgs/development/libraries/libast/default.nix index b48971bc4313..f4dae188f31c 100644 --- a/nixpkgs/pkgs/development/libraries/libast/default.nix +++ b/nixpkgs/pkgs/development/libraries/libast/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, fetchurl -, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +}: stdenv.mkDerivation rec { pname = "libast"; - version = "0.7.1"; + version = "0.8"; - src = fetchurl { - url = "http://www.eterm.org/download/${pname}-${version}.tar.gz"; - sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; + src = fetchFromGitHub { + owner = "mej"; + repo = pname; + rev = version; + hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; meta = with lib; { + inherit (src.meta) homepage; description = "Library of Assorted Spiffy Things"; - homepage = "https://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libaudec/default.nix b/nixpkgs/pkgs/development/libraries/libaudec/default.nix index 78e4b5cfa404..5340f62a32ed 100644 --- a/nixpkgs/pkgs/development/libraries/libaudec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaudec/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; meta = with lib; { - homepage = "https://www.zrythm.org"; description = "A library for reading and resampling audio files"; + homepage = "https://www.zrythm.org"; license = licenses.agpl3Plus; + mainProgram = "audec"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libavif/default.nix b/nixpkgs/pkgs/development/libraries/libavif/default.nix index 03dd9a33628f..d5a2a686b893 100644 --- a/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds="; + sha256 = "sha256-EGu2avkqQXHFX4gKWsVfVdQN99f4J7Hm86C0sAhuP1Y="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/nixpkgs/pkgs/development/libraries/libb64/default.nix b/nixpkgs/pkgs/development/libraries/libb64/default.nix index 987a36cd79fe..88bc059892cf 100644 --- a/nixpkgs/pkgs/development/libraries/libb64/default.nix +++ b/nixpkgs/pkgs/development/libraries/libb64/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C routines for fast base64 encoding/decoding"; + homepage = "https://github.com/libb64/libb64"; license = lib.licenses.publicDomain; + mainProgram = "base64"; platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix b/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix index b72f5ca1dbfb..fdd5dbd1cb33 100644 --- a/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libbaseencode"; - version = "1.0.12"; + version = "1.0.14"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TKmM2BPzas9qbWI8n63lfR8OvsSj+BKC12NXpfe9aow="; + sha256 = "sha256-cSiinuIc/qONuy9ZVsmsF4DiN1VUL43ZAXffCiIGgkY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libbdplus/default.nix b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix index 5b57cd7d458d..5c2255a50a62 100644 --- a/nixpkgs/pkgs/development/libraries/libbdplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libbdplus"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2"; - sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; + sha256 = "sha256-uT7qPq7zPW6RVdLDSwaMUFSTqlpJNuYydPQ0KrD0Clg="; }; buildInputs = [ libgcrypt libgpg-error gettext ]; diff --git a/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix b/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix index b8150a90f683..93daedef235c 100644 --- a/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix @@ -1,23 +1,30 @@ -{ stdenv, lib, fetchFromGitLab +{ stdenv +, lib +, fetchFromGitLab +, python3 }: stdenv.mkDerivation rec { pname = "libbencodetools"; - version = "unstable-2021-04-15"; + version = "unstable-2022-05-11"; src = fetchFromGitLab { owner = "heikkiorsila"; repo = "bencodetools"; - rev = "1ab11f6509a348975e8aec829d7abbf2f8e9b7d1"; - sha256 = "1i2dgvxxwj844yn45hnfx3785ljbvbkri0nv0jx51z4i08w7cz0h"; + rev = "384d78d297a561dddbbd0f4632f0c74c0db41577"; + sha256 = "1d699q9r33hkmmqkbh92ax54mcdf9smscmc0dza2gp4srkhr83qm"; }; postPatch = '' - patchShebangs . + patchShebangs configure + substituteInPlace configure \ + --replace 'python_install_option=""' 'python_install_option="--prefix=$out"' ''; - configureFlags = [ - "--without-python" + enableParallelBuilding = true; + + nativeBuildInputs = [ + python3 ]; meta = with lib; { @@ -25,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/heikkiorsila/bencodetools"; license = licenses.bsd2; maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "bencat"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix index 08cba497fc9d..4b2c48824fb7 100644 --- a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { homepage = "https://nuand.com/libbladeRF-doc"; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; - maintainers = with maintainers; [ funfunctor ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix b/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix deleted file mode 100644 index 7cb4c9e2b32c..000000000000 --- a/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4 }: - -stdenv.mkDerivation rec { - pname = "libbluedevil"; - # bluedevil must have the same major version (x.y) as libbluedevil! - # do not update this package without checking bluedevil - version = "2.1"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; - - meta = { - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch index 8d9c5d0fbba7..d3dec2936c50 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ b/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch @@ -1,27 +1,27 @@ diff --git a/configure.ac b/configure.ac -index 5fd3c8de..7ae343e0 100644 +index 5007bbd..f46de1a 100644 --- a/configure.ac +++ b/configure.ac -@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then - AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) - fi +@@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ + ]) -+if test "x$use_bdjava_jar" = "xyes"; then -+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" -+fi -+ - AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) - AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) - AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) + AS_IF([test "x$use_bdjava_jar" = "xyes"], [ +- ++ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" + dnl check for ant + AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) + AS_IF([test "x$HAVE_ANT" = "xno"], [ diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index 511ad533..e273b9e0 100644 +index 1cb1bfe..f3711c2 100644 --- a/src/libbluray/bdj/bdj.c +++ b/src/libbluray/bdj/bdj.c -@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage) - // pre-defined search paths for libbluray.jar - static const char * const jar_paths[] = { - #ifndef _WIN32 +@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0() + # ifdef __FreeBSD__ + "/usr/local/share/java/" BDJ_JARFILE, + # else ++# ifdef JARDIR + JARDIR "/" BDJ_JARFILE, ++# endif "/usr/share/java/" BDJ_JARFILE, "/usr/share/libbluray/lib/" BDJ_JARFILE, - #endif + # endif diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix index 47015f3b981d..5b262c66e18e 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -1,19 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration -, withJava ? false, jdk ? null, ant ? null -, withAACS ? false, libaacs ? null -, withBDplus ? false, libbdplus ? null -, withMetadata ? true, libxml2 ? null -, withFonts ? true, freetype ? null +, withJava ? false, jdk, ant +, withAACS ? false, libaacs +, withBDplus ? false, libbdplus +, withMetadata ? true, libxml2 +, withFonts ? true, freetype }: with lib; -assert withJava -> jdk != null && ant != null; -assert withAACS -> libaacs != null; -assert withBDplus -> libbdplus != null; -assert withMetadata -> libxml2 != null; -assert withFonts -> freetype != null; - # Info on how to use: # https://wiki.archlinux.org/index.php/BluRay @@ -26,11 +20,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U="; }; - patches = optional withJava ./BDJ-JARFILE-path.patch; + patches = [ + ./BDJ-JARFILE-path.patch + ./libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch + ]; nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ optionals withJava [ ant ] - ; + ++ optionals withJava [ ant ]; buildInputs = [ fontconfig ] ++ optional withJava jdk diff --git a/nixpkgs/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch b/nixpkgs/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch new file mode 100644 index 000000000000..158468e7839d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch @@ -0,0 +1,25 @@ +From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001 +From: Fridrich Strba <fstrba@suse.com> +Date: Mon, 25 Apr 2022 14:28:58 +0300 +Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022 + +--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java ++++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java +@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem { + return fs.isAbsolute(f); + } + ++ public boolean isInvalid(File f) { ++ try { ++ Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class }); ++ Object[] args = new Object[] {(Object)f}; ++ Boolean result = (Boolean)m.invoke(fs, args); ++ return result.booleanValue(); ++ } finally { ++ return false; ++ } ++ } ++ + public String resolve(File f) { + if (!booted) + return fs.resolve(f); diff --git a/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch b/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch index f491867ac5aa..c52c64f35aee 100644 --- a/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch +++ b/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch @@ -1,8 +1,8 @@ -diff --git c/configure.ac w/configure.ac -index 09cb310..30c0e2a 100644 ---- c/configure.ac -+++ w/configure.ac -@@ -110,7 +110,7 @@ AS_CASE([$host_os], +diff --git a/configure.ac b/configure.ac +index 5b6d22b..98c449b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -145,7 +145,7 @@ AS_CASE([$host_os], AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"]) # Checks for header files. @@ -11,20 +11,51 @@ index 09cb310..30c0e2a 100644 # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE -@@ -210,7 +210,8 @@ AC_LINK_IFELSE( +@@ -245,7 +245,9 @@ AC_LINK_IFELSE( AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ getauxval getentropy getexecname getline \ - pstat_getproc sysconf]) + pstat_getproc sysconf \ -+ strlcpy strlcat strnstr strmode fpurge]) ++ strlcpy strlcat strnstr strmode fpurge \ ++ user_from_uid group_from_gid]) AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) - AC_SUBST([LIBBSD_LIBS]) -diff --git c/include/bsd/string.h w/include/bsd/string.h + AC_SUBST([MD5_LIBS]) +diff --git a/include/bsd/grp.h b/include/bsd/grp.h +index b2705e5..c9423a2 100644 +--- a/include/bsd/grp.h ++++ b/include/bsd/grp.h +@@ -44,8 +44,10 @@ + __BEGIN_DECLS + int + gid_from_group(const char *, gid_t *); ++#if !HAVE_GROUP_FROM_GID + const char * + group_from_gid(gid_t, int); ++#endif + __END_DECLS + + #endif +diff --git a/include/bsd/pwd.h b/include/bsd/pwd.h +index 798af4b..6ae5244 100644 +--- a/include/bsd/pwd.h ++++ b/include/bsd/pwd.h +@@ -44,8 +44,10 @@ + __BEGIN_DECLS + int + uid_from_user(const char *, uid_t *); ++#if !HAVE_USER_FROM_UID + const char * + user_from_uid(uid_t, int); ++#endif + __END_DECLS + + #endif +diff --git a/include/bsd/string.h b/include/bsd/string.h index f987fee..a1e17ed 100644 ---- c/include/bsd/string.h -+++ w/include/bsd/string.h +--- a/include/bsd/string.h ++++ b/include/bsd/string.h @@ -41,10 +41,21 @@ #include <sys/types.h> @@ -47,10 +78,10 @@ index f987fee..a1e17ed 100644 #if !defined(__GLIBC__) || \ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) -diff --git c/src/fpurge.c w/src/fpurge.c -index 462535a..a8941db 100644 ---- c/src/fpurge.c -+++ w/src/fpurge.c +diff --git a/src/fpurge.c b/src/fpurge.c +index 350f364..ff7f01e 100644 +--- a/src/fpurge.c ++++ b/src/fpurge.c @@ -26,9 +26,10 @@ #include <errno.h> @@ -100,10 +131,10 @@ index 462535a..a8941db 100644 #else #error "Function fpurge() needs to be ported." #endif -diff --git c/src/funopen.c w/src/funopen.c +diff --git a/src/funopen.c b/src/funopen.c index 1e6f43a..3a3af6a 100644 ---- c/src/funopen.c -+++ w/src/funopen.c +--- a/src/funopen.c ++++ b/src/funopen.c @@ -143,6 +143,7 @@ funopen(const void *cookie, * they will not add the needed support to implement it. Just ignore this * interface there, as it has never been provided anyway. @@ -112,31 +143,32 @@ index 1e6f43a..3a3af6a 100644 #else #error "Function funopen() needs to be ported or disabled." #endif -diff --git c/src/local-link.h w/src/local-link.h -index 0d4351a..fc520af 100644 ---- c/src/local-link.h -+++ w/src/local-link.h -@@ -27,6 +27,11 @@ - #ifndef LIBBSD_LOCAL_LINK_H - #define LIBBSD_LOCAL_LINK_H +diff --git a/src/local-link.h b/src/local-link.h +index 6782d9a..fb76098 100644 +--- a/src/local-link.h ++++ b/src/local-link.h +@@ -29,6 +29,12 @@ + + #include <sys/cdefs.h> +#ifdef __MACH__ +#define libbsd_link_warning(symbol, msg) +#define libbsd_symver_default(alias, symbol, version) +#define libbsd_symver_variant(alias, symbol, version) ++#define libbsd_symver_weak(alias, symbol, version) +#else #define libbsd_link_warning(symbol, msg) \ static const char libbsd_emit_link_warning_##symbol[] \ - __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg; -@@ -45,3 +50,4 @@ + __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg +@@ -68,3 +74,4 @@ #endif #endif +#endif -diff --git c/src/nlist.c w/src/nlist.c -index d22fa19..f41333f 100644 ---- c/src/nlist.c -+++ w/src/nlist.c +diff --git a/src/nlist.c b/src/nlist.c +index 1cb9d18..b476f1e 100644 +--- a/src/nlist.c ++++ b/src/nlist.c @@ -41,6 +41,7 @@ #include <unistd.h> #include <nlist.h> @@ -144,16 +176,46 @@ index d22fa19..f41333f 100644 +#if !HAVE_NLIST_H #include "local-elf.h" - #ifndef SIZE_T_MAX -@@ -282,3 +283,4 @@ nlist(const char *name, struct nlist *list) + /* Note: This function is used by libkvm0, so we need to export it. +@@ -277,3 +278,4 @@ nlist(const char *name, struct nlist *list) (void)close(fd); return (n); } +#endif -diff --git c/src/readpassphrase.c w/src/readpassphrase.c +diff --git a/src/pwcache.c b/src/pwcache.c +index d54daa0..74fde9f 100644 +--- a/src/pwcache.c ++++ b/src/pwcache.c +@@ -191,6 +191,7 @@ grptb_start(void) + return 0; + } + ++#if !HAVE_USER_FROM_UID + /* + * user_from_uid() + * caches the name (if any) for the uid. If noname clear, we always +@@ -251,7 +252,9 @@ user_from_uid(uid_t uid, int noname) + } + return ptr->name; + } ++#endif + ++#if !HAVE_USER_FROM_UID + /* + * group_from_gid() + * caches the name (if any) for the gid. If noname clear, we always +@@ -312,6 +315,7 @@ group_from_gid(gid_t gid, int noname) + } + return ptr->name; + } ++#endif + + /* + * uid_from_user() +diff --git a/src/readpassphrase.c b/src/readpassphrase.c index f9f6195..2bc5fb4 100644 ---- c/src/readpassphrase.c -+++ w/src/readpassphrase.c +--- a/src/readpassphrase.c ++++ b/src/readpassphrase.c @@ -36,6 +36,14 @@ #define TCSASOFT 0 #endif @@ -169,10 +231,10 @@ index f9f6195..2bc5fb4 100644 static volatile sig_atomic_t signo[_NSIG]; static void handler(int); -diff --git c/src/setproctitle.c w/src/setproctitle.c -index ff32aa3..51ed833 100644 ---- c/src/setproctitle.c -+++ w/src/setproctitle.c +diff --git a/src/setproctitle.c b/src/setproctitle.c +index d3e1087..0e5f64c 100644 +--- a/src/setproctitle.c ++++ b/src/setproctitle.c @@ -33,6 +33,10 @@ #include <string.h> #include "local-link.h" @@ -184,7 +246,7 @@ index ff32aa3..51ed833 100644 static struct { /* Original value. */ const char *arg0; -@@ -287,7 +291,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); +@@ -291,7 +295,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); * in 0.5, make the implementation available in the old version as an alias * for code linking against that version, and change the default to use the * new version, so that new code depends on the implemented version. */ @@ -194,10 +256,10 @@ index ff32aa3..51ed833 100644 extern __typeof__(setproctitle_impl) setproctitle_stub __attribute__((__alias__("setproctitle_impl"))); -diff --git c/src/strlcat.c w/src/strlcat.c +diff --git a/src/strlcat.c b/src/strlcat.c index 14c53a1..5961c17 100644 ---- c/src/strlcat.c -+++ w/src/strlcat.c +--- a/src/strlcat.c ++++ b/src/strlcat.c @@ -26,6 +26,7 @@ * Returns strlen(src) + MIN(dsize, strlen(initial dst)). * If retval >= dsize, truncation occurred. @@ -211,10 +273,10 @@ index 14c53a1..5961c17 100644 return(dlen + (src - osrc)); /* count does not include NUL */ } +#endif -diff --git c/src/strlcpy.c w/src/strlcpy.c +diff --git a/src/strlcpy.c b/src/strlcpy.c index e9a7fe4..5137acb 100644 ---- c/src/strlcpy.c -+++ w/src/strlcpy.c +--- a/src/strlcpy.c ++++ b/src/strlcpy.c @@ -24,6 +24,7 @@ * chars will be copied. Always NUL terminates (unless dsize == 0). * Returns strlen(src); if retval >= dsize, truncation occurred. @@ -228,10 +290,10 @@ index e9a7fe4..5137acb 100644 return(src - osrc - 1); /* count does not include NUL */ } +#endif -diff --git c/src/strmode.c w/src/strmode.c +diff --git a/src/strmode.c b/src/strmode.c index e6afde5..da680c9 100644 ---- c/src/strmode.c -+++ w/src/strmode.c +--- a/src/strmode.c ++++ b/src/strmode.c @@ -32,6 +32,7 @@ #include <sys/stat.h> #include <string.h> diff --git a/nixpkgs/pkgs/development/libraries/libbsd/default.nix b/nixpkgs/pkgs/development/libraries/libbsd/default.nix index 8c8e47b98a4d..b8f6aac0b388 100644 --- a/nixpkgs/pkgs/development/libraries/libbsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libbsd"; - version = "0.11.5"; + version = "0.11.6"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-GpyVJSVjXBu2dwyyLpabk42Oap15EjYrmO6DcFmbDv0="; + sha256 = "sha256-GbOPMXLq9pPm4caHFGNhkMfkiFHkUiTXILO1vASZtd8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/libbtbb/default.nix b/nixpkgs/pkgs/development/libraries/libbtbb/default.nix index 15047f6e8f2f..2e2b95c2d8c7 100644 --- a/nixpkgs/pkgs/development/libraries/libbtbb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbtbb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake, CoreServices }: stdenv.mkDerivation rec { pname = "libbtbb"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { description = "Bluetooth baseband decoding library"; diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix index f9b6538027d6..ba24182ade80 100644 --- a/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; + homepage = "http://libburnia-project.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; + mainProgram = "cdrskin"; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcamera/default.nix b/nixpkgs/pkgs/development/libraries/libcamera/default.nix index 37acf1fc8f03..3841c205b7b9 100644 --- a/nixpkgs/pkgs/development/libraries/libcamera/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcamera/default.nix @@ -10,6 +10,7 @@ , openssl , libdrm , libevent +, libyaml , lttng-ust , gst_all_1 , gtest @@ -22,12 +23,12 @@ stdenv.mkDerivation { pname = "libcamera"; - version = "unstable-2022-01-03"; + version = "unstable-2022-07-15"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; - rev = "1db1e31e664c1f613dc964d8519fe75d67b154b6"; - hash = "sha256-pXYPIU9xDWA870Gp1Jgizi5xnUHRvTqEq/ofFXdVZdg="; + rev = "e9b6b362820338d0546563444e7b1767f5c7044c"; + hash = "sha256-geqFcMBHcVe7dPdVOal8V2pVItYUdoC+5isISqRG4Wc="; }; postPatch = '' @@ -55,6 +56,9 @@ stdenv.mkDerivation { # lttng tracing lttng-ust + # yamlparser + libyaml + gtest ]; diff --git a/nixpkgs/pkgs/development/libraries/libcangjie/default.nix b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix index 73277d30de3c..5b68a6526f1d 100644 --- a/nixpkgs/pkgs/development/libraries/libcangjie/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool m4 sqlite ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ libtool m4 sqlite ]; configureScript = "./autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/nixpkgs/pkgs/development/libraries/libcbor/default.nix index 349b715d8520..9473c4823fc4 100644 --- a/nixpkgs/pkgs/development/libraries/libcbor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcbor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcbor"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "PJK"; repo = pname; rev = "v${version}"; - sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7"; + sha256 = "sha256-Wp/48yQA17mf/dTgeMcMDvPpKOPkfLhQkCnzgGLpLtk="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libcdada/default.nix b/nixpkgs/pkgs/development/libraries/libcdada/default.nix index 94976c1be46a..6fb8caa4746a 100644 --- a/nixpkgs/pkgs/development/libraries/libcdada/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - sha256 = "0vcsf3s4fbw2w33jjc8b509kc0xb6ld58l8wfxgqwjqx5icfg1ps"; + sha256 = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libcddb/default.nix b/nixpkgs/pkgs/development/libraries/libcddb/default.nix index bf20211ee60a..4848f5fcc265 100644 --- a/nixpkgs/pkgs/development/libraries/libcddb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcddb/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "C library to access data on a CDDB server (freedb.org)"; homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; + mainProgram = "cddb_query"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix index 999c04504898..36b591b0605b 100644 --- a/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation rec { This is a port of xiph.org's cdda paranoia to use libcdio for CDROM access. By doing this, cdparanoia runs on platforms other than GNU/Linux. ''; - license = licenses.gpl3; homepage = "https://github.com/rocky/libcdio-paranoia"; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3; maintainers = [ ]; + mainProgram = "cd-paranoia"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index 7dfafe6bd06d..96f53a33b1eb 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -70,17 +70,17 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0m12adzcs6xsmgnqsdc5g0xs6xmjbj560x4d9rnv9fpf1p7jv2fa"; - platforms."i686-linux".sha256 = "00cy5kxx8hpifkwhn9qbfch7ng3crx0zb6ypllzip6qms956mama"; - platforms."x86_64-linux".sha256 = "1f1hxx4xl0wljyrgj0m3zq47yz2cyqd52qigrkpcvavr1d2sx6m3"; + platforms."aarch64-linux".sha256 = "0gmnmr0zn2ffn7xbhmfh6rhmwmxy5zzlj0s3lyp99knjn47lg2fg"; + platforms."i686-linux".sha256 = "1lp2z9db89qk2wh900c2dzlhflwmcbmp4m7xnlj04pq4q2kgfm9p"; + platforms."x86_64-linux".sha256 = "1ljrp0iky7rrj04sbqicrg1jr938xnid6jlirbf7gwlmzliz3wfs"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "98.1.21"; - gitRevision = "9782362"; - chromiumVersion = "98.0.4758.102"; + version = "100.0.24"; + gitRevision = "0783cf8"; + chromiumVersion = "100.0.4896.127"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}"; + cmakeFlags = [ "-DPROJECT_ARCH=${platformInfo.projectArch}" ]; makeFlags = [ "libcef_dll_wrapper" ]; dontStrip = true; dontPatchELF = true; @@ -112,6 +112,10 @@ stdenv.mkDerivation rec { description = "Simple framework for embedding Chromium-based browsers in other applications"; homepage = "https://cef-builds.spotifycdn.com/index.html"; maintainers = with maintainers; [ puffnfresh ]; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix new file mode 100644 index 000000000000..22c23f45af86 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, boost, cmake, }: + +stdenv.mkDerivation rec { + pname = "libcifpp"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "PDB-REDO"; + repo = pname; + rev = "v${version}"; + sha256 = "1hzi6fgbsmy8h8nfwkyfds9jz13nqw72h0x81jqw5516kkvar5iw"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost ]; + + meta = with lib; { + description = "Manipulate mmCIF and PDB files"; + homepage = "https://github.com/PDB-REDO/libcifpp"; + license = licenses.bsd2; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libclc/default.nix b/nixpkgs/pkgs/development/libraries/libclc/default.nix index c634892944ca..a53450e11773 100644 --- a/nixpkgs/pkgs/development/libraries/libclc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages, spirv-llvm-translator }: let llvm = llvmPackages.llvm; @@ -7,13 +7,13 @@ in stdenv.mkDerivation rec { pname = "libclc"; - version = "11.0.1"; + version = "12.0.1"; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = "llvmorg-${version}"; - sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags"; + sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv"; }; sourceRoot = "source/libclc"; @@ -21,10 +21,12 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' + 'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' ''; - nativeBuildInputs = [ cmake ninja python3 ]; + nativeBuildInputs = [ cmake ninja python3 spirv-llvm-translator ]; buildInputs = [ llvm clang-unwrapped ]; strictDeps = true; cmakeFlags = [ @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "http://libclc.llvm.org/"; description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/libcmis/default.nix b/nixpkgs/pkgs/development/libraries/libcmis/default.nix index 2898c9a1c835..f5a9974f3bcf 100644 --- a/nixpkgs/pkgs/development/libraries/libcmis/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcmis/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ client library for the CMIS interface"; - homepage = "https://sourceforge.net/projects/libcmis/"; + homepage = "https://github.com/tdf/libcmis"; license = licenses.gpl2; + mainProgram = "cmis-client"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix index 0bf654ee963c..919ddcd3f066 100644 --- a/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix @@ -2,7 +2,8 @@ with lib; collectd.overrideAttrs (oldAttrs: { - name = "libcollectdclient-${collectd.version}"; + pname = "libcollectdclient"; + inherit (collectd) version; buildInputs = [ ]; configureFlags = (oldAttrs.configureFlags or []) ++ [ diff --git a/nixpkgs/pkgs/development/libraries/libcotp/default.nix b/nixpkgs/pkgs/development/libraries/libcotp/default.nix index bd555bdbc364..6fb7b3879c20 100644 --- a/nixpkgs/pkgs/development/libraries/libcotp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PN0kd0CP2zrkuPTdaS3TdsdEl+Gy6CecrDSh0Bd7mRk="; + sha256 = "sha256-AMLnUFLDL592zcbVN8yaQeOJQWDLUUG+6aKh4paPGlE="; }; buildInputs = [ libbaseencode libgcrypt ]; diff --git a/nixpkgs/pkgs/development/libraries/libcrafter/default.nix b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix index 22543972c1e6..029bec5630bf 100644 --- a/nixpkgs/pkgs/development/libraries/libcrafter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-libpcap=yes" ]; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; propagatedBuildInputs = [ libpcap ]; diff --git a/nixpkgs/pkgs/development/libraries/libcutl/default.nix b/nixpkgs/pkgs/development/libraries/libcutl/default.nix index ed6aae0f3083..dca7a6148f22 100644 --- a/nixpkgs/pkgs/development/libraries/libcutl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcutl/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { homepage = "https://codesynthesis.com/projects/libcutl/"; changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}"; platforms = platforms.all; + broken = stdenv.isDarwin; maintainers = with maintainers; [ ]; license = licenses.mit; }; @@ -26,4 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ xercesc ]; enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; } diff --git a/nixpkgs/pkgs/development/libraries/libdap/default.nix b/nixpkgs/pkgs/development/libraries/libdap/default.nix deleted file mode 100644 index 8eacd9706a88..000000000000 --- a/nixpkgs/pkgs/development/libraries/libdap/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: - -stdenv.mkDerivation rec { - version = "3.20.6"; - pname = "libdap"; - - nativeBuildInputs = [ bison flex ]; - buildInputs = [ libuuid curl libxml2 ]; - - src = fetchurl { - url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m"; - }; - - meta = with lib; { - description = "A C++ SDK which contains an implementation of DAP"; - homepage = "https://www.opendap.org/software/libdap"; - license = licenses.lgpl2; - maintainers = [ maintainers.bzizou ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index 7f4c53071d0c..22ef87e43d04 100644 --- a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_43 dbus - xvfb-run glib + ] ++ lib.optionals stdenv.isLinux [ + xvfb-run ]; buildInputs = [ @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { "-Denable_gtk_doc=true" ]; - doCheck = true; + doCheck = stdenv.isLinux; checkPhase = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix deleted file mode 100644 index 75d4f76b31ff..000000000000 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, cmake }: - -let - baseName = "libdbusmenu-qt"; - v = "0.9.2"; - homepage = "https://launchpad.net/${baseName}"; - name = "${baseName}-${v}"; -in - -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2"; - sha256 = "1v0ri5g9xw2z64ik0kx0ra01v8rpjn2kxprrxppkls1wvav1qv5f"; - }; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DWITH_DOC=OFF" ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Provides a Qt implementation of the DBusMenu spec"; - inherit homepage; - inherit (qt4.meta) platforms; - license = licenses.lgpl2; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix index a666eb3a650b..379f5397ec04 100644 --- a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin CoreServices; meta = with lib; { - homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; + homepage = "https://sourceforge.net/projects/libdc1394/"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; + mainProgram = "dc1394_reset_bus"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix index bbbcdc3f0544..762fe1765fd2 100644 --- a/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { version = "1.0.8"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml"; }; + patches = [ + (fetchpatch { + name = "CVE-2022-1253.patch"; + url = "https://github.com/strukturag/libde265/commit/8e89fe0e175d2870c39486fdd09250b230ec10b8.patch"; + sha256 = "sha256-F1BOWFx9oXR2trM22atyD3AJ5x6vVfURQ/PTlYP2Ibg="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; @@ -22,5 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ gebner ]; }; - } diff --git a/nixpkgs/pkgs/development/libraries/libdecor/default.nix b/nixpkgs/pkgs/development/libraries/libdecor/default.nix index 25abfc34b36d..34b4e021b0f1 100644 --- a/nixpkgs/pkgs/development/libraries/libdecor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdecor/default.nix @@ -7,6 +7,7 @@ , wayland , wayland-protocols , wayland-scanner +, egl-wayland , cairo , dbus , pango @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland wayland-protocols + egl-wayland cairo dbus pango diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/darwin-dylib.patch b/nixpkgs/pkgs/development/libraries/libdeltachat/darwin-dylib.patch deleted file mode 100644 index caa44a62a062..000000000000 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/darwin-dylib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ed8020c..44ca43e7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16) - project(deltachat LANGUAGES C) - include(GNUInstallDirs) - -+if(APPLE) -+ set(DYNAMIC_EXT "dylib") -+elseif(UNIX) -+ set(DYNAMIC_EXT "so") -+else() -+ set(DYNAMIC_EXT "dll") -+endif() -+ - find_program(CARGO cargo) - - add_custom_command( - OUTPUT - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - COMMAND - PREFIX=${CMAKE_INSTALL_PREFIX} -@@ -32,11 +40,11 @@ add_custom_target( - ALL - DEPENDS - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - ) - - install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) --install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py -index c8ed43e2..714c7e30 100755 ---- a/python/install_python_bindings.py -+++ b/python/install_python_bindings.py -@@ -24,7 +24,7 @@ - - print("running:", " ".join(cmd)) - subprocess.check_call(cmd) -- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) -+ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True) - - if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": - subprocess.check_call([ diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 5b969284995c..4900c15d10eb 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -5,6 +5,7 @@ , openssl , perl , pkg-config +, python3 , rustPlatform , sqlcipher , sqlite @@ -16,25 +17,23 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.76.0"; + version = "1.87.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; + hash = "sha256-iRGLNMGs5WawzcqQb5AQTuD4NCJoBUSHfFUXXvm5+jE="; }; patches = [ - # https://github.com/deltachat/deltachat-core-rust/pull/2589 - ./darwin-dylib.patch ./no-static-lib.patch ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; + hash = "sha256-bmtm+cvjBIlZVRq/vjHd5Sl4FXJHP3cPp4+bWY5SKus="; }; nativeBuildInputs = [ @@ -62,6 +61,10 @@ stdenv.mkDerivation rec { cargoCheckHook ]; + passthru.tests = { + python = python3.pkgs.deltachat; + }; + meta = with lib; { description = "Delta Chat Rust Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/"; diff --git a/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix b/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix deleted file mode 100644 index 7ee268e4e7d9..000000000000 --- a/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }: - -stdenv.mkDerivation rec { - - version = "3.10.5"; - pname = "libdigidoc"; - - src = fetchurl { - url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; - sha256 = "0nw36a4i6rcq7z6jqz5h2ln9hmmsfhw65jga3rymlswk2k7bndgn"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ openssl pcsclite opensc libxml2 ] - ++ lib.optionals stdenv.isDarwin [ Security ]; - - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ]; - - meta = with lib; { - description = "Library for creating DigiDoc signature files"; - homepage = "https://github.com/open-eid/libdigidoc"; - license = licenses.lgpl2; - platforms = platforms.unix; - maintainers = [ maintainers.jagajaga ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 4f80709652db..7d34388aea39 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, fetchpatch, cmake, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.7"; + version = "3.14.10"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-QdctW2+T8kPNUJv30pXZ/qfnw1Uhq6gScSjUI+bZMfY="; + hash = "sha256-n/+R4ho1Qcft3YSKE12oxZjbFHAsUDwoLFNuk5GXf5c="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; @@ -17,6 +17,15 @@ stdenv.mkDerivation rec { xml-security-c xsd zlib xalanc ]; + outputs = [ "out" "lib" "dev" "bin" ]; + + # libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so" + # itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it. + # https://github.com/open-eid/cmake/pull/35 might be an alternative. + postFixup = '' + patchelf --add-rpath ${opensc}/lib/pkcs11 $lib/lib/libdigidocpp.so + ''; + meta = with lib; { description = "Library for creating DigiDoc signature files"; homepage = "http://www.id.ee/"; diff --git a/nixpkgs/pkgs/development/libraries/libdnet/default.nix b/nixpkgs/pkgs/development/libraries/libdnet/default.nix index 6455bf03b5ae..717d565ef835 100644 --- a/nixpkgs/pkgs/development/libraries/libdnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdnet/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "09mhbr8x66ykhf5581a5zjpplpjxibqzgkkpx689kybwg0wk1cw3"; }; - buildInputs = [ automake autoconf libtool ]; + nativeBuildInputs = [ automake autoconf ]; + buildInputs = [ libtool ]; # .so endings are missing (quick and dirty fix) postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch deleted file mode 100644 index 547ef0d09691..000000000000 --- a/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Fri, 2 Aug 2019 10:26:37 +0100 -Subject: [PATCH] meson: support for custom nm path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When cross-compiling target toolchains i.e. binutils are often -prefixed by its target architecture. This patch gives the user -to option to specify the nm used during the build process. - -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - meson.build | 2 +- - meson_options.txt | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build ---- meson.build.orig 2020-06-18 11:13:57.716321962 +0200 -+++ meson.build 2020-06-18 11:19:50.456861311 +0200 -@@ -45,7 +45,7 @@ - cc = meson.get_compiler('c') - - symbols_check = find_program('symbols-check.py') --prog_nm = find_program('nm') -+prog_nm = find_program(get_option('nm-path')) - - # Check for atomics - intel_atomics = false -diff --git a/meson_options.txt b/meson_options.txt -index 8af33f1c..b4f46a52 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -141,3 +141,9 @@ option( - value : false, - description : 'Enable support for using udev instead of mknod.', - ) -+option( -+ 'nm-path', -+ type : 'string', -+ description : 'path to nm', -+ value : 'nm' -+) --- -2.22.0 - diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index e08a46732480..e49a903730b9 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.110"; + version = "2.4.112"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0dwpry9m5l27dlhq48j4bsiqwm0247cxdqwv3b7ddmkynk2f9kpf"; + sha256 = "1zr0hi7k5s7my4q9hyj6ryzg89zyjx24zbqfv3c5rcq9pl87gc00"; }; outputs = [ "out" "dev" "bin" ]; @@ -18,13 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; - patches = [ ./cross-build-nm-path.patch ]; - mesonFlags = [ - "-Dnm-path=${stdenv.cc.targetPrefix}nm" "-Dinstall-test-programs=true" "-Domap=true" - ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch [ "-Dtegra=true" "-Detnaviv=true" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdvbcsa/default.nix b/nixpkgs/pkgs/development/libraries/libdvbcsa/default.nix new file mode 100644 index 000000000000..3eebaafe4509 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdvbcsa/default.nix @@ -0,0 +1,22 @@ +{lib, stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "libdvbcsa"; + version = "1.1.0"; + + src = fetchurl { + url = "http://get.videolan.org/libdvbcsa/${version}/${pname}-${version}.tar.gz"; + sha256 = "4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d"; + }; + + doCheck = true; + + meta = { + description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; + homepage = "http://www.videolan.org/developers/libdvbcsa.html"; + platforms = lib.platforms.unix; + license = lib.licenses.gpl1; + maintainers = with lib.maintainers; [ melias122 ]; + }; + +} diff --git a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix index ac94dcbcb8f7..f07af1fa575b 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdread"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-zBkPVTdYztdXGFnjAfgCy0gh8WTQK/rP0yDBSk4Np2M="; + sha256 = "sha256-zjVFSZeiCMvlDpEjLw5z+xrDRxllgToTuHMKjxihU2k="; }; buildInputs = [libdvdcss]; diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/0.4.nix b/nixpkgs/pkgs/development/libraries/libdwarf/0.4.nix new file mode 100644 index 000000000000..c5b14f5a05ef --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdwarf/0.4.nix @@ -0,0 +1,8 @@ +{ callPackage, zlib }: +callPackage ./common.nix rec { + version = "0.4.1"; + url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; + sha512 = "793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693"; + buildInputs = [ zlib ]; + knownVulnerabilities = []; +} diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/common.nix b/nixpkgs/pkgs/development/libraries/libdwarf/common.nix new file mode 100644 index 000000000000..32dc6eaa6e4e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdwarf/common.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url, knownVulnerabilities }: + +stdenv.mkDerivation rec { + pname = "libdwarf"; + inherit version; + + src = fetchurl { + inherit url sha512; + }; + + configureFlags = [ "--enable-shared" "--disable-nonshared" ]; + + inherit buildInputs; + + outputs = [ "bin" "lib" "dev" "out" ]; + + meta = { + homepage = "https://github.com/davea42/libdwarf-code"; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.atry ]; + inherit knownVulnerabilities; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix index 0d512b04201a..5bb2d6aa6f72 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix @@ -1,56 +1,8 @@ -{ lib, stdenv, fetchurl, libelf, zlib }: - -let - version = "20181024"; - src = fetchurl { - url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; - # Upstream displays this hash broken into three parts: - sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595" - + "6d643921a173e6f9e0a184db7aef66f0fd2548d669" - + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58"; - }; - meta = { - homepage = "https://www.prevanders.net/dwarf.html"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl21Plus; - }; - -in rec { - libdwarf = stdenv.mkDerivation { - pname = "libdwarf"; - inherit version; - - configureFlags = [ "--enable-shared" "--disable-nonshared" ]; - - preConfigure = '' - cd libdwarf - ''; - buildInputs = [ libelf zlib ]; - - installPhase = '' - mkdir -p $out/lib $out/include - cp libdwarf.so.1 $out/lib - ln -s libdwarf.so.1 $out/lib/libdwarf.so - cp libdwarf.h dwarf.h $out/include - ''; - - inherit meta src; - }; - - dwarfdump = stdenv.mkDerivation { - pname = "dwarfdump"; - inherit version; - - preConfigure = '' - cd dwarfdump - ''; - - buildInputs = [ libelf libdwarf ]; - - installPhase = '' - install -m755 -D dwarfdump $out/bin/dwarfdump - ''; - - inherit meta src; - }; +{ callPackage, zlib, libelf }: +callPackage ./common.nix rec { + version = "20210528"; + url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; + sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870"; + buildInputs = [ zlib libelf ]; + knownVulnerabilities = [ "CVE-2022-32200" ]; } diff --git a/nixpkgs/pkgs/development/libraries/libe57format/default.nix b/nixpkgs/pkgs/development/libraries/libe57format/default.nix index 2ad8573ecb30..fe5558681fff 100644 --- a/nixpkgs/pkgs/development/libraries/libe57format/default.nix +++ b/nixpkgs/pkgs/development/libraries/libe57format/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, cmake, + fetchpatch, fetchFromGitHub, boost, xercesc, @@ -18,6 +19,14 @@ stdenv.mkDerivation rec { sha256 = "15l23spjvak5h3n7aj3ggy0c3cwcg8mvnc9jlbd9yc2ra43bx7bp"; }; + patches = [ + # gcc11 header fix + (fetchpatch { + url = "https://github.com/asmaloney/libE57Format/commit/13f6a16394ce3eb50ea4cd21f31f77f53294e8d0.patch"; + sha256 = "sha256-4vVhKrCxnWO106DSAk+xxo4uk6zC89m9VQAPaDJ8Ed4="; + }) + ]; + nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix index 70fab2da5688..3a3abdc5e9ac 100644 --- a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "Small LD_PRELOAD library to disable fsync and friends"; homepage = "https://www.flamingspork.com/projects/libeatmydata/"; license = licenses.gpl3Plus; + mainProgram = "eatmydata"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libechonest/default.nix b/nixpkgs/pkgs/development/libraries/libechonest/default.nix deleted file mode 100644 index 29a0a63a03e7..000000000000 --- a/nixpkgs/pkgs/development/libraries/libechonest/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }: - -stdenv.mkDerivation rec { - pname = "libechonest"; - version = "2.3.1"; - - src = fetchFromGitHub { - owner = "lfranchi"; - repo = pname; - rev = version; - sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch"; - sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx"; - }) - (fetchpatch { - url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch"; - sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94"; - }) - ]; - - nativeBuildInputs = [ cmake doxygen ]; - buildInputs = [ qt4 qjson ]; - - doCheck = false; # requires network access - - meta = { - description = "A C++/Qt wrapper around the Echo Nest API"; - homepage = "https://projects.kde.org/projects/playground/libs/libechonest"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libee/default.nix b/nixpkgs/pkgs/development/libraries/libee/default.nix index ae0529718259..1269f6f0eff3 100644 --- a/nixpkgs/pkgs/development/libraries/libee/default.nix +++ b/nixpkgs/pkgs/development/libraries/libee/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libestr]; meta = { - homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; - platforms = lib.platforms.unix; + homepage = "http://www.libee.org/"; license = lib.licenses.lgpl21Plus; + mainProgram = "libee-convert"; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libelf/default.nix b/nixpkgs/pkgs/development/libraries/libelf/default.nix index 47cd849f92c5..6d894da17d0e 100644 --- a/nixpkgs/pkgs/development/libraries/libelf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libelf/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { ./preprocessor-warnings.patch ]; + enableParallelBuilding = true; + doCheck = true; configureFlags = [] @@ -33,6 +35,7 @@ stdenv.mkDerivation rec { # on Darwin, so disable NLS for now. ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; + strictDeps = true; nativeBuildInputs = if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] # Need to regenerate configure script with newer version in order to pass diff --git a/nixpkgs/pkgs/development/libraries/libepoxy/default.nix b/nixpkgs/pkgs/development/libraries/libepoxy/default.nix index c54c3c86d232..348fbfee7b84 100644 --- a/nixpkgs/pkgs/development/libraries/libepoxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libepoxy/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "libepoxy"; - version = "1.5.9"; + version = "1.5.10"; src = fetchFromGitHub { owner = "anholt"; repo = pname; rev = version; - sha256 = "sha256-8rdmC8FZUkKkEvWPJIdfrBQHiwa81vl5tmVqRdU4UIY="; + sha256 = "sha256-gZiyPOW2PeTMILcPiUTqPUGRNlMM5mI1z9563v4SgEs="; }; patches = [ ./libgl-path.patch ]; @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" ''; - # tests are running from version 1.5.9 doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/nixpkgs/pkgs/development/libraries/libevdev/default.nix index cca5abef4fc7..b757e516573e 100644 --- a/nixpkgs/pkgs/development/libraries/libevdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevdev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-L3KeNIBpV5H5SC6DiL1yNAK4nw6vEYBXu96jzs7psjc="; + sha256 = "sha256-HbukG8UW08p6vA2luGLv4+qKcBj6bpuXzp05QBsiQmw="; }; nativeBuildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix index 24ded54d8e97..bd5edec68a06 100644 --- a/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, findutils, fixDarwinDylibNames -, sslSupport? true, openssl +, sslSupport ? true, openssl +, fetchpatch }: -assert sslSupport -> openssl != null; - stdenv.mkDerivation rec { pname = "libevent"; version = "2.1.12"; @@ -13,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1fq30imk8zd26x8066di3kpc5zyfc5z6frr3zll685zcx4dxxrlj"; }; + patches = [ + # Don't define BIO_get_init() for LibreSSL 3.5+ + (fetchpatch { + url = "https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9.patch"; + sha256 = "sha256-VPJqJUAovw6V92jpqIXkIR1xYGbxIWxaHr8cePWI2SU="; + }) + ]; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -27,14 +34,10 @@ stdenv.mkDerivation rec { ++ lib.optional sslSupport "openssl" ; - nativeBuildInputs = [] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [] - ++ lib.optional sslSupport openssl - ++ lib.optional stdenv.isCygwin findutils - ; + buildInputs = lib.optional sslSupport openssl + ++ lib.optional stdenv.isCygwin findutils; doCheck = false; # needs the net diff --git a/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix b/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix index c315379d92c7..39369c5c3b6b 100644 --- a/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = "https://wiki.documentfoundation.org/Libexttextcat"; - platforms = platforms.all; license = licenses.bsd3; + mainProgram = "createfp"; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/nixpkgs/pkgs/development/libraries/libfabric/default.nix index 38c88fe70f3c..baa33a51eef9 100644 --- a/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.14.0"; + version = "1.15.1"; enableParallelBuilding = true; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MmvJV3Pne+bJtC91rdpNMZovoqMgm3gHFJwGH3tchgI="; + sha256 = "sha256-uL3L9k9yqdZXQmR1zi8OEIGLAZ8cf7EBnlDhetaMA08="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libffi/3.3.nix b/nixpkgs/pkgs/development/libraries/libffi/3.3.nix new file mode 100644 index 000000000000..a1e2ff8c5888 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libffi/3.3.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, fetchurl, fetchpatch +, autoreconfHook + +, doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping +, dejagnu +}: + +stdenv.mkDerivation rec { + pname = "libffi"; + version = "3.3"; + + src = fetchurl { + url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-cvunkicD3fp6Ao1ROsFahcjVTI1n9V+lpIAohdxlIFY="; + }; + + patches = []; + + outputs = [ "out" "dev" "man" "info" ]; + + configureFlags = [ + "--with-gcc-arch=generic" # no detection of -march= or -mtune= + "--enable-pax_emutramp" + + # Causes issues in downstream packages which misuse ffi_closure_alloc + # Reenable once these issues are fixed and merged: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 + # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 + "--disable-exec-static-tramp" + ]; + + preCheck = '' + # The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE. + NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} + ''; + + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling. + + inherit doCheck; + + checkInputs = [ dejagnu ]; + + meta = with lib; { + description = "A foreign function call interface library"; + longDescription = '' + The libffi library provides a portable, high level programming + interface to various calling conventions. This allows a + programmer to call any function specified by a call interface + description at run-time. + + FFI stands for Foreign Function Interface. A foreign function + interface is the popular name for the interface that allows code + written in one language to call code written in another + language. The libffi library really only provides the lowest, + machine dependent layer of a fully featured foreign function + interface. A layer must exist above libffi that handles type + conversions for values passed between the two languages. + ''; + homepage = "http://sourceware.org/libffi/"; + license = licenses.mit; + maintainers = with maintainers; [ armeenm ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libffi/default.nix b/nixpkgs/pkgs/development/libraries/libffi/default.nix index 6a22d585fbc8..4c3e00150abf 100644 --- a/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch , autoreconfHook -, doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping + # test suite depends on dejagnu which cannot be used during bootstrapping + # dejagnu also requires tcl which can't be built statically at the moment +, doCheck ? !(stdenv.hostPlatform.isStatic) , dejagnu }: -# Note: this package is used for bootstrapping fetchurl, and thus -# cannot use fetchpatch! All mutable patches (generated by GitHub or -# cgit) that are needed here should be included directly in Nixpkgs as -# files. - stdenv.mkDerivation rec { pname = "libffi"; version = "3.4.2"; @@ -19,10 +16,21 @@ stdenv.mkDerivation rec { sha256 = "081nx7wpzds168jbr59m34n6s3lyiq6r8zggvqxvlslsc4hvf3sl"; }; - patches = []; + # Note: this package is used for bootstrapping fetchurl, and thus + # cannot use fetchpatch! All mutable patches (generated by GitHub or + # cgit) that are needed here should be included directly in Nixpkgs as + # files. + patches = [ + ./libffi-powerpc64.patch + ]; + strictDeps = true; outputs = [ "out" "dev" "man" "info" ]; + enableParallelBuilding = true; + + configurePlatforms = [ "build" "host" ]; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" diff --git a/nixpkgs/pkgs/development/libraries/libffi/libffi-powerpc64.patch b/nixpkgs/pkgs/development/libraries/libffi/libffi-powerpc64.patch new file mode 100644 index 000000000000..5748ac084982 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libffi/libffi-powerpc64.patch @@ -0,0 +1,23 @@ +https://github.com/libffi/libffi/issues/668 +--- a/src/powerpc/linux64.S ++++ b/src/powerpc/linux64.S +@@ -29,6 +29,8 @@ + #include <fficonfig.h> + #include <ffi.h> + ++ .machine altivec ++ + #ifdef POWERPC64 + .hidden ffi_call_LINUX64 + .globl ffi_call_LINUX64 +--- a/src/powerpc/linux64_closure.S ++++ b/src/powerpc/linux64_closure.S +@@ -30,6 +30,8 @@ + + .file "linux64_closure.S" + ++ .machine altivec ++ + #ifdef POWERPC64 + FFI_HIDDEN (ffi_closure_LINUX64) + .globl ffi_closure_LINUX64 diff --git a/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/nixpkgs/pkgs/development/libraries/libfido2/default.nix index 13bbd246c64a..d7c034b9e98b 100644 --- a/nixpkgs/pkgs/development/libraries/libfido2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfido2/default.nix @@ -8,23 +8,26 @@ , openssl , udev , zlib +, pcsclite }: stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.9.0"; + version = "1.11.0"; # releases on https://developers.yubico.com/libfido2/Releases/ are signed src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-ujnjrzc20t/IrT0ctuO+fszAlYhhCjsHyGXQ7T5YwtI="; + sha256 = "sha256-CDDFhT47RAmalxZuDOxUpltUt/qqwHBxhy93uOTXswI="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libcbor openssl zlib ] + buildInputs = [ libcbor zlib ] ++ lib.optionals stdenv.isDarwin [ hidapi ] - ++ lib.optionals stdenv.isLinux [ udev ]; + ++ lib.optionals stdenv.isLinux [ udev pcsclite ]; + + propagatedBuildInputs = [ openssl ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" @@ -33,6 +36,7 @@ stdenv.mkDerivation rec { "-DUSE_HIDAPI=1" ] ++ lib.optionals stdenv.isLinux [ "-DNFC_LINUX=1" + "-DUSE_PCSC=1" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index b02b856442bf..16c09b65ff1e 100644 --- a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.36.0"; + version = "0.38.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wCccGO3n+7yCayHJcsLLD/lnRO5aFckdjXTpvDhTqHI="; + hash = "sha256-1AGotagKfBexo2DdnMy23Fb9jTlEE6n7K2uxvF2Y/Uw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix index 8634f05ebbc7..00031e66bf50 100644 --- a/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -47,5 +47,6 @@ mkDerivation { maintainers = with maintainers; [ hodapp kovirobi ]; license = with licenses; [ mpl20 gpl2Plus ]; platforms = with platforms; linux ++ darwin; + broken = true; }; } diff --git a/nixpkgs/pkgs/development/libraries/libfm/default.nix b/nixpkgs/pkgs/development/libraries/libfm/default.nix index 5d7389b6d188..f8f79d99e457 100644 --- a/nixpkgs/pkgs/development/libraries/libfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfm/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; diff --git a/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix index e4121bc9e908..eb7de9bbc09d 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Goodix driver module for libfprint-2-tod Touch OEM Driver"; homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ grahamc ]; diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix index d2766c4d29ab..e05f67e01fa6 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.94.3"; + version = "1.94.4"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uOFWF+CDyK4+fY+NhiDnRKaptAN/vfH32Vzj+LAxWqg="; + sha256 = "sha256-C8vBjk0cZm/GSqc6mgNbXG8FycnWRaXhj9wIrLcWzfE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libfpx/default.nix b/nixpkgs/pkgs/development/libraries/libfpx/default.nix index 589c08399a70..963c93ffc592 100644 --- a/nixpkgs/pkgs/development/libraries/libfpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfpx/default.nix @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01"; sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; }) + # Pull upstream fix for -fno-common: + # https://github.com/ImageMagick/libfpx/pull/1 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch"; + sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9"; + }) ]; - # This dead code causes a duplicate symbol error in Clang so just remove it - postPatch = if stdenv.cc.isClang then '' - substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" - '' else null; - meta = with lib; { homepage = "http://www.imagemagick.org"; description = "A library for manipulating FlashPIX images"; diff --git a/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix b/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix index 9e30973f199e..648b6fac0dfc 100644 --- a/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-soname' '-install_name' \ + --replace 'lib$(NAME).so' 'lib$(NAME).dylib' + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" # disable static builds @@ -21,11 +27,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec + install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc + install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib + install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 + ''; + meta = with lib; { description = "Free Implementation of Audio Processing Technology codec (aptX)"; license = licenses.lgpl21Plus; homepage = "https://github.com/iamthehorker/libfreeaptx"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ kranzes ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index e5a3b79ba77c..2cd6c55fdbdd 100644 --- a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.19"; + version = "1.1.25"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-HTmNoTGyFtOXRy7Y/ZnEgTa2GW6/+TeZxZo7c7ksNtc="; + sha256 = "sha256-yr9FJd1+yJdP3vXHbuaaL5UmXGnKxR319LzXs76LBwk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index eb4e8e948629..56594620963c 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -15,11 +15,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a"; + hash = "sha256-7xSuVGsAhM2EJZ9hpV4Ho4w7U6/A9Ua//O8vAbr/6d4="; }; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgda/default.nix b/nixpkgs/pkgs/development/libraries/libgda/default.nix index a9993b7255a9..e29482a34d4e 100644 --- a/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -17,14 +17,11 @@ , autoconf-archive , yelp-tools , mysqlSupport ? false -, libmysqlclient ? null +, libmysqlclient , postgresSupport ? false -, postgresql ? null +, postgresql }: -assert mysqlSupport -> libmysqlclient != null; -assert postgresSupport -> postgresql != null; - stdenv.mkDerivation rec { pname = "libgda"; version = "5.2.10"; @@ -46,7 +43,6 @@ stdenv.mkDerivation rec { pkg-config intltool itstool - libxml2 gobject-introspection vala autoreconfHook @@ -65,6 +61,10 @@ stdenv.mkDerivation rec { postgresql ]; + propagatedBuildInputs = [ + libxml2 + ]; + configureFlags = [ "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" diff --git a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix index 2cd1be1fff2b..917fc831ab4b 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,15 +1,56 @@ -{ lib, stdenv, fetchurl, gnome, meson, ninja, pkg-config, vala, libssh2 -, gtk-doc, gobject-introspection, libgit2, glib, python3 }: +{ stdenv +, lib +, fetchurl +, gnome +, meson +, ninja +, pkg-config +, vala +, libssh2 +, gtk-doc +, gobject-introspection +, gi-docgen +, libgit2 +, glib +, python3 +}: stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "1.0.0.1"; + version = "1.1.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RgpdaTaVDKCNLYUYv8kMErsYfPbmdN5xX3BV/FgQK1c="; + sha256 = "w43XV12vgUHh5CIzOldfr2XzySEMCOg+mBuI3UG/HvM="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gtk-doc + gobject-introspection + gi-docgen + ]; + + propagatedBuildInputs = [ + # Required by libgit2-glib-1.0.pc + libgit2 + glib + ]; + + buildInputs = [ + libssh2 + python3.pkgs.pygobject3 # this should really be a propagated input of python output + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; + postPatch = '' for f in meson_vapi_link.py meson_python_compile.py; do chmod +x $f @@ -24,24 +65,10 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ - meson ninja pkg-config vala gtk-doc gobject-introspection - ]; - - propagatedBuildInputs = [ - # Required by libgit2-glib-1.0.pc - libgit2 glib - ]; - - buildInputs = [ - libssh2 - python3.pkgs.pygobject3 # this should really be a propagated input of python output - ]; - meta = with lib; { description = "A glib wrapper library around the libgit2 git access library"; homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/nixpkgs/pkgs/development/libraries/libgit2/default.nix index dc12e643cb75..c0e3ab0aca40 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , python3 @@ -12,31 +11,26 @@ , http-parser , libiconv , Security +, staticBuild ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.4.0"; + version = "1.5.0"; # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k="; + sha256 = "sha256-lXFQo+tt56BFoPgdkTfz6WdIngeotTm+8cAGcBP6XqY="; }; - patches = [ - (fetchpatch { - url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch"; - sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk="; - }) - ]; - cmakeFlags = [ "-DTHREADSAFE=ON" "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" + "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" ]; nativeBuildInputs = [ cmake python3 pkg-config ]; @@ -48,11 +42,11 @@ stdenv.mkDerivation rec { doCheck = false; # hangs. or very expensive? - meta = { + meta = with lib; { description = "Linkable library implementation of Git that you can use in your application"; homepage = "https://libgit2.org/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index 1e813b625fe4..44de9f314b53 100644 --- a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix @@ -1,15 +1,14 @@ -{ stdenv, lib, fetchFromGitLab, pkg-config, glib }: +{ stdenv, lib, fetchFromGitHub, pkg-config, glib }: stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.55"; + version = "1.0.66"; - src = fetchFromGitLab { - domain = "git.sailfishos.org"; - owner = "mer-core"; + src = fetchFromGitHub { + owner = "sailfishos"; repo = pname; rev = version; - sha256 = "0zrxccpyfz4jf14zr6fj9b88p340s66lw5cnqkapfa72kl1rnp4q"; + sha256 = "sha256-CYZDlmnHOCT0HC7sG0dN7zWkhcSRzX6XXPrEFmFEye8="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix index 5305b4922530..cdb539272e19 100644 --- a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.29"; + version = "2.5.30"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-Js5gbD57lhtqBX6joGMiLKUwkPDaSclnTrwBR87AliQ="; + sha256 = "sha256-4UwD283mKhZwC7setBU0BLRLsyfjD/6m/InSedrqgAU="; }; depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libgpod/default.nix b/nixpkgs/pkgs/development/libraries/libgpod/default.nix index e56e512931a0..590aaf27c5f0 100644 --- a/nixpkgs/pkgs/development/libraries/libgpod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpod/default.nix @@ -1,10 +1,23 @@ -{ stdenv, lib, fetchurl, perlPackages, intltool, autoreconfHook, - pkg-config, glib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib, - libimobiledevice, - monoSupport ? false, mono, gtk-sharp-2_0 +{ stdenv +, lib +, fetchurl +, perlPackages +, intltool +, autoreconfHook +, pkg-config +, glib +, libxml2 +, sqlite +, zlib +, sg3_utils +, gdk-pixbuf +, taglib +, libimobiledevice +, monoSupport ? false +, mono +, gtk-sharp-2_0 }: - stdenv.mkDerivation rec { pname = "libgpod"; version = "0.8.3"; @@ -27,20 +40,30 @@ stdenv.mkDerivation rec { "--with-udev-dir=${placeholder "out"}/lib/udev" ] ++ lib.optionals monoSupport [ "--with-mono" ]; - dontStrip = true; - - propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils - gdk-pixbuf taglib libimobiledevice ]; + dontStrip = monoSupport; nativeBuildInputs = [ autoreconfHook intltool pkg-config ] ++ (with perlPackages; [ perl XMLParser ]) - ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; + ++ lib.optional monoSupport mono; + + buildInputs = [ + libxml2 + sg3_utils + sqlite + taglib + ] ++ lib.optional monoSupport gtk-sharp-2_0; + + propagatedBuildInputs = [ + gdk-pixbuf + glib + libimobiledevice + ]; - meta = { - homepage = "https://gtkpod.sourceforge.net/"; + meta = with lib; { + homepage = "https://sourceforge.net/projects/gtkpod/"; description = "Library used by gtkpod to access the contents of an ipod"; - license = "LGPL"; - platforms = lib.platforms.gnu ++ lib.platforms.linux; + license = licenses.lgpl21Plus; + platforms = platforms.linux; maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/nixpkgs/pkgs/development/libraries/libgsf/default.nix index 8bc2dc76160f..30324b04d850 100644 --- a/nixpkgs/pkgs/development/libraries/libgsf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgsf/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.49"; + version = "1.14.50"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6evjZojwEMnm5AyJA/NzKUjeuKygMleNB9B1G9gs+Fc="; + sha256 = "bmwg0HeDOQadWDwNY3WdKX6BfqENDYl+u+ll8W4ujlI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libgtkflow/default.nix b/nixpkgs/pkgs/development/libraries/libgtkflow/default.nix new file mode 100644 index 000000000000..3e08f0dee772 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libgtkflow/default.nix @@ -0,0 +1,39 @@ +{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3}: + +stdenv.mkDerivation rec { + pname = "libgtkflow"; + version = "0.8.0"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "grindhold"; + repo = pname; + rev = version; + hash = "sha256:1m30rvj5hx3b4cj8lbzrxv4j8lp3hx4jlb8vpf4rh46vc1rdkxpz"; + }; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + ]; + + mesonFlags = [ + "-Denable_valadoc=true" + ]; + + meta = with lib; { + description = "Flow graph widget for GTK 3"; + homepage = "https://notabug.org/grindhold/libgtkflow"; + maintainers = with maintainers; [ grindhold ]; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 6a63947c8a57..799e1d0f8451 100644 --- a/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -7,8 +7,8 @@ , glib , gnome , vala -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) , gobject-introspection +, fetchpatch }: stdenv.mkDerivation rec { @@ -22,6 +22,25 @@ stdenv.mkDerivation rec { sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; }; + patches = [ + # https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/27 + (fetchpatch { + name = "gir-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/6bdde16a0cfde462502fce1d9a7eb6ec33f388bb.diff"; + sha256 = "sha256-bDtLUxOLEgyJURshqEQC4YCBTUVzQQP4qoWL786b3Z8="; + }) + (fetchpatch { + name = "vapi-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/d1f6457910842ba869c9871e7a2131fbe0d6b6be.diff"; + sha256 = "sha256-/PY8ziZST/vQvksJm69a3O6/YesknIxCDvj0z40piik="; + }) + (fetchpatch { + name = "gtk-doc-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/34336cbadbcaac8b9b029f730eed0bdf4c633617.diff"; + sha256 = "sha256-Bk05xe69LGqWH1uhLMZhwbVMSsCTyBrrOvqWic2TTd4="; + }) + ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -32,11 +51,11 @@ stdenv.mkDerivation rec { ninja vala glib # for glib-mkenums needed during the build - ] ++ lib.optionals withIntrospection [ gobject-introspection ]; buildInputs = [ + gobject-introspection udev glib ]; @@ -44,9 +63,6 @@ stdenv.mkDerivation rec { mesonFlags = [ # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway "-Dtests=disabled" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dvapi=disabled" ]; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index 49e76a94b001..e2da1a30ff14 100644 --- a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -1,37 +1,94 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper -, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2 -, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db -, gmp, readline, file, numactl, libapparmor, jansson -, getopt, perlPackages, ocamlPackages +{ lib +, stdenv +, fetchurl +, pkg-config +, autoreconfHook +, makeWrapper +, ncurses +, cpio +, gperf +, cdrkit +, flex +, bison +, qemu +, pcre2 +, augeas +, libxml2 +, acl +, libcap +, libcap_ng +, libconfig +, systemd +, fuse +, yajl +, libvirt +, hivex +, db +, gmp +, readline +, file +, numactl +, libapparmor +, jansson +, getopt +, perlPackages +, ocamlPackages , libtirpc , appliance ? null -, javaSupport ? false, jdk ? null }: +, javaSupport ? false +, jdk +}: assert appliance == null || lib.isDerivation appliance; -assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.46.2"; + version = "1.48.4"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "0sq092irlj2jf64m7hjx23hn5k4iypqxmlyn9g2z0q0xab56ksp6"; + sha256 = "sha256-ncIrbFpF8ZwsupEaN7Oo2G9idEUhsQ61PD05B+UIAxI="; }; strictDeps = true; nativeBuildInputs = [ - autoreconfHook bison cdrkit cpio flex getopt gperf makeWrapper pkg-config qemu - ] ++ (with perlPackages; [ perl libintl-perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ]); + autoreconfHook + bison + cdrkit + cpio + flex + getopt + gperf + makeWrapper + pkg-config + qemu + ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) + ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ - ncurses jansson - pcre2 augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex db - numactl libapparmor perlPackages.ModuleBuild + ncurses + jansson + pcre2 + augeas + libxml2 + acl + libcap + libcap_ng + libconfig + systemd + fuse + yajl + libvirt + gmp + readline + file + hivex + db + numactl + libapparmor + perlPackages.ModuleBuild libtirpc ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ lib.optional javaSupport jdk; + ++ lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -54,10 +111,14 @@ stdenv.mkDerivation rec { patches = [ ./libguestfs-syms.patch ]; + + createFindlibDestdir = true; + installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; postInstall = '' + mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs" for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ @@ -95,7 +156,7 @@ stdenv.mkDerivation rec { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2Plus lgpl21Plus ]; homepage = "https://libguestfs.org/"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = platforms.linux; # this is to avoid "output size exceeded" hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/nixpkgs/pkgs/development/libraries/libgweather/default.nix index e4a527ba4857..cae2095f8ebd 100644 --- a/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/LibGWeather"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index c1d81f8043c8..468062beaefb 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -15,6 +15,7 @@ , xvfb-run , gdk-pixbuf , librsvg +, libxml2 , hicolor-icon-theme , at-spi2-atk , at-spi2-core @@ -25,11 +26,12 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.6.1"; + version = "1.6.3"; outputs = [ "out" "dev" + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ] ++ lib.optionals enableGlade [ "glade" @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bqsDhEBNVr0bH6BZ2aCBF3d49q4ID/whIPKGVsp0YqQ="; + sha256 = "sha256-R3iL01gE69M8sJkR6XU0TIQ1ngttlSCv0cgh66i6d/8="; }; nativeBuildInputs = [ @@ -48,6 +50,8 @@ stdenv.mkDerivation rec { ninja pkg-config vala + ] ++ lib.optionals enableGlade [ + libxml2 # for xmllint ]; buildInputs = [ @@ -66,8 +70,9 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}" + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; # Uses define_variable in pkg-config, but we still need it to use the glade output @@ -107,6 +112,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; } // lib.optionalAttrs (!enableGlade) { glade = diff --git a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix index 061fe51ed5ba..2ad7539ef1fd 100644 --- a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; }; + patches = [ + (fetchurl { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/libhugetlbfs/glibc-2.34-fix.patch?rev=50"; + sha256 = "sha256-eRQa6M0ZdHMtwA5nnzDTWYv/x4AnRZhj+MpDiwyCvVM="; + }) + ]; + outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; postConfigure = '' @@ -33,6 +40,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix index 77c595c9184a..3fef461874c9 100644 --- a/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -13,7 +13,6 @@ , python3 , tzdata , fixDarwinDylibNames -, introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection , vala }: @@ -31,11 +30,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-gZ6IBjG5pNKJ+hWcTzXMP7yxL4he4LTklZGoC9vXra8="; }; + strictDeps = true; nativeBuildInputs = [ cmake ninja perl pkg-config + gobject-introspection + vala # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 @@ -43,15 +45,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # provides ical-glib-src-generator that runs during build libical - ] ++ lib.optionals introspectionSupport [ - gobject-introspection - vala ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; installCheckInputs = [ # running libical-glib tests - (python3.withPackages (pkgs: with pkgs; [ + (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ pygobject3 ])) ]; @@ -60,11 +59,11 @@ stdenv.mkDerivation rec { glib libxml2 icu + gobject-introspection ]; cmakeFlags = [ "-DENABLE_GTK_DOC=False" - ] ++ lib.optionals introspectionSupport [ "-DGOBJECT_INTROSPECTION=True" "-DICAL_GLIB_VAPI=True" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -79,7 +78,8 @@ stdenv.mkDerivation rec { # Using install check so we do not have to manually set # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables - doInstallCheck = true; + # Musl does not support TZDIR. + doInstallCheck = !stdenv.hostPlatform.isMusl; enableParallelChecking = false; preInstallCheck = if stdenv.isDarwin then '' for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/nixpkgs/pkgs/development/libraries/libiconv/default.nix index 35d01cd3e820..a6481970ef27 100644 --- a/nixpkgs/pkgs/development/libraries/libiconv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiconv/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6"; }; + enableParallelBuilding = true; + setupHooks = [ ../../../build-support/setup-hooks/role.bash ./setup-hook.sh @@ -50,6 +52,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; maintainers = [ ]; + mainProgram = "iconv"; # This library is not needed on GNU platforms. hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd; diff --git a/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/nixpkgs/pkgs/development/libraries/libidn2/default.nix index d8294f56adc3..724778999f5f 100644 --- a/nixpkgs/pkgs/development/libraries/libidn2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libidn2/default.nix @@ -16,10 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E="; }; + strictDeps = true; + # Beware: non-bootstrap libidn2 is overridden by ./hack.nix outputs = [ "bin" "dev" "out" "info" "devdoc" ]; patches = optional stdenv.isDarwin ./fix-error-darwin.patch; + enableParallelBuilding = true; + # The above patch causes the documentation to be regenerated, so the # documentation tools are required. nativeBuildInputs = optionals stdenv.isDarwin [ help2man texinfo ]; diff --git a/nixpkgs/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix b/nixpkgs/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix new file mode 100644 index 000000000000..e5922073437d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, libidn2, libunistring, runCommandLocal, patchelf }: +# Construct a copy of libidn2.* where all (transitive) libc references (in .bin) +# get replaced by a new one, so that there's no reference to bootstrap tools. +runCommandLocal + "${libidn2.pname}-${libidn2.version}" + { + outputs = [ "bin" "dev" "out" ]; + passthru = { + inherit (libidn2) out info devdoc; # no need to touch these store paths + }; + } + '' + cp -r '${libidn2.bin}' "$bin" + chmod +w "$bin"/bin/* + patchelf \ + --set-interpreter '${stdenv.cc.bintools.dynamicLinker}' \ + --set-rpath '${lib.concatMapStringsSep ":" (p: lib.getLib p + "/lib") + [ stdenv.cc.libc libunistring libidn2 ]}' \ + "$bin"/bin/* + + cp -r '${libidn2.dev}' "$dev" + chmod +w "$dev"/nix-support/propagated-build-inputs + substituteInPlace "$dev"/nix-support/propagated-build-inputs \ + --replace '${libidn2.bin}' "$bin" + substituteInPlace "$dev"/lib/pkgconfig/libidn2.pc \ + --replace '${libidn2.dev}' "$dev" + + ln -s '${libidn2.out}' "$out" # it's hard to be without any $out + '' + diff --git a/nixpkgs/pkgs/development/libraries/libime/default.nix b/nixpkgs/pkgs/development/libraries/libime/default.nix index 7584e29b6914..85d5c30691c1 100644 --- a/nixpkgs/pkgs/development/libraries/libime/default.nix +++ b/nixpkgs/pkgs/development/libraries/libime/default.nix @@ -13,26 +13,26 @@ let url = "https://download.fcitx-im.org/data/table.tar.gz"; sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; }; - arpaVer = "20140820"; + arpaVer = "20220630"; arpa = fetchurl { - url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; - sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; + url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; + sha256 = "sha256-jTsPqPoWuT0NRZDwLaBAKcJxNktZJcHJAoRcN0oqAL8="; }; - dictVer = "20211021"; + dictVer = "20220706"; dict = fetchurl { - url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; - sha256 = "sha256-MAWX5vf3n3iEgP1mXeige/6QInBItafjn0D0OmKpgd8="; + url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz"; + sha256 = "sha256-vNeR//eDr7QMHI6S2z+Dc0+Lk8nGriwV4eqHeLkHB3k="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.11"; + version = "unstable-2022-07-11"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; - rev = version; - sha256 = "sha256-0yo0D9Yxn7tx1HtEaQvWCDwpWxnRVa1rIGK/mC4G8CI="; + rev = "1adb14eb0617ef0eb0f07ad99684f43ca8a4395c"; + sha256 = "sha256-UldswsnkMuJh2G/EdsFl4CS7Y2RSRAb1hYeWUA2MHPw="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix new file mode 100644 index 000000000000..21daddb7ba3d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libplist +}: + +stdenv.mkDerivation rec { + pname = "libimobiledevice-glue"; + version = "0.pre+date=2022-05-22"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "d2ff7969dcd0a12e4f18f63dab03e6cd03054fcb"; + hash = "sha256-BAdpJK6/iUKCNYLaCJQo0VK63AdIafO8wGbNhnvEc/o="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + propagatedBuildInputs = [ + libplist + ]; + + meta = with lib; { + homepage = "https://github.com/libimobiledevice/libimobiledevice-glue"; + description = "Library with common code used by the libraries and tools around the libimobiledevice project."; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index 94fce176127c..8ded220678d0 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -2,45 +2,52 @@ , stdenv , fetchFromGitHub , autoreconfHook -, libtool , pkg-config , gnutls , libgcrypt -, libtasn1 -, glib , libplist +, libtasn1 , libusbmuxd +, libimobiledevice-glue +, SystemConfiguration +, CoreFoundation }: stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "unstable-2021-06-02"; + version = "1.3.0+date=2022-05-22"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = pname; + owner = "libimobiledevice"; repo = pname; - rev = "ca324155f8b33babf907704828c7903608db0aa2"; - sha256 = "sha256-Q7THwld1+elMJQ14kRnlIJDohFt7MW7JeyIUGC0k52I="; + rev = "12394bc7be588be83c352d7441102072a89dd193"; + hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM="; }; - outputs = [ "out" "dev" ]; + postPatch = '' + echo '${version}' > .tarball-version + ''; nativeBuildInputs = [ autoreconfHook - libtool pkg-config ]; propagatedBuildInputs = [ - glib gnutls libgcrypt libplist libtasn1 libusbmuxd + libimobiledevice-glue + ] ++ lib.optionals stdenv.isDarwin [ + SystemConfiguration + CoreFoundation ]; - configureFlags = [ "--disable-openssl" "--without-cython" ]; + configureFlags = [ "--with-gnutls" "--without-cython" ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; @@ -58,7 +65,7 @@ stdenv.mkDerivation rec { devices to the Linux Desktop. ''; license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix index 4b379660a84e..f9963ce3e636 100644 --- a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix @@ -9,8 +9,6 @@ assert avahiSupport -> avahi != null; assert gtkWidgets -> gtk3 != null; let - mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; - self = stdenv.mkDerivation rec { pname = "libinfinity"; version = "0.7.2"; @@ -29,13 +27,13 @@ let propagatedBuildInputs = [ gnutls ]; configureFlags = [ - "--enable-gtk-doc" - "--enable-introspection" - (mkFlag gtkWidgets "inftextgtk") - (mkFlag gtkWidgets "infgtk") - "--with-infinoted" - "--with-libdaemon" - (mkFlag avahiSupport "avahi") + (lib.enableFeature true "gtk-doc") + (lib.enableFeature true "introspection") + (lib.withFeature gtkWidgets "inftextgtk") + (lib.withFeature gtkWidgets "infgtk") + (lib.withFeature true "infinoted") + (lib.withFeature true "libdaemon") + (lib.withFeature avahiSupport "avahi") ]; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/libinjection/default.nix b/nixpkgs/pkgs/development/libraries/libinjection/default.nix index 81a1398147ba..d4193f32ccc0 100644 --- a/nixpkgs/pkgs/development/libraries/libinjection/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinjection/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub -, python2 +{ lib, stdenv, fetchFromGitHub, fetchpatch +, python3 }: stdenv.mkDerivation rec { @@ -13,11 +13,19 @@ stdenv.mkDerivation rec { sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g"; }; - nativeBuildInputs = [ python2 ]; + nativeBuildInputs = [ python3 ]; strictDeps = true; - patchPhase = '' + patches = [ + (fetchpatch { + name = "support-python3-for-building"; + url = "https://raw.githubusercontent.com/sysown/proxysql/bed58f92917eb651b80fd8ffa627a485eb320805/deps/libinjection/update-build-py3.diff"; + hash = "sha256-SPdf57FIDDNpatWe5pjhAiZl5yPMDEv50k0Wj+eWTEM="; + }) + ]; + + postPatch = '' patchShebangs src substituteInPlace src/Makefile \ --replace /usr/local $out diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index 89bdc15ff62c..0092a8fdc6c7 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -1,6 +1,7 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, gitUpdater , pkg-config , meson , ninja @@ -31,7 +32,7 @@ let env = python3.withPackages (pp: with pp; [ sphinx recommonmark - sphinx_rtd_theme + sphinx-rtd-theme ]); in # Expose only the sphinx-build binary to avoid contaminating @@ -44,13 +45,16 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.3"; + version = "1.21.0"; outputs = [ "bin" "out" "dev" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libinput"; + repo = "libinput"; + rev = version; + sha256 = "R94BdrjI4szNbVtQ+ydRNUg9clR8mkRL7+GE9b2FcDs="; }; patches = [ @@ -113,8 +117,14 @@ stdenv.mkDerivation rec { sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; - passthru.tests = { - libinput-module = nixosTests.libinput; + passthru = { + tests = { + libinput-module = nixosTests.libinput; + }; + updateScript = gitUpdater { + inherit pname version; + patchlevel-unstable = true; + }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/nixpkgs/pkgs/development/libraries/libipfix/default.nix index 173bfafc8cc9..8b0c35e0d148 100644 --- a/nixpkgs/pkgs/development/libraries/libipfix/default.nix +++ b/nixpkgs/pkgs/development/libraries/libipfix/default.nix @@ -7,6 +7,14 @@ stdenv.mkDerivation { url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; }; + + # Workaround build failure on -fno-common toolchains: + # ld: ../libmisc/libmisc.a(mlog.o):/build/libipfix_110209/libmisc/misc.h:111: multiple definition of + # `ht_globals'; collector.o:/build/libipfix_110209/collector/../libmisc/misc.h:111: first defined here + # TODO: drop the workaround when fix ix released: + # https://sourceforge.net/p/libipfix/code/ci/a501612c6b8ac6f2df16b366f7a92211382bae6b/ + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = with lib; { homepage = "http://libipfix.sourceforge.net/"; description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; diff --git a/nixpkgs/pkgs/development/libraries/libipt/default.nix b/nixpkgs/pkgs/development/libraries/libipt/default.nix index 15a677b3188c..2cef20fdcbd4 100644 --- a/nixpkgs/pkgs/development/libraries/libipt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "sha256-KhRmRoIHvpx5rV7roCnUH+a7JtPb6UqD41Wi4wHSR1c="; + sha256 = "sha256-W7Hvc2zkmR6FdPGsymWXtm66BiHLcW9r7mywHjabeLc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix index 540d6d01a411..6bf670a40382 100644 --- a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix @@ -1,18 +1,42 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libiconv +, libintl +}: stdenv.mkDerivation rec { pname = "libiptcdata"; - version = "1.0.4"; + version = "1.0.5"; - src = fetchurl { - url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz"; - sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr"; + src = fetchFromGitHub { + owner = "ianw"; + repo = pname; + rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-ZjokepDAHiSEwXrkvM9qUAPcpIiRQoOsv7REle7roPU="; }; - meta = { + postPatch = '' + # gtk-doc doesn't build without network access + sed -i '/GTK_DOC_CHECK/d;/docs/d' configure.ac + sed -i 's/docs//' Makefile.am + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + libintl + ]; + + meta = with lib; { description = "Library for reading and writing the IPTC metadata in images and other files"; - homepage = "http://libiptcdata.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + homepage = "https://github.com/ianw/libiptcdata"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix index 6a2f926d79ef..1de958dfb3a5 100644 --- a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix +++ b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix @@ -1,35 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config , libusb1 , readline +, libimobiledevice-glue }: stdenv.mkDerivation rec { pname = "libirecovery"; - version = "1.0.0"; + version = "1.0.0+date=2022-04-04"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "0p9ncqnz5kb7qisw00ynvasw1hax5qx241h9nwppi2g544i9lbnr"; + rev = "82d235703044c5af9da8ad8f77351fd2046dac47"; + hash = "sha256-OESN9qme+TlSt+ZMbR4F3z/3RN0I12R7fcSyURBqUVk="; }; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ - autoconf - automake - libtool + autoreconfHook pkg-config ]; buildInputs = [ libusb1 readline + libimobiledevice-glue ]; - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - # Packager note: Not clear whether this needs a NixOS configuration, # as only the `idevicerestore` binary was tested so far (which worked # without further configuration). @@ -39,16 +41,16 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/libimobiledevice/libirecovery"; description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; longDescription = '' libirecovery is a cross-platform library which implements communication to iBoot/iBSS found on Apple's iOS devices via USB. A command-line utility is also provided. ''; - license = licenses.lgpl21; - # Upstream description says it works on more platforms, but packager hasn't tried that yet - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/libimobiledevice/libirecovery"; + license = licenses.lgpl21Only; maintainers = with maintainers; [ nh2 ]; + mainProgram = "irecovery"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libite/default.nix b/nixpkgs/pkgs/development/libraries/libite/default.nix index 067eba793f7f..7dfb66dced90 100644 --- a/nixpkgs/pkgs/development/libraries/libite/default.nix +++ b/nixpkgs/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "sha256-G9X0ZMyasS9praogWnLDU1LeTvK4fYPgJ89o2y3AIJI="; + sha256 = "sha256-iviHxGXYUMjTgafkG4aqeHd9cnHA2VNhYG2eUta9R0Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix deleted file mode 100644 index 0aeef61dae9e..000000000000 --- a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, txt2tags }: - -stdenv.mkDerivation rec { - rev = "148"; - version = "hg-2012-12-02"; - pname = "libixp"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip"; - sha256 = "0kcdvdcrkw6q39v563ncis6d7ini64xbgn5fd3b4aa95fp9sj3is"; - }; - - configurePhase = '' - sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk - ''; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ txt2tags ]; - - meta = { - homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp - description = "Portable, simple C-language 9P client and server libary"; - maintainers = with lib.maintainers; [ kovirobi ]; - license = lib.licenses.mit; - platforms = with lib.platforms; unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libixp/default.nix b/nixpkgs/pkgs/development/libraries/libixp/default.nix new file mode 100644 index 000000000000..cc6c468bede5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libixp/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, unzip, txt2tags }: + +stdenv.mkDerivation rec { + pname = "libixp"; + version = "unstable-2022-04-04"; + + src = fetchFromGitHub { + owner = "0intro"; + repo = "libixp"; + rev = "ca2acb2988e4f040022f0e2094c69ab65fa6ec53"; + hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; + }; + + postConfigure = '' + sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk + ''; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ txt2tags ]; + + meta = { + broken = stdenv.isDarwin; + homepage = "https://github.com/0intro/libixp"; + description = "Portable, simple C-language 9P client and server libary"; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; + platforms = with lib.platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libjaylink/default.nix b/nixpkgs/pkgs/development/libraries/libjaylink/default.nix index 6aac7675dcdc..bf42624f7651 100644 --- a/nixpkgs/pkgs/development/libraries/libjaylink/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjaylink/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libjaylink"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { domain = "gitlab.zapb.de"; owner = "libjaylink"; repo = "libjaylink"; rev = version; - sha256 = "0ndyfh51hiqyv2yscpj6qd091w7myxxjid3a6rx8f6k233vy826q"; + sha256 = "sha256-90obLaSE3oxrocyJWZ4+j4U4GuPIZEiiIQqenu4vsJg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/nixpkgs/pkgs/development/libraries/libjcat/default.nix index f40898d11815..ca4509ff3cc2 100644 --- a/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , docbook_xml_dtd_43 , docbook-xsl-nons @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.10"; + version = "0.1.11"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-6fqcP8LWvRoDf5gJz+kW0w5+3PP/luuoPMak1QLKzzM="; + sha256 = "2kdoOwgaLpo/Cp3wkCMgdyQ++BC3Cn7CRhXhVCHn/iM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 92aaf6201b93..c9a5197a6b96 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -9,6 +9,21 @@ , enableJpeg8 ? false # whether to build libjpeg with v8 compatibility , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic + +# for passthru.tests +, dvgrab +, epeg +, freeimage +, gd +, graphicsmagick +, imagemagick +, imlib2 +, jhead +, libjxl +, mjpegtools +, opencv +, python3 +, vips }: assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both @@ -16,13 +31,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = version; - sha256 = "sha256-mlHueKAU/uNUdV9s4jWKAE+XVJdpEFhw2hxGvqRwAGc="; + sha256 = "sha256-GbOYoCNAsOESXrEsBb6OHVB4TKhPUEU04PBp8qXVMug="; }; # This is needed by freeimage @@ -61,6 +76,23 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "test"; + passthru.tests = { + inherit + dvgrab + epeg + freeimage + gd + graphicsmagick + imagemagick + imlib2 + jhead + libjxl + mjpegtools + opencv + vips; + inherit (python3.pkgs) pillow imread pyturbojpeg; + }; + meta = with lib; { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; diff --git a/nixpkgs/pkgs/development/libraries/libjson/default.nix b/nixpkgs/pkgs/development/libraries/libjson/default.nix index 9106c1974716..0a1a631a6b93 100644 --- a/nixpkgs/pkgs/development/libraries/libjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjson/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./install-fix.patch ]; nativeBuildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; preInstall = "mkdir -p $out/lib"; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 081ddaf4988a..be0a4fb91549 100644 --- a/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -1,10 +1,7 @@ { stdenv, lib, fetchFromGitHub , fetchpatch -, asciidoc , brotli , cmake -, graphviz -, doxygen , giflib , gperftools , gtest @@ -14,8 +11,12 @@ , libwebp , openexr , pkg-config -, python3 , zlib +, buildDocs ? true +, asciidoc +, graphviz +, doxygen +, python3 }: stdenv.mkDerivation rec { @@ -47,16 +48,28 @@ stdenv.mkDerivation rec { url = "https://github.com/libjxl/libjxl/commit/204f87a5e4d684544b13900109abf040dc0b402b.patch"; sha256 = "sha256-DoAaYWLmQ+R9GZbHMTYGe0gBL9ZesgtB+2WhmbARna8="; }) + + # fix build with asciidoc wrapped in shell script + (fetchpatch { + url = "https://github.com/libjxl/libjxl/commit/b8ec58c58c6281987f42ebec892f513824c0cc0e.patch"; + hash = "sha256-g8U+YVhLfgSHJ+PWJgvVOI66+FElJSC8IgSRodNnsMw="; + }) + (fetchpatch { + url = "https://github.com/libjxl/libjxl/commit/ca8e276aacf63a752346a6a44ba673b0af993237.patch"; + excludes = [ "AUTHORS" ]; + hash = "sha256-9VXy1LdJ0JhYbCGPNMySpnGLBxUrr8BYzE+oU3LnUGw="; + }) ]; nativeBuildInputs = [ - asciidoc # for docs cmake - graphviz # for docs via doxygen component `dot` - doxygen # for docs gtest pkg-config - python3 # for docs + ] ++ lib.optionals buildDocs [ + asciidoc + graphviz + doxygen + python3 ]; # Functionality not currently provided by this package @@ -76,10 +89,8 @@ stdenv.mkDerivation rec { # conclusively in its README or otherwise; they can best be determined # by checking the CMake output for "Could NOT find". buildInputs = [ - brotli giflib gperftools # provides `libtcmalloc` - libhwy libjpeg libpng libwebp @@ -87,6 +98,11 @@ stdenv.mkDerivation rec { zlib ]; + propagatedBuildInputs = [ + brotli + libhwy + ]; + cmakeFlags = [ # For C dependencies like brotli, which are dynamically linked, # we want to use the system libraries, so that we don't have to care about @@ -111,17 +127,7 @@ stdenv.mkDerivation rec { LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; - doCheck = true; - - # The test driver runs a test `LibraryCLinkageTest` which without - # LD_LIBRARY_PATH setting errors with: - # /build/source/build/tools/tests/libjxl_test: error while loading shared libraries: libjxl.so.0 - # The required file is in the build directory (`$PWD`). - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - '' else '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - ''; + doCheck = !stdenv.hostPlatform.isi686; meta = with lib; { homepage = "https://github.com/libjxl/libjxl"; diff --git a/nixpkgs/pkgs/development/libraries/libkqueue/default.nix b/nixpkgs/pkgs/development/libraries/libkqueue/default.nix new file mode 100644 index 000000000000..5f96353d9d69 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libkqueue/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libkqueue"; + version = "2.6.2"; + + src = fetchFromGitHub { + owner = "mheily"; + repo = "libkqueue"; + rev = "v${version}"; + sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "kqueue(2) compatibility library"; + homepage = "https://github.com/mheily/libkqueue"; + changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog"; + license = licenses.bsd2; + maintainers = [ maintainers.marsam ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libkrun/default.nix b/nixpkgs/pkgs/development/libraries/libkrun/default.nix new file mode 100644 index 000000000000..21be0c8437ae --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libkrun/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, glibc +, openssl +, libkrunfw +, sevVariant ? false +}: + +stdenv.mkDerivation rec { + pname = "libkrun"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0="; + }; + + nativeBuildInputs = with rustPlatform;[ + cargoSetupHook + rust.cargo + rust.rustc + ] ++ lib.optional sevVariant pkg-config; + + buildInputs = [ + glibc + glibc.static + (libkrunfw.override { inherit sevVariant; }) + ] ++ lib.optional sevVariant openssl; + + makeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optional sevVariant "SEV=1"; + + meta = with lib; { + description = "A dynamic library providing Virtualization-based process isolation capabilities"; + homepage = "https://github.com/containers/libkrun"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix b/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix new file mode 100644 index 000000000000..10ff37460496 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, flex +, bison +, bc +, elfutils +, python3 +, sevVariant ? false +}: + +assert sevVariant -> stdenv.isx86_64; +stdenv.mkDerivation rec { + pname = "libkrunfw"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg="; + }; + + kernelSrc = fetchurl { + url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.59.tar.xz"; + hash = "sha256-5t3GQgVzQNsGs7khwrMb/tLGETWejxRMPlz5w6wzvMs="; + }; + + preBuild = '' + substituteInPlace Makefile --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' + ''; + + nativeBuildInputs = [ flex bison bc python3 python3.pkgs.pyelftools ]; + buildInputs = [ elfutils ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optional sevVariant "SEV=1"; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A dynamic library bundling the guest payload consumed by libkrun"; + homepage = "https://github.com/containers/libkrunfw"; + license = with licenses; [ lgpl2Only lgpl21Only ]; + maintainers = with maintainers; [ nickcao ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix index 0f0fec46a277..68658d20ba6d 100644 --- a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + NIX_CFLAGS_COMPILE = + lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-std=c++11" + ]; + dontWrapQtApps = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 2d4a1004d87f..10c2bfb272c8 100644 --- a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -1,53 +1,25 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , doxygen , fetchFromGitLab -, ffmpeg -, gdk-pixbuf -, glib -, graphviz -, gtk2 -, intltool -, libexosip -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 +, jsoncpp , libxml2 , lime -, makeWrapper -, mbedtls , mediastreamer -, openldap -, ortp -, pango -, pkg-config , python3 -, readline -, soci -, boost -, speex +, bc-soci , sqlite -, lib, stdenv -, udev +, lib +, stdenv , xercesc -, xsd -, zlib }: stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.5.17"; + version = "5.1.22"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -55,62 +27,36 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-ryyT4bG3lnE72ydvCAoiT3IeHY4mZwX9nCqaTRC1wyc="; + sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY="; }; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + patches = [ ./use-normal-jsoncpp.patch ]; + + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; - # TODO: Not sure if all these inputs are actually needed. Most of them were - # defined when liblinphone and linphone-desktop weren't separated yet, so some - # of them might not be needed for liblinphone alone. buildInputs = [ - (python3.withPackages (ps: [ ps.pystache ps.six ])) - bcg729 - bctoolbox + # Made by BC belcard belle-sip - belr - bzrtp - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip - libmatroska - libnotify - libosip - libsoup - libupnp - libxml2 lime - mbedtls mediastreamer - openldap - ortp - pango - readline - soci - boost - speex + + # Vendored by BC + bc-soci + + jsoncpp + libxml2 + (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite - udev xercesc - xsd - zlib ]; nativeBuildInputs = [ - bcunit cmake doxygen - graphviz - intltool - makeWrapper - pkg-config ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch new file mode 100644 index 000000000000..4685b327ecd3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch @@ -0,0 +1,57 @@ +From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001 +From: Lorenz Brun <lorenz@brun.one> +Date: Fri, 18 Mar 2022 17:36:22 +0100 +Subject: [PATCH] Use normal jsoncpp + +--- + src/CMakeLists.txt | 6 +++--- + tester/CMakeLists.txt | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5cd87fe9a..822b2151e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) + if (XCODE) + list(APPEND LINK_LIBS jsoncpp_static) + else() +- list(APPEND LINK_LIBS jsoncpp_object) ++ list(APPEND LINK_LIBS jsoncpp) + endif() + endif() + +@@ -592,7 +592,7 @@ if(ENABLE_STATIC) + if (XCODE) + target_link_libraries(linphone PRIVATE jsoncpp_static) + else() +- target_link_libraries(linphone PRIVATE jsoncpp_object) ++ target_link_libraries(linphone PRIVATE jsoncpp) + endif() + endif() + +@@ -646,7 +646,7 @@ if(ENABLE_SHARED) + if (XCODE) + target_link_libraries(linphone PRIVATE jsoncpp_static) + else() +- target_link_libraries(linphone PRIVATE jsoncpp_object) ++ target_link_libraries(linphone PRIVATE jsoncpp) + endif() + endif() + +diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt +index b97042678..b4c5a5794 100644 +--- a/tester/CMakeLists.txt ++++ b/tester/CMakeLists.txt +@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) + if (XCODE) + list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static) + else() +- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object) ++ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp) + endif() + endif() + +-- +2.25.1 + diff --git a/nixpkgs/pkgs/development/libraries/liblognorm/default.nix b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix index af4190f96833..184d9932eb28 100644 --- a/nixpkgs/pkgs/development/libraries/liblognorm/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with lib; { - homepage = "https://www.liblognorm.com/"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; + homepage = "https://www.liblognorm.com/"; license = licenses.lgpl21; + mainProgram = "lognormalizer"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index 893704ddb18c..32e58c9be0b2 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub -, lib, stdenv +, lib +, stdenv , autoreconfHook , pkg-config , gettext @@ -12,17 +13,17 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.21.0"; + version = "3.22.0"; + + outputs = [ "out" "dev" "man" "info" "doc" ]; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8="; + sha256 = "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY="; }; - outputs = [ "out" "dev" "man" "info" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -61,7 +62,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source braille translator and back-translator"; homepage = "http://liblouis.org/"; - license = licenses.lgpl21; + license = with licenses; [ + lgpl21Plus # library + gpl3Plus # tools + ]; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/nixpkgs/pkgs/development/libraries/libmanette/default.nix index 645b521b8172..2320aa78bba7 100644 --- a/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -2,6 +2,7 @@ , fetchurl , ninja , meson +, mesonEmulatorHook , pkg-config , vala , gobject-introspection @@ -34,9 +35,12 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection glib libgudev libevdev diff --git a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix index 1c15519aaff9..852d26344efa 100644 --- a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; + maintainers = [ maintainers.ajs124 ]; + mainProgram = "mmdblookup"; platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 5a57dfb578de..eb32fca71641 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.26.2"; + version = "1.26.4"; + + outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-EMd79bXrjJK6gOm1GZI62biYNivI4ZKOK8mhfuumSa8="; + sha256 = "sha256-9ojOxMRYahdXX14ydEjOYvIADvagfJ5FiYc9SmhWitk="; }; - outputs = [ "out" "dev" "man" ]; - configureFlags = [ "--with-udev-base-dir=${placeholder "out"}/lib/udev" (lib.enableFeature withIntrospection "introspection") diff --git a/nixpkgs/pkgs/development/libraries/libmd/default.nix b/nixpkgs/pkgs/development/libraries/libmd/default.nix index a429cb219d58..ad3d8f0cce40 100644 --- a/nixpkgs/pkgs/development/libraries/libmd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmd/default.nix @@ -1,14 +1,26 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libmd"; version = "1.0.4"; src = fetchurl { - url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; + urls = [ + "https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz" + "https://libbsd.freedesktop.org/releases/libmd-${version}.tar.xz" + ]; sha256 = "sha256-9RySEELjS+3e3tS3VVdlZVnPWx8kSAM7TB7sEcB+Uw8="; }; + patches = [ + # Drop aliases for SHA384 functions, because such aliases are not supported on Darwin. + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/8332f5dbcaf05a02bc31fbd4ccf735e7d5c9a5b0/devel/libmd/files/patch-symbol-alias.diff"; + sha256 = "sha256-py5hMpKYKwtBzhWn01lFc2a6+OZN72YCYXyhg1qe6rg="; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { @@ -18,6 +30,6 @@ stdenv.mkDerivation rec { description = "Message Digest functions from BSD systems"; license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ]; maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libmediaart/default.nix b/nixpkgs/pkgs/development/libraries/libmediaart/default.nix index 7f9c4d6ac94b..531ff8584fac 100644 --- a/nixpkgs/pkgs/development/libraries/libmediaart/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediaart/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmediaart"; - version = "1.9.5"; + version = "1.9.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7"; + sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc="; }; nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 2a74c79afaf0..38f27ab23fcd 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib, fetchpatch }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "21.09"; + version = "22.06"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "09pinxqw3z3hxrafn67clw1cb1z9aqfy6gkiavginfm0yr299gk9"; + sha256 = "sha256-snmoTy87s1NmTE59X+7brJix/Q1NQTGrczF1Qff+wvY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libzen zlib ]; - - patches = [ - # fixes pkgsMusl.libmediainfo build - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/libmediainfo/fix-include-signal.patch?id=b8d666a3d33575c184308e1176f4de9e519af577"; - sha256 = "sha256-b3HoIwy/hKSh8jUakwVJpnPmYw5KUwZXgLW7IPMY4/c="; - }) - ]; + buildInputs = [ zlib ]; + propagatedBuildInputs = [ libzen ]; postPatch = "cd Project/GNU/Library"; diff --git a/nixpkgs/pkgs/development/libraries/libminc/default.nix b/nixpkgs/pkgs/development/libraries/libminc/default.nix index 2440082cce9d..00db5fc83377 100644 --- a/nixpkgs/pkgs/development/libraries/libminc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libminc/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libminc"; - version = "unstable-2020-07-17"; + version = "2.4.05"; owner = "BIC-MNI"; src = fetchFromGitHub { inherit owner; repo = pname; - rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca"; - sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm"; + rev = "aa08255f0856e70fb001c5f9ee1f4e5a8c12d47d"; # new release, but no git tag + sha256 = "XMTO6/HkyrrQ0s5DzJLCmmWheye2DGMnpDbcGdP6J+A="; }; postPatch = '' @@ -24,15 +24,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLIBMINC_MINC1_SUPPORT=ON" "-DLIBMINC_BUILD_SHARED_LIBS=ON" + "-DLIBMINC_USE_NIFTI=ON" "-DLIBMINC_USE_SYSTEM_NIFTI=ON" ]; doCheck = !stdenv.isDarwin; - checkPhase = '' - export LD_LIBRARY_PATH="$(pwd)" # see #22060 - ctest -j1 -E 'ezminc_rw_test' --output-on-failure # -j1: see https://github.com/BIC-MNI/libminc/issues/110 - # ezminc_rw_test: can't find libminc_io.so.5.2.0 + checkPhase = '' + ctest -j1 --output-on-failure ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libmnl/default.nix b/nixpkgs/pkgs/development/libraries/libmnl/default.nix index a8ec4c5f3b95..9a6f6a1d14dc 100644 --- a/nixpkgs/pkgs/development/libraries/libmnl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmnl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmnl"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "https://netfilter.org/projects/libmnl/files/${pname}-${version}.tar.bz2"; - sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp"; + sha256 = "09851ns07399rbz0y8slrlmnw3fn1nakr8d37pxjn5gkks8rnjr7"; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/nixpkgs/pkgs/development/libraries/libmpc/default.nix index 2dede1f976d2..8421a2503070 100644 --- a/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; }; + strictDeps = true; + enableParallelBuilding = true; + buildInputs = [ gmp mpfr ]; doCheck = true; # not cross; diff --git a/nixpkgs/pkgs/development/libraries/libmtp/default.nix b/nixpkgs/pkgs/development/libraries/libmtp/default.nix index c3c9c20e86fd..e0c3e195b2da 100644 --- a/nixpkgs/pkgs/development/libraries/libmtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmtp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libmtp"; - version = "1.1.19"; + version = "1.1.20"; src = fetchFromGitHub { owner = "libmtp"; repo = "libmtp"; rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-o8JKoKVNpU/nHTDnKJpa8FlXt37fZnTf45WBTCxLyTs="; + sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix index e1ad8305188e..60a6c4f69eb7 100644 --- a/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + broken = stdenv.isDarwin; homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/libmx/default.nix b/nixpkgs/pkgs/development/libraries/libmx/default.nix index 683c21095e6b..be4cdd62f6e1 100644 --- a/nixpkgs/pkgs/development/libraries/libmx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmx/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; buildInputs = [ - automake autoconf libtool + libtool intltool gobject-introspection glib gtk2 gtk-doc clutter clutter-gtk diff --git a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 5303dbed6ca8..73bc19a424fe 100644 --- a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.28"; + version = "8.0.29"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs="; + sha256 = "sha256-mmI2oovKM66VHYzKq7j/UaGIhj6FmfkJb0rgodoZ+H8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index 54177ad559d6..f718170fc76c 100644 --- a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; + homepage = "http://miniupnp.free.fr/libnatpmp.html"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; + mainProgram = "natpmpc"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix index 7913515df66c..7c72b6774994 100644 --- a/nixpkgs/pkgs/development/libraries/libnats-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "1ngji3sa44y27lnq4x5dzbd117s9psx4w0j50b4c2b72cf2z139q"; + sha256 = "sha256-2z+r0OIVYE7NPQQAd5vOK8KkFo4Zzi2pPcwPByJTyPc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libnatspec/default.nix b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix index 9a0b90e16a41..304fb49f0274 100644 --- a/nixpkgs/pkgs/development/libraries/libnatspec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; + propagatedBuildInputs = [ libiconv ]; + meta = with lib; { homepage = "http://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; }; -} // lib.optionalAttrs (!stdenv.isLinux) { - propagatedBuildInputs = [ libiconv ]; } diff --git a/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/nixpkgs/pkgs/development/libraries/libnbd/default.nix index ba21e2206a8d..2156e9c2f97f 100644 --- a/nixpkgs/pkgs/development/libraries/libnbd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnbd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.12.2"; + version = "1.14.1"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-57veJapt72LkP02wO4c1nDdHmnodqfT+rKPNDeTGQPM="; + hash = "sha256-LwgXVWOWwyc9OUJEKHkDQEfGBy41XsdbRuG+zluFc3E="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libnet/default.nix b/nixpkgs/pkgs/development/libraries/libnet/default.nix index cb3375708df1..af3c7f82aefa 100644 --- a/nixpkgs/pkgs/development/libraries/libnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnet/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "libnet"; - version = "1.2-rc3"; + version = "1.2"; - src = fetchurl { - url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz"; - sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; + src = fetchFromGitHub { + owner = "sam-github"; + repo = "libnet"; + rev = "v${version}"; + sha256 = "sha256-Y/wd9c4whUbfpvWvKzJV6vJN3AlA14XBejchRG6wBc4="; }; - patches = [ ./fix-includes.patch ]; + nativeBuildInputs = [ + autoconf + automake + libtool + ]; + + preConfigure = "./autogen.sh"; meta = with lib; { homepage = "https://github.com/sam-github/libnet"; diff --git a/nixpkgs/pkgs/development/libraries/libnet/fix-includes.patch b/nixpkgs/pkgs/development/libraries/libnet/fix-includes.patch deleted file mode 100644 index 5eb86bc37b79..000000000000 --- a/nixpkgs/pkgs/development/libraries/libnet/fix-includes.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- libnet-1.1.6.orig/src/libnet_link_linux.c -+++ libnet-1.1.6/src/libnet_link_linux.c -@@ -30,26 +30,15 @@ - #include <sys/time.h> - - #include <net/if.h> --#if (__GLIBC__) - #include <netinet/if_ether.h> - #include <net/if_arp.h> --#else --#include <linux/if_arp.h> --#include <linux/if_ether.h> --#endif - - #if (HAVE_PACKET_SOCKET) - #ifndef SOL_PACKET - #define SOL_PACKET 263 - #endif /* SOL_PACKET */ --#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 - #include <netpacket/packet.h> - #include <net/ethernet.h> /* the L2 protocols */ --#else --#include <asm/types.h> --#include <linux/if_packet.h> --#include <linux/if_ether.h> /* The L2 protocols */ --#endif - #endif /* HAVE_PACKET_SOCKET */ - - #include "../include/libnet.h" diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix index a2097bb17e25..e960c8d1bf48 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; - sha256 = "1ky1mqgnplw2h9jf0kn0a69d94jkydhbiipng9l2hdcj13h3pl8c"; + sha256 = "sha256-Z72d9J/jTouCFE9t+5OzIPOEqOpZcn6S/40YtfS1eag="; }; + patches = [ + # Fix Musl build. + (fetchpatch { + url = "https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824"; + sha256 = "00rp82jrx5ygcw8la3c7bv7sigw9qzbn956dk71qjx981a2g2kqk"; + }) + ]; + buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix index 294f776192d7..5d221bed34a0 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "libnetfilter_cthelper"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2"; - sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; + sha256 = "sha256-FAc9VIcjOJc1XT/wTdwcjQPMW6jSNWI2qogWGp8tyRI="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index a8d0c2680dfe..d4b53a181871 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "libnetfilter_cttimeout"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2"; - sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; + sha256 = "sha256-C1naLzIE4cgMuF0fbXIoX8B7AaL1Z4q/Xcz7vv1lAyU="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; diff --git a/nixpkgs/pkgs/development/libraries/libnfc/default.nix b/nixpkgs/pkgs/development/libraries/libnfc/default.nix index 7e0d18115ef7..88bc909ea0e6 100644 --- a/nixpkgs/pkgs/development/libraries/libnfc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnfc/default.nix @@ -1,23 +1,47 @@ -{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }: +{ lib +, stdenv +, fetchFromGitHub +, libusb-compat-0_1 +, readline +, cmake +, pkg-config +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libnfc"; - version = "1.7.1"; + version = "1.8.0"; - src = fetchurl { - url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2"; - sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; + src = fetchFromGitHub { + owner = "nfc-tools"; + repo = pname; + rev = "libnfc-${version}"; + sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ="; }; - buildInputs = [ libusb-compat-0_1 readline ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - configureFlags = [ "sysconfdir=/etc" ]; + buildInputs = [ + libusb-compat-0_1 + readline + ]; + + configureFlags = [ + "sysconfdir=/etc" + ]; + + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DLIBNFC_DRIVER_PN532_I2C=OFF" + "-DLIBNFC_DRIVER_PN532_SPI=OFF" + ]; meta = with lib; { - description = "Open source library libnfc for Near Field Communication"; - license = licenses.gpl3; + description = "Library for Near Field Communication (NFC)"; homepage = "https://github.com/nfc-tools/libnfc"; - maintainers = with maintainers; [offline]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch b/nixpkgs/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch deleted file mode 100644 index 074bef42b97a..000000000000 --- a/nixpkgs/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch +++ /dev/null @@ -1,499 +0,0 @@ -From patchwork Fri Apr 3 22:04:46 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: Use stdlib uint* instead of u_int* -From: Nathan McSween <nwmcsween@gmail.com> -X-Patchwork-Id: 458131 -X-Patchwork-Delegate: pablo@netfilter.org -Message-Id: <1428098686-17843-1-git-send-email-nwmcsween@gmail.com> -To: netfilter-devel@vger.kernel.org -Cc: Nathan McSween <nwmcsween@gmail.com> -Date: Fri, 3 Apr 2015 22:04:46 +0000 - -Signed-off-by: Nathan McSween <nwmcsween@gmail.com> ---- - include/libnfnetlink/libnfnetlink.h | 25 +++++----- - include/libnfnetlink/linux_nfnetlink.h | 11 +++-- - include/libnfnetlink/linux_nfnetlink_compat.h | 6 ++- - src/iftable.c | 9 ++-- - src/iftable.h | 6 ++- - src/libnfnetlink.c | 71 ++++++++++++++------------- - src/rtnl.c | 5 +- - src/rtnl.h | 3 +- - 8 files changed, 73 insertions(+), 63 deletions(-) - -diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h -index 1d8c49d..cd0be3d 100644 ---- a/include/libnfnetlink/libnfnetlink.h -+++ b/include/libnfnetlink/libnfnetlink.h -@@ -15,6 +15,7 @@ - #define aligned_u64 unsigned long long __attribute__((aligned(8))) - #endif - -+#include <stdint.h> - #include <sys/socket.h> /* for sa_family_t */ - #include <linux/netlink.h> - #include <libnfnetlink/linux_nfnetlink.h> -@@ -55,7 +56,7 @@ struct nfnlhdr { - struct nfnl_callback { - int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); - void *data; -- u_int16_t attr_count; -+ uint16_t attr_count; - }; - - struct nfnl_handle; -@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); - extern int nfnl_close(struct nfnl_handle *); - - extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, -- u_int8_t, u_int8_t, -+ uint8_t, uint8_t, - unsigned int); - extern void nfnl_subsys_close(struct nfnl_subsys_handle *); - -@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, - const struct iovec *iov, unsigned int num, - unsigned int flags); - extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, -- unsigned int, u_int8_t, u_int16_t, u_int16_t, -- u_int16_t); -+ unsigned int, uint8_t, uint16_t, uint16_t, -+ uint16_t); - extern __attribute__((deprecated)) int - nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, - unsigned, struct nlmsghdr *, -@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, - /* receiving */ - extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); - extern int nfnl_callback_register(struct nfnl_subsys_handle *, -- u_int8_t type, struct nfnl_callback *cb); --extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); -+ uint8_t type, struct nfnl_callback *cb); -+extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); - extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); - - /* parsing */ -@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); - - /* nfnl attribute handling functions */ - extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); --extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); --extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); --extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); -+extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); -+extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); -+extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); - extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); --extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); --extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); -+extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); -+extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); - extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - #define nfnl_parse_nested(tb, max, nfa) \ - nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) -@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) - - extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, -+ uint16_t type, uint32_t len, - unsigned char *val); - extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, - unsigned int size); -diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h -index 76a8550..7b843c6 100644 ---- a/include/libnfnetlink/linux_nfnetlink.h -+++ b/include/libnfnetlink/linux_nfnetlink.h -@@ -1,5 +1,6 @@ - #ifndef _NFNETLINK_H - #define _NFNETLINK_H -+#include <stdint.h> - #include <linux/types.h> - #include <libnfnetlink/linux_nfnetlink_compat.h> - -@@ -25,9 +26,9 @@ enum nfnetlink_groups { - /* General form of address family dependent message. - */ - struct nfgenmsg { -- u_int8_t nfgen_family; /* AF_xxx */ -- u_int8_t version; /* nfnetlink version */ -- u_int16_t res_id; /* resource id */ -+ uint8_t nfgen_family; /* AF_xxx */ -+ uint8_t version; /* nfnetlink version */ -+ uint16_t res_id; /* resource id */ - }; - - #define NFNETLINK_V0 0 -@@ -59,7 +60,7 @@ struct nfnl_callback - int (*call)(struct sock *nl, struct sk_buff *skb, - struct nlmsghdr *nlh, struct nlattr *cda[]); - const struct nla_policy *policy; /* netlink attribute policy */ -- const u_int16_t attr_count; /* number of nlattr's */ -+ const uint16_t attr_count; /* number of nlattr's */ - }; - - struct nfnetlink_subsystem -@@ -76,7 +77,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); - extern int nfnetlink_has_listeners(unsigned int group); - extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, - int echo); --extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); -+extern int nfnetlink_unicast(struct sk_buff *skb, uint32_t pid, int flags); - - #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ - MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) -diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h -index e145176..cd094fc 100644 ---- a/include/libnfnetlink/linux_nfnetlink_compat.h -+++ b/include/libnfnetlink/linux_nfnetlink_compat.h -@@ -3,6 +3,8 @@ - #ifndef __KERNEL__ - /* Old nfnetlink macros for userspace */ - -+#include <stdint.h> -+ - /* nfnetlink groups: Up to 32 maximum */ - #define NF_NETLINK_CONNTRACK_NEW 0x00000001 - #define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 -@@ -20,8 +22,8 @@ - - struct nfattr - { -- u_int16_t nfa_len; -- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest -+ uint16_t nfa_len; -+ uint16_t nfa_type; /* we use 15 bits for the type, and the highest - * bit to indicate whether the payload is nested */ - }; - -diff --git a/src/iftable.c b/src/iftable.c -index 5976ed8..3411c4c 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -9,6 +9,7 @@ - /* IFINDEX handling */ - - #include <unistd.h> -+#include <stdint.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -27,10 +28,10 @@ - struct ifindex_node { - struct list_head head; - -- u_int32_t index; -- u_int32_t type; -- u_int32_t alen; -- u_int32_t flags; -+ uint32_t index; -+ uint32_t type; -+ uint32_t alen; -+ uint32_t flags; - char addr[8]; - char name[16]; - }; -diff --git a/src/iftable.h b/src/iftable.h -index 8df7f24..0cc5335 100644 ---- a/src/iftable.h -+++ b/src/iftable.h -@@ -1,8 +1,10 @@ - #ifndef _IFTABLE_H - #define _IFTABLE_H - --int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); --int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); -+#include <stdint.h> -+ -+int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); -+int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); - - int iftable_init(void); - void iftable_fini(void); -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 398b7d7..b8958dc 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -36,6 +36,7 @@ - * minor cleanups - */ - -+#include <stdint.h> - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> -@@ -72,9 +73,9 @@ - - struct nfnl_subsys_handle { - struct nfnl_handle *nfnlh; -- u_int32_t subscriptions; -- u_int8_t subsys_id; -- u_int8_t cb_count; -+ uint32_t subscriptions; -+ uint8_t subsys_id; -+ uint8_t cb_count; - struct nfnl_callback *cb; /* array of callbacks */ - }; - -@@ -86,11 +87,11 @@ struct nfnl_handle { - int fd; - struct sockaddr_nl local; - struct sockaddr_nl peer; -- u_int32_t subscriptions; -- u_int32_t seq; -- u_int32_t dump; -- u_int32_t rcv_buffer_size; /* for nfnl_catch */ -- u_int32_t flags; -+ uint32_t subscriptions; -+ uint32_t seq; -+ uint32_t dump; -+ uint32_t rcv_buffer_size; /* for nfnl_catch */ -+ uint32_t flags; - struct nlmsghdr *last_nlhdr; - struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; - }; -@@ -145,7 +146,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) - static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) - { - int i, err; -- u_int32_t new_subscriptions = nfnlh->subscriptions; -+ uint32_t new_subscriptions = nfnlh->subscriptions; - - for (i = 0; i < NFNL_MAX_SUBSYS; i++) - new_subscriptions |= nfnlh->subsys[i].subscriptions; -@@ -273,8 +274,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) - * a valid address that points to a nfnl_subsys_handle structure is returned. - */ - struct nfnl_subsys_handle * --nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, -- u_int8_t cb_count, u_int32_t subscriptions) -+nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, -+ uint8_t cb_count, uint32_t subscriptions) - { - struct nfnl_subsys_handle *ssh; - -@@ -435,10 +436,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, - */ - void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, - struct nlmsghdr *nlh, unsigned int len, -- u_int8_t family, -- u_int16_t res_id, -- u_int16_t msg_type, -- u_int16_t msg_flags) -+ uint8_t family, -+ uint16_t res_id, -+ uint16_t msg_type, -+ uint16_t msg_flags) - { - assert(ssh); - assert(nlh); -@@ -849,14 +850,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr -+ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header - * @type: type of new attribute - * @data: content of new attribute - */ --int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) -+int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) - { - assert(n); - assert(maxlen > 0); -@@ -866,7 +867,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - } - - /** -- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr -+ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -875,7 +876,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - * - */ - int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -885,7 +886,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr -+ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -894,7 +895,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(n); - assert(maxlen > 0); -@@ -904,7 +905,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - } - - /** -- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr -+ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -913,7 +914,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - * - */ - int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -923,7 +924,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr -+ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -932,7 +933,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(n); - assert(maxlen > 0); -@@ -980,7 +981,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) - * - */ - void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, unsigned char *val) -+ uint16_t type, uint32_t len, unsigned char *val) - { - assert(iov); - assert(nfa); -@@ -1115,7 +1116,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, - * appropiately. - */ - int nfnl_callback_register(struct nfnl_subsys_handle *ssh, -- u_int8_t type, struct nfnl_callback *cb) -+ uint8_t type, struct nfnl_callback *cb) - { - assert(ssh); - assert(cb); -@@ -1138,7 +1139,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, - * On sucess, 0 is returned. On error, -1 is returned and errno is - * set appropiately. - */ --int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) -+int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) - { - assert(ssh); - -@@ -1161,8 +1162,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, - assert(nfa); - - int min_len; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - const struct nfnl_subsys_handle *ssh; - struct nfnl_callback *cb; - -@@ -1212,8 +1213,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, - int len) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - int err = 0; - - if (subsys_id > NFNL_MAX_SUBSYS) -@@ -1243,7 +1244,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) - { - - while (len >= NLMSG_SPACE(0)) { -- u_int32_t rlen; -+ uint32_t rlen; - struct nlmsghdr *nlh = (struct nlmsghdr *)buf; - - if (nlh->nlmsg_len < sizeof(struct nlmsghdr) -@@ -1285,8 +1286,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) - static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - - /* Is this an error message? */ - if (nfnl_is_error(h, nlh)) { -diff --git a/src/rtnl.c b/src/rtnl.c -index 7b4ac7d..34802fe 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -11,6 +11,7 @@ - /* rtnetlink - routing table netlink interface */ - - #include <unistd.h> -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #include <errno.h> -@@ -30,7 +31,7 @@ - #define rtnl_log(x, ...) - - static inline struct rtnl_handler * --find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) -+find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) - { - struct rtnl_handler *h; - for (h = rtnl_handle->handlers; h; h = h->next) { -@@ -41,7 +42,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) - } - - static int call_handler(struct rtnl_handle *rtnl_handle, -- u_int16_t type, -+ uint16_t type, - struct nlmsghdr *hdr) - { - struct rtnl_handler *h = find_handler(rtnl_handle, type); -diff --git a/src/rtnl.h b/src/rtnl.h -index 0c403dc..9858ae5 100644 ---- a/src/rtnl.h -+++ b/src/rtnl.h -@@ -1,13 +1,14 @@ - #ifndef _RTNL_H - #define _RTNL_H - -+#include <stdint.h> - #include <linux/types.h> - #include <linux/rtnetlink.h> - - struct rtnl_handler { - struct rtnl_handler *next; - -- u_int16_t nlmsg_type; -+ uint16_t nlmsg_type; - int (*handlefn)(struct nlmsghdr *h, void *arg); - void *arg; - }; diff --git a/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix b/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix index b22722d3439e..3b6b804a8dc6 100644 --- a/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix @@ -2,17 +2,13 @@ stdenv.mkDerivation rec { pname = "libnfnetlink"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${version}.tar.bz2"; - sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; + sha256 = "0xn3rcrzxr6g82kfxzs9bqn2zvl2kf2yda30drwb9vr6sk1wfr5h"; }; - patches = [ - ./Use-stdlib-uint-instead-of-u_int.patch - ]; - meta = { description = "Low-level library for netfilter related kernel/userspace communication"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/libnfs/default.nix b/nixpkgs/pkgs/development/libraries/libnfs/default.nix index dd442b2cd4bd..cbfc06bc81c5 100644 --- a/nixpkgs/pkgs/development/libraries/libnfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnfs"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; rev = "libnfs-${version}"; - sha256 = "sha256-5jyY7hqEhBPiQ8pNd+mRTEc4brht4ID7PoV7O2RFNQA="; + sha256 = "sha256-rdxi5bPXHTICZQIj/CmHgZ/V70svnITJj/OSF4mmC3o="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix index 2c351181ee22..e136fc1a5585 100644 --- a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "0z4khm2mnys9mcl8ckwf19cw20jgrv8650nfncy3xcgs2k2aa23m"; + hash = "sha256-nvwAT50VkY1o+emOGU1V4DAWjzO7Z8PnpUW3QMntbQo="; }; nativeBuildInputs = [ pkg-config ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; - homepage = "http://netfilter.org/projects/libnftnl"; + homepage = "https://netfilter.org/projects/libnftnl/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ajs124 ]; diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix index 2f8aab830da0..461bcbe025ed 100644 --- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "34"; + version = "37"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; + sha256 = "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv"; }; nativeBuildInputs = [ flex bison ]; diff --git a/nixpkgs/pkgs/development/libraries/libnih/default.nix b/nixpkgs/pkgs/development/libraries/libnih/default.nix deleted file mode 100644 index fbe01bf4062d..000000000000 --- a/nixpkgs/pkgs/development/libraries/libnih/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, dbus, expat }: - -let version = "1.0.3"; in - -stdenv.mkDerivation { - pname = "libnih"; - inherit version; - - src = fetchurl { - url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; - sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus expat ]; - - doCheck = false; # fails 1 of 17 test - - meta = { - description = "A small library for C application development"; - homepage = "https://launchpad.net/libnih"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/nixpkgs/pkgs/development/libraries/libnotify/default.nix index d3b857d76739..f1034781fb44 100644 --- a/nixpkgs/pkgs/development/libraries/libnotify/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnotify/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.7.9"; + version = "0.8.1"; outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"; + sha256 = "0DPm1NbMv0akNsMWKKS2YbNtyh9dQXT+AXPidPTmJVc="; }; mesonFlags = [ @@ -61,10 +61,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libnotify"; description = "A library that sends desktop notifications to a notification daemon"; - platforms = platforms.unix; - maintainers = teams.gnome.members; + homepage = "https://gitlab.gnome.org/GNOME/libnotify"; license = licenses.lgpl21; + maintainers = teams.gnome.members; + mainProgram = "notify-send"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index a1dd23357dec..7564e87cdc25 100644 --- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU="; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; nativeBuildInputs = [ pkg-config @@ -79,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://libosinfo.org/"; changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libosmscout/default.nix b/nixpkgs/pkgs/development/libraries/libosmscout/default.nix index 2f83963d205f..76a1ba534b71 100644 --- a/nixpkgs/pkgs/development/libraries/libosmscout/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosmscout/default.nix @@ -1,18 +1,21 @@ -{ lib, mkDerivation, fetchgit, cmake, pkg-config -, marisa, qtlocation }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +, marisa, qttools, qtlocation }: mkDerivation rec { pname = "libosmscout"; - version = "2017.06.30"; + version = "2022.04.25"; - src = fetchgit { - url = "git://git.code.sf.net/p/libosmscout/code"; - rev = "0c0fde4d9803539c99911389bc918377a93f350c"; - sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; + src = fetchFromGitHub { + owner = "Framstag"; + repo = "libosmscout"; + rev = "4c3b28472864b8e9cdda80a05ec73ef22cb39323"; + sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g="; }; + cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ marisa qtlocation ]; + buildInputs = [ marisa qttools qtlocation ]; meta = with lib; { description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; diff --git a/nixpkgs/pkgs/development/libraries/libotr/default.nix b/nixpkgs/pkgs/development/libraries/libotr/default.nix index bd8a521544c2..a9c1d2008af3 100644 --- a/nixpkgs/pkgs/development/libraries/libotr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libotr/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; + patches = [ ./fix-regtest-client.patch ]; + outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libotr/fix-regtest-client.patch b/nixpkgs/pkgs/development/libraries/libotr/fix-regtest-client.patch new file mode 100644 index 000000000000..bfd0007b9616 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libotr/fix-regtest-client.patch @@ -0,0 +1,11 @@ +diff -Nur a/tests/regression/client/client.c b/tests/regression/client/client.c +--- a/tests/regression/client/client.c 2015-12-25 17:39:45.000000000 +0000 ++++ b/tests/regression/client/client.c 2022-03-29 19:33:18.646398117 +0100 +@@ -27,6 +27,7 @@ + #include <syscall.h> + #include <sys/epoll.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/un.h> + #include <unistd.h> + diff --git a/nixpkgs/pkgs/development/libraries/libowfat/default.nix b/nixpkgs/pkgs/development/libraries/libowfat/default.nix index 9db1354677d6..665121b58b5c 100644 --- a/nixpkgs/pkgs/development/libraries/libowfat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libowfat/default.nix @@ -17,5 +17,8 @@ stdenv.mkDerivation rec { homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; + # Doesn't build with glibc 2.34: https://hydra.nixos.org/build/156248131 + # Should be fixed with the next release: https://bugs.gentoo.org/806505 + broken = true; }; } diff --git a/nixpkgs/pkgs/development/libraries/libp11/default.nix b/nixpkgs/pkgs/development/libraries/libp11/default.nix index eb577a7f5a17..70a433ddc280 100644 --- a/nixpkgs/pkgs/development/libraries/libp11/default.nix +++ b/nixpkgs/pkgs/development/libraries/libp11/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libp11"; - version = "0.4.11"; + version = "0.4.12"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = "${pname}-${version}"; - sha256 = "0hcl706i04nw5c1sj7l6sj6m0yjq6qijz345v498jll58fp5wif8"; + sha256 = "sha256-Xqjl12xT30ZXWYzPWNN3jWY9pxojhd7Kq0OC7rABt4M="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix b/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix index 7d026eb5a091..10d5c98b6687 100644 --- a/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wrapper for testing PAM modules"; homepage = "https://cwrap.org/pam_wrapper.html"; license = licenses.gpl3Plus; - maintainers = [ maintainers.elyhaka ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix index ba554065cfc7..f7736b380fd6 100644 --- a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.1.0"; + version = "13-2.1.2"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "sha256-DpvPmBvpx5pWDlx6T3Kp82ALi6FjOO549Exd8tWXDIk="; + sha256 = "sha256-Y0oIcpZ0CPbFvyTC6YrSjcs14jk/K5pIyJjTo5vV5sQ="; }; nativeBuildInputs = [ which ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "C library for accessing the PostgreSQL parser outside of the server environment"; changelog = "https://github.com/pganalyze/libpg_query/raw/${version}/CHANGELOG.md"; license = licenses.bsd3; - platforms = platforms.x86_64; + platforms = platforms.unix; maintainers = [ maintainers.marsam ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix index 4f6b2ed00506..2247c3b9406f 100644 --- a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "libpinyin"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "libpinyin"; repo = "libpinyin"; rev = version; - sha256 = "0izisma5g9a7mxfxs177pi1d7v9dklm0ar4z404nf2s8x4wcg3ib"; + sha256 = "sha256-hafetjKWqImg3Jr1tSXjY0RwbBQ7LccXqx0OdtKCy/c="; }; postUnpack = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; - homepage = "https://sourceforge.net/projects/libpinyin"; + homepage = "https://github.com/libpinyin/libpinyin"; license = licenses.gpl3Plus; maintainers = with maintainers; [ linsui ericsagnes ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 94492132b9bf..73d97a476559 100644 --- a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "4.192.1"; + version = "4.208.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "13z2f0vwf9fgfzqgkqzvqwa8c8nkymrg5hv7xslfx53dacjfidhy"; + sha256 = "161dp5781s74ca3gglaxlmchx7glyshf0wg43w98pl22n1jcm5qk"; }; nativeBuildInputs = [ @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" "-Ddemos=false" # Don't build and install the demo programs "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer + ] ++ lib.optionals stdenv.isDarwin [ + "-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind` ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/nixpkgs/pkgs/development/libraries/libplctag/default.nix index 2af3b3f3bcf7..d391797659ea 100644 --- a/nixpkgs/pkgs/development/libraries/libplctag/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-Xzdljx08aXwD6pE1f/3YBAjvrSzvs2fcXmmLH04GFyg="; + sha256 = "sha256-ZD7mf6O1iBGmZ2bRWfnM0WPuP1itIi9TxZ5rK4uvBTw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix index cac4299f2890..23b1fabce78b 100644 --- a/nixpkgs/pkgs/development/libraries/libplist/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix @@ -1,34 +1,46 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python ? null, glib }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config + +, enablePython ? false +, python3 +}: stdenv.mkDerivation rec { pname = "libplist"; - version = "2.2.0"; + version = "2.2.0+date=2022-04-05"; + + outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "1vxhpjxniybqsg5wcygmdmr5dv7p2zb34dqnd3bi813rnnzsdjm6"; + rev = "db93bae96d64140230ad050061632531644c46ad"; + hash = "sha256-8e/PFDhsyrOgmI3vLT1YhcROmbJgArDAJSe8Z2bZafo="; }; - outputs = ["bin" "dev" "out" ] ++ lib.optional enablePython "py"; + postPatch = '' + echo '${version}' > .tarball-version + ''; nativeBuildInputs = [ - pkg-config autoreconfHook - ] ++ lib.optionals enablePython [ - python - python.pkgs.cython + pkg-config + ]; + + buildInputs = lib.optionals enablePython [ + python3 + python3.pkgs.cython ]; configureFlags = lib.optionals (!enablePython) [ "--without-cython" ]; - propagatedBuildInputs = [ glib ]; - postFixup = lib.optionalString enablePython '' - moveToOutput "lib/${python.libPrefix}" "$py" + moveToOutput "lib/${python3.libPrefix}" "$py" ''; meta = with lib; { @@ -36,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ infinisil ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix index 31fb5cb05ba7..01c3e3e87e43 100644 --- a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export LD_LIBRARY_PATH=$PWD ./utest/utest --path ../examples/data/ ''; diff --git a/nixpkgs/pkgs/development/libraries/libportal/default.nix b/nixpkgs/pkgs/development/libraries/libportal/default.nix index cb0da5c560d2..93ca52c243c6 100644 --- a/nixpkgs/pkgs/development/libraries/libportal/default.nix +++ b/nixpkgs/pkgs/development/libraries/libportal/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; }; + # TODO: remove on 0.7 + patches = [ + # https://github.com/flatpak/libportal/pull/107 + (fetchpatch { + name = "check-presence-of-sys-vfs-h.patch"; + url = "https://github.com/flatpak/libportal/commit/e91a5d2ceb494ca0dd67295736e671b0142c7540.patch"; + sha256 = "sha256-uFyhlU2fJgW4z0I31fABdc+pimLFYkqM4lggSIFs1tw="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -65,6 +76,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flatpak/libportal"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpostal/default.nix b/nixpkgs/pkgs/development/libraries/libpostal/default.nix index d32cb2731a11..30c7af9ccc56 100644 --- a/nixpkgs/pkgs/development/libraries/libpostal/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpostal/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openvenues/libpostal"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; + mainProgram = "libpostal_data"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpqxx/6.nix b/nixpkgs/pkgs/development/libraries/libpqxx/6.nix index feb9c7e65147..c9e55fd9c019 100644 --- a/nixpkgs/pkgs/development/libraries/libpqxx/6.nix +++ b/nixpkgs/pkgs/development/libraries/libpqxx/6.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python2, gnused }: +{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python3, gnused }: stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.4.5"; + version = "6.4.8"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "0djmjr2b5x5nd2a4idv5j8s6w0kdmvil910iv1kyc7x94dirbrni"; + hash = "sha256-ybnW9ip1QVadmbYLP+gvo49k9ExHfnsOhSnI6NjsAQk="; }; - nativeBuildInputs = [ gnused python2 ]; + nativeBuildInputs = [ gnused python3 ]; buildInputs = [ postgresql doxygen xmlto ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index d7eba4c87396..d0116a742d26 100644 --- a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, python3, gnused }: +{ lib, stdenv, fetchFromGitHub, postgresql, python3 }: stdenv.mkDerivation rec { pname = "libpqxx"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-O30czHwEDXz5xY4o3MWhmEK06OKTKMQCy0M6qwSEpy8="; }; - nativeBuildInputs = [ gnused python3 ]; + nativeBuildInputs = [ python3 ]; buildInputs = [ postgresql ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix index f6bf1e81668d..62ddcd673900 100644 --- a/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , pkg-config , cmake , zlib , dbus , networkmanager -, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_78 -, spidermonkey_78 +, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform duktape +, duktape , pcre , gsettings-desktop-schemas , glib @@ -19,15 +21,23 @@ stdenv.mkDerivation rec { pname = "libproxy"; - version = "0.4.17"; + version = "0.4.18"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r"; + hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ="; }; + patches = lib.optionals stdenv.isDarwin [ + # https://github.com/libproxy/libproxy/pull/189 + (fetchpatch { + url = "https://github.com/libproxy/libproxy/commit/4331b9db427ce2c25ff5eeb597bec4bc35ed1a0b.patch"; + sha256 = "sha256-uTh3rYVvEke1iWVHsT3Zj2H1F+gyLrffcmyt0JEKaCA="; + }) + ]; + outputs = [ "out" "dev" "py3" ]; nativeBuildInputs = [ @@ -41,7 +51,7 @@ stdenv.mkDerivation rec { python3 zlib ] ++ lib.optionals enableJavaScript [ - (if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_78) + (if stdenv.hostPlatform.isDarwin then JavaScriptCore else duktape) ] ++ (if stdenv.hostPlatform.isDarwin then [ SystemConfiguration CoreFoundation diff --git a/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/nixpkgs/pkgs/development/libraries/libpsl/default.nix index 0a710d648fbf..fc85f5375918 100644 --- a/nixpkgs/pkgs/development/libraries/libpsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpsl/default.nix @@ -85,7 +85,8 @@ in stdenv.mkDerivation rec { homepage = "https://rockdaboot.github.io/libpsl/"; changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.c0bw3b ]; + mainProgram = "psl"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpulsar/default.nix b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix index 9abe32241207..3ad5c16d352d 100644 --- a/nixpkgs/pkgs/development/libraries/libpulsar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix @@ -51,10 +51,10 @@ let in stdenv.mkDerivation rec { pname = "libpulsar"; - version = "2.9.1"; + version = "2.10.1"; src = fetchurl { - hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug=="; + hash = "sha256-qMj76jnxRH68DE6JkZjQrLSNzgXGnO7HjPjlaFavaUY="; url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; }; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 55132d155238..da3bc925c820 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -1,21 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen, - autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: +{ lib, stdenv, fetchFromGitHub +, mpfr, gnuplot +, readline +, libxml2, curl +, intltool, libiconv, icu, gettext +, pkg-config, doxygen, autoreconfHook, buildPackages +}: stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-P3mb5HEj9gHq2mABdIRxF6ZukrPd70sy0DRLT0qKDqk="; + sha256 = "sha256-mIzHizoDsdSVcepWACeVkCTgt4gxd99WKXrrGi+qASo="; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; propagatedBuildInputs = [ libxml2 mpfr icu ]; enableParallelBuilding = true; @@ -41,8 +47,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced calculator library"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner doronbehar ]; + mainProgram = "qalc"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 0906d7b967c9..b261967f5cf2 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.30.4"; + version = "1.30.8"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-ANfaMKT40RhfN8uiic+vHfzQSljy921qz99bhTEtbtY="; + sha256 = "sha256-hiSCzp460L1l0mQzTuMRzblLnfKGO1txNjCbQbisGZA="; }; nativeBuildInputs = [ @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-gtk-doc" - "--enable-introspection" + "--enable-gtk-doc=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}" + "--enable-introspection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix b/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix index 29097710a697..6e01cda91625 100644 --- a/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix @@ -1,6 +1,9 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, meson +, mesonEmulatorHook +, ninja , pkg-config , gobject-introspection , gtk-doc @@ -11,31 +14,41 @@ stdenv.mkDerivation rec { pname = "libqrtr-glib"; - version = "1.0.0"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libqrtr-glib"; + rev = version; + sha256 = "kHLrOXN6wgBrHqipo2KfAM5YejS0/bp7ziBSpt0s1i0="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + meson + ninja pkg-config gobject-introspection gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection glib ]; - configureFlags = [ - "--enable-gtk-doc" - ]; - meta = with lib; { homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"; description = "Qualcomm IPC Router protocol helper library"; diff --git a/nixpkgs/pkgs/development/libraries/libqtav/default.nix b/nixpkgs/pkgs/development/libraries/libqtav/default.nix index 090291a120f7..c2d91b1d5b73 100644 --- a/nixpkgs/pkgs/development/libraries/libqtav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqtav/default.nix @@ -52,6 +52,11 @@ mkDerivation rec { # the other libraries as `libGL` is part of our `buildInputs`. NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + preFixup = '' mkdir -p "$out/bin" cp -a "./bin/"* "$out/bin" diff --git a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index 2a5b75a7b906..b7e528301e8f 100644 --- a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2021-10-25"; + version = "unstable-2022-03-23"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b"; - sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU="; + rev = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e"; + hash = "sha256-sAfpfq7C9HXVS7ym3UFIO6bpEIWFCOfVCSN2n5q1RNg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix index 3ff7e725f3d8..758b00febf5f 100644 --- a/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libraw"; - version = "0.20.2"; + version = "0.20.2.p2"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; - rev = version; - sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; + rev = "fedad11e87daad7b7d389a3ef84ccf10b5e84710"; # current 0.20-stable branch + sha256 = "1mklf8lzybzyg75ja34822xlv6h9nw93griyrjjna7darl1dyvja"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libraw/unstable.nix b/nixpkgs/pkgs/development/libraries/libraw/unstable.nix new file mode 100644 index 000000000000..3f19bb53c4e6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libraw/unstable.nix @@ -0,0 +1,12 @@ +{ libraw, fetchFromGitHub }: + +libraw.overrideAttrs (_: rec { + version = "unstable-2021-12-03"; + + src = fetchFromGitHub { + owner = "LibRaw"; + repo = "LibRaw"; + rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; + sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix index 656558146857..b085e080803b 100644 --- a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix +++ b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix @@ -1,26 +1,45 @@ -{ lib, stdenv, fetchurl, libxml2, libxslt }: +{ lib +, stdenv +, libxml2 +, libxslt +, pkg-config +, cmake +, fetchFromGitHub +, perl +, bison +, flex +, fetchpatch +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "raptor2"; - version = "2.0.15"; + version = "unstable-2022-06-06"; - src = fetchurl { - url = "http://download.librdf.org/source/${pname}-${version}.tar.gz"; - sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; + src = fetchFromGitHub { + owner = "dajobe"; + repo = "raptor"; + rev = "3cca62a33da68143b687c9e486eefc7c7cbb4586"; + sha256 = "sha256-h03IyFH1GHPqajfHBBTb19lCEu+VXzQLGC1wiEGVvgY="; }; + cmakeFlags = [ + # Build defaults to static libraries. + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ]; + patches = [ - (fetchurl { - name = "CVE-2017-18926.patch"; - url = "https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch"; - sha256 = "1qlpb5rm3j2yi0x6zgdi5apymg5zlvwq3g1zl417gkjrlvxmndgp"; + # https://github.com/dajobe/raptor/pull/52 + (fetchpatch { + name = "fix-cmake-generated-pc-file"; + url = "https://github.com/dajobe/raptor/commit/fa1ef9a27d8762f5588ac2e92554a188e73dee9f.diff"; + sha256 = "sha256-zXIbrYGgC9oTpiD0WUikT4vRdc9b6bsyfnDkwUSlqao="; }) ]; + nativeBuildInputs = [ pkg-config cmake perl bison flex ]; buildInputs = [ libxml2 libxslt ]; - postInstall = "rm -rvf $out/share/gtk-doc"; - meta = { description = "The RDF Parser Toolkit"; homepage = "https://librdf.org/raptor"; diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 0011dc2f6e11..135969210d36 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -8,11 +8,17 @@ , ninja , pkg-config , gcc -, cudaSupport ? config.cudaSupport or false, cudatoolkit +, mesa +, gtk3 +, glfw +, libGLU +, curl +, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} , enablePython ? false, pythonPackages ? null +, enableGUI ? false, }: -assert cudaSupport -> cudatoolkit != null; +assert cudaSupport -> (cudaPackages?cudatoolkit && cudaPackages.cudatoolkit != null); assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { @@ -31,8 +37,9 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 gcc.cc.lib - ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); + ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optionals enablePython (with pythonPackages; [ python pybind11 ]) + ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; patches = [ # fix build on aarch64-darwin @@ -53,8 +60,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" - "-DBUILD_GRAPHICAL_EXAMPLES=OFF" - "-DBUILD_GLSL_EXTENSIONS=OFF" + "-DBUILD_GRAPHICAL_EXAMPLES=${lib.boolToString enableGUI}" + "-DBUILD_GLSL_EXTENSIONS=${lib.boolToString enableGUI}" + "-DCHECK_FOR_UPDATES=OFF" # activated by BUILD_GRAPHICAL_EXAMPLES, will make it download and compile libcurl ] ++ lib.optionals enablePython [ "-DBUILD_PYTHON_BINDINGS:bool=true" "-DXXNIX_PYTHON_SITEPACKAGES=${placeholder "out"}/${pythonPackages.python.sitePackages}" @@ -72,7 +80,7 @@ stdenv.mkDerivation rec { description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; - maintainers = with maintainers; [ brian-dawn ]; + maintainers = with maintainers; [ brian-dawn pbsds ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 53aab4431088..4a7a125d3ee1 100644 --- a/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { checkInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Free implementation of the DWG file format"; homepage = "https://savannah.gnu.org/projects/libredwg/"; maintainers = with maintainers; [ tweber ]; diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix index 1ad63db733df..82974fe07283 100644 --- a/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -12,13 +12,13 @@ let then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec { + generic = { version, hash, patches ? [] }: stdenv.mkDerivation rec { pname = "libressl"; inherit version; src = fetchurl { url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ cmake ]; @@ -71,11 +71,9 @@ let moveToOutput "bin/nc" "$nc" moveToOutput "bin/openssl" "$bin" moveToOutput "bin/ocspcheck" "$bin" - moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc" + moveToOutput "share/man/man1/nc.1.gz" "$nc" ''; - dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://www.libressl.org"; @@ -88,6 +86,20 @@ let in { libressl_3_4 = generic { version = "3.4.3"; - sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; + hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; + }; + + libressl_3_5 = generic { + version = "3.5.3"; + hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg="; + + patches = [ + # Fix endianness detection on aarch64-darwin, issue #181187 + (fetchpatch { + name = "fix-endian-header-detection.patch"; + url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch"; + sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE="; + }) + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libressl/fix-build-with-glibc.patch b/nixpkgs/pkgs/development/libraries/libressl/fix-build-with-glibc.patch new file mode 100644 index 000000000000..db482bcb35da --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libressl/fix-build-with-glibc.patch @@ -0,0 +1,92 @@ +diff --git a/tests/explicit_bzero.c b/tests/explicit_bzero.c +index 34c60baa8a..9c0e917829 100644 +--- a/tests/explicit_bzero.c ++++ b/tests/explicit_bzero.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: explicit_bzero.c,v 1.6 2014/07/11 01:10:35 matthew Exp $ */ ++/* $OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $ */ + /* + * Copyright (c) 2014 Google Inc. + * +@@ -18,6 +18,7 @@ + #include <assert.h> + #include <errno.h> + #include <signal.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + +@@ -36,19 +37,33 @@ enum { + SECRETBYTES = SECRETCOUNT * sizeof(secret) + }; + +-static char altstack[SIGSTKSZ + SECRETBYTES]; ++/* ++ * As of glibc 2.34, when _GNU_SOURCE is defined, SIGSTKSZ is no longer ++ * constant on Linux. SIGSTKSZ is redefined to sysconf (_SC_SIGSTKSZ). ++ */ ++static char *altstack; ++#define ALTSTACK_SIZE (SIGSTKSZ + SECRETBYTES) + + static void + setup_stack(void) + { ++ altstack = calloc(1, ALTSTACK_SIZE); ++ ASSERT_NE(NULL, altstack); ++ + const stack_t sigstk = { + .ss_sp = altstack, +- .ss_size = sizeof(altstack), ++ .ss_size = ALTSTACK_SIZE + }; + + ASSERT_EQ(0, sigaltstack(&sigstk, NULL)); + } + ++static void ++cleanup_stack(void) ++{ ++ free(altstack); ++} ++ + static void + assert_on_stack(void) + { +@@ -129,7 +144,7 @@ test_without_bzero() + char buf[SECRETBYTES]; + assert_on_stack(); + populate_secret(buf, sizeof(buf)); +- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); ++ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); + ASSERT_NE(NULL, res); + return (res); + } +@@ -140,7 +155,7 @@ test_with_bzero() + char buf[SECRETBYTES]; + assert_on_stack(); + populate_secret(buf, sizeof(buf)); +- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); ++ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); + ASSERT_NE(NULL, res); + explicit_bzero(buf, sizeof(buf)); + return (res); +@@ -183,15 +198,17 @@ main() + * on the stack. This sanity checks that call_on_stack() and + * populate_secret() work as intended. + */ +- memset(altstack, 0, sizeof(altstack)); ++ memset(altstack, 0, ALTSTACK_SIZE); + call_on_stack(do_test_without_bzero); + + /* + * Now test with a call to explicit_bzero() and check that we + * *don't* find any instances of the secret data. + */ +- memset(altstack, 0, sizeof(altstack)); ++ memset(altstack, 0, ALTSTACK_SIZE); + call_on_stack(do_test_with_bzero); + ++ cleanup_stack(); ++ + return (0); + } diff --git a/nixpkgs/pkgs/development/libraries/librest/1.0.nix b/nixpkgs/pkgs/development/libraries/librest/1.0.nix index d51f9e31b178..30482a510274 100644 --- a/nixpkgs/pkgs/development/libraries/librest/1.0.nix +++ b/nixpkgs/pkgs/development/libraries/librest/1.0.nix @@ -7,20 +7,21 @@ , gi-docgen , glib , json-glib -, libsoup +, libsoup_3 +, libxml2 , gobject-introspection , gnome }: stdenv.mkDerivation rec { pname = "rest"; - version = "0.9.0"; + version = "0.9.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hbK8k0ESgTlTm1PuU/BTMxC8ljkv1kWGOgQEELgevmY="; + sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM="; }; nativeBuildInputs = [ @@ -34,7 +35,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib json-glib - libsoup + libsoup_3 + libxml2 ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libroxml/default.nix b/nixpkgs/pkgs/development/libraries/libroxml/default.nix index 71d78a8b8e59..647e4c188a05 100644 --- a/nixpkgs/pkgs/development/libraries/libroxml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libroxml/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; + homepage = "https://www.libroxml.net/"; license = licenses.lgpl3; - platforms = platforms.unix; maintainers = with maintainers; [ mpickering ]; + mainProgram = "roxml"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/librseq/default.nix b/nixpkgs/pkgs/development/libraries/librseq/default.nix index 82e6c54bb2c8..890c0dd25ff2 100644 --- a/nixpkgs/pkgs/development/libraries/librseq/default.nix +++ b/nixpkgs/pkgs/development/libraries/librseq/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "librseq"; - version = "0.1.0pre70_${builtins.substring 0 7 src.rev}"; + version = "0.1.0pre71_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "compudj"; repo = "librseq"; - rev = "d1cdec98d476b16ca5e2d9d7eabcf9f1c97e6111"; - sha256 = "0vgillrxc1knq591gjj99x2ws6q1xpm5dmfrhsxisngfpcnjr10v"; + rev = "170f840b498e1aff068b90188727a656111bfc2f"; + sha256 = "0rdx59y8y9x8cfmmx5gl66gibkzpk3kw5lrrqhrxan8zr37a055y"; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index b09354413841..91e0033cd274 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -17,7 +17,7 @@ , rust , cargo , gi-docgen -, python3 +, python3Packages , gnome , vala , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.54.0"; + version = "2.54.4"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "uvjrwUfxRrQmG7PQzQ+slEv427Sx8jR9IzQfl03MMIU="; + sha256 = "6hUqJD9qQ8DgNqKMcN4/y83qVmTGgRx4WSvCKezCSDM="; }; cargoVendorDir = "vendor"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pkg-config rustc cargo - python3.pkgs.docutils + python3Packages.docutils vala rustPlatform.cargoSetupHook ] ++ lib.optionals withIntrospection [ @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache ''; - postFixup = '' + postFixup = lib.optionalString withIntrospection '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" ''; @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; + mainProgram = "rsvg-convert"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/librsync/default.nix b/nixpkgs/pkgs/development/libraries/librsync/default.nix index a0248e774b7d..0594e9e6e20b 100644 --- a/nixpkgs/pkgs/development/libraries/librsync/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsync/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with lib; { + description = "Implementation of the rsync remote-delta algorithm"; homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; - description = "Implementation of the rsync remote-delta algorithm"; + mainProgram = "rdiff"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libsass/default.nix b/nixpkgs/pkgs/development/libraries/libsass/default.nix index 83df5161a8ef..f4293952b9f4 100644 --- a/nixpkgs/pkgs/development/libraries/libsass/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsass/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. - extraPostFetch = '' + postFetch = '' rm -r $out/test/e2e/unicode-pwd ''; }; diff --git a/nixpkgs/pkgs/development/libraries/libschrift/default.nix b/nixpkgs/pkgs/development/libraries/libschrift/default.nix index d8093a58deec..443550e8a0a1 100644 --- a/nixpkgs/pkgs/development/libraries/libschrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/libschrift/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libschrift"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "tomolt"; repo = pname; rev = "v" + version; - sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv"; + sha256 = "01hgvkcb46kr9jzc4ah0js0jy9kr0ll18j2k0c5zil55l3a9rqw1"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libsciter/default.nix b/nixpkgs/pkgs/development/libraries/libsciter/default.nix index 6f3016ce47a4..034ccc4208f8 100644 --- a/nixpkgs/pkgs/development/libraries/libsciter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsciter/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { description = "Embeddable HTML/CSS/JavaScript engine for modern UI development"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ leixb ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; }; } diff --git a/nixpkgs/pkgs/development/libraries/libscrypt/default.nix b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix index 68ef1afd2eef..6adc2124a3ab 100644 --- a/nixpkgs/pkgs/development/libraries/libscrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE="; }; - buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; + buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= LDFLAGS_EXTRA= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; installTargets = lib.optional stdenv.isDarwin "install-osx"; diff --git a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index d0e8bd163ddd..7cea80696a92 100644 --- a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, getopt, util-linux, gperf, nix-update-script }: +{ lib, stdenv, fetchurl, getopt, util-linuxMinimal, which, gperf, nix-update-script }: stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "sha256-WQZchzM2RyXpchukjDqZu8Uq+SHa9I30seAS+8exCnY="; + sha256 = "sha256-2CkCQAQFzwBoV07z3B/l9ZJiB1Q7oa5vjnoVdjUdy9s="; }; outputs = [ "out" "lib" "dev" "man" "pythonsrc" ]; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - checkInputs = [ util-linux ]; - doCheck = false; # dependency cycle + checkInputs = [ util-linuxMinimal which ]; + doCheck = true; # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rfv src"; diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 9e8be02aa63a..24a34a92f3c1 100644 --- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -18,7 +18,6 @@ , gjs , libintl , dbus -, xvfb-run }: stdenv.mkDerivation rec { @@ -32,6 +31,10 @@ stdenv.mkDerivation rec { sha256 = "P7PONA/NfbVNh8iT5pv8Kx9uTUsnkGX/5m2snw/RK00="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -49,33 +52,50 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt + gobject-introspection ]; propagatedBuildInputs = [ glib ]; - installCheckInputs = [ + checkInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 - xvfb-run dbus gjs ]; - # needs to run after install because typelibs point to absolute paths - doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib + doCheck = stdenv.isLinux; postPatch = '' - patchShebangs . + patchShebangs ./tool/test-*.sh + ''; + + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overwitten during installation. + mkdir -p $out/lib $out/lib + ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so" + ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0" ''; - installCheckPhase = '' - export NO_AT_BRIDGE=1 - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + checkPhase = '' + runHook preCheck + + dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check + meson test --print-errorlogs + + runHook postCheck + ''; + + postCheck = '' + # This is test-only so it won’t be overwritten during installation. + rm "$out/lib/libmock-service.so" ''; postFixup = '' @@ -95,6 +115,7 @@ stdenv.mkDerivation rec { description = "A library for storing and retrieving passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/Libsecret"; license = lib.licenses.lgpl21Plus; + mainProgram = "secret-tool"; inherit (glib.meta) platforms maintainers; }; } diff --git a/nixpkgs/pkgs/development/libraries/libshout/default.nix b/nixpkgs/pkgs/development/libraries/libshout/default.nix index e231fb0ed6ee..400c9b25f78c 100644 --- a/nixpkgs/pkgs/development/libraries/libshout/default.nix +++ b/nixpkgs/pkgs/development/libraries/libshout/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libvorbis libtheora speex ]; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://www.icecast.org"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming ]; + mainProgram = "shout"; platforms = with lib.platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix index 8464ba36af32..2e8b788ecc25 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ m4]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; branch = "1.2"; diff --git a/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/nixpkgs/pkgs/development/libraries/libslirp/default.nix index f4eaa9c31993..06fb0d41b8bc 100644 --- a/nixpkgs/pkgs/development/libraries/libslirp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw="; + sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libsnark/default.nix b/nixpkgs/pkgs/development/libraries/libsnark/default.nix index 37352bf5e3c4..0eb0045fbe68 100644 --- a/nixpkgs/pkgs/development/libraries/libsnark/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsnark/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index dbe108f586f4..a319de5ce6b2 100644 --- a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libsndfile"; - version = "1.0.31"; + version = "1.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1alba3iv8i7i2jb5fd6q5s7j9bcj48sf28nfjd3qigz2n2is5jl2"; + sha256 = "sha256-bhIXVSKuUnUzs5aaLDHt21RcnqekEpLU414sFtl2Lro="; }; nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 2d50851e5832..7267b7d99b2f 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config +, zlib, xz, bzip2, zchunk, zstd +, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.21"; + version = "0.7.22"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0="; + sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE="; }; cmakeFlags = [ @@ -17,10 +19,15 @@ stdenv.mkDerivation rec { "-DENABLE_RPMDB=true" "-DENABLE_PUBKEY=true" "-DENABLE_RPMDB_BYRPMHEADER=true" + "-DENABLE_LZMA_COMPRESSION=true" + "-DENABLE_BZIP2_COMPRESSION=true" + "-DENABLE_ZSTD_COMPRESSION=true" + "-DENABLE_ZCHUNK_COMPRESSION=true" + "-DWITH_SYSTEM_ZCHUNK=true" ]; - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ zlib expat rpm db ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; + buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ]; meta = with lib; { description = "A free package dependency solver"; diff --git a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 4791e49ae3fa..2b1c6e68795f 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.0.5"; + version = "3.0.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9dFD22gws4Je3CocREnWOSc7C/oBeklwhxli2byiIUU="; + sha256 = "sha256-69+QzzWZwRrLtoGKnZ4/ydLGjlbrgpuTlilyaD4b98g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 83fb0c4a0292..9976f4109f0e 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -8,16 +8,13 @@ , pkg-config , gnome , libsysprof-capture -, gnomeSupport ? true -, sqlite -, glib-networking , gobject-introspection -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , vala -, withVala ? stdenv.buildPlatform == stdenv.hostPlatform , libpsl -, python3 , brotli +, gnomeSupport ? true +, sqlite +, glib-networking }: stdenv.mkDerivation rec { @@ -31,19 +28,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-8KQnZW5f4Z4d9xwQfojfobLmc8JcVHt4I7YBi0DQEVk="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config glib - ] ++ lib.optionals withIntrospection [ gobject-introspection - ] ++ lib.optionals withVala [ vala ]; buildInputs = [ - python3 + gobject-introspection sqlite libpsl glib.out @@ -60,8 +59,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" - "-Dvapi=${if withVala then "enabled" else "disabled"}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ @@ -73,6 +70,12 @@ stdenv.mkDerivation rec { doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) postPatch = '' + # fixes finding vapigen when cross-compiling + # the commit is in 3.0.6 + # https://gitlab.gnome.org/GNOME/libsoup/-/commit/5280e936d0a76f94dbc5d8489cfbdc0a06343f65 + substituteInPlace meson.build \ + --replace "required: vapi_opt)" "required: vapi_opt, native: false)" + patchShebangs libsoup/ ''; diff --git a/nixpkgs/pkgs/development/libraries/libspf2/default.nix b/nixpkgs/pkgs/development/libraries/libspf2/default.nix index c48c71e14485..203f2768e37b 100644 --- a/nixpkgs/pkgs/development/libraries/libspf2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: with lib; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx"; }; + patches = [ + # glibc-2.34 compat + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/dbb8a5c9f749cc11e61cfe558f164b165cbc30cb/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch"; + sha256 = "sha256-6JVVkVGCcFJsNeBdVTPcLhW4KoHLY4ai/KXDMliXgPA="; + }) + ]; + postPatch = '' # disable static bins compilation sed -i \ diff --git a/nixpkgs/pkgs/development/libraries/libspiro/default.nix b/nixpkgs/pkgs/development/libraries/libspiro/default.nix index 03bfe14d3bee..e45a2082247e 100644 --- a/nixpkgs/pkgs/development/libraries/libspiro/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspiro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20200505"; + version = "20220722"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; + sha256 = "sha256-qNff53wyf8YhFVOn169K7smCXrSxdiZWxWOU8VTcjSI="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/nixpkgs/pkgs/development/libraries/libspnav/default.nix index 99f2a64d7b12..f6908aa3314f 100644 --- a/nixpkgs/pkgs/development/libraries/libspnav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspnav/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--disable-debug"]; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; preInstall = '' mkdir -p $out/{lib,include} diff --git a/nixpkgs/pkgs/development/libraries/libspng/default.nix b/nixpkgs/pkgs/development/libraries/libspng/default.nix index 9a07cbf1aa1a..dba098b4468a 100644 --- a/nixpkgs/pkgs/development/libraries/libspng/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspng/default.nix @@ -49,8 +49,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple, modern libpng alternative"; - homepage = "https://github.com/randy408/libspng"; + homepage = "https://libspng.org/"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ humancalico ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libspotify/default.nix b/nixpkgs/pkgs/development/libraries/libspotify/default.nix deleted file mode 100644 index d9be4a2964f4..000000000000 --- a/nixpkgs/pkgs/development/libraries/libspotify/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib, stdenv, fetchurl, libspotify, alsa-lib, readline, pkg-config, apiKey ? null, unzip, gnused }: - -let - version = "12.1.51"; - isLinux = (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "i686-linux"); -in - -if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux") -then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here" -else stdenv.mkDerivation { - pname = "libspotify"; - inherit version; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz"; - sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchurl { - url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Darwin-universal.zip"; - sha256 = "1gcgrc8arim3hnszcc886lmcdb4iigc08abkaa02l6gng43ky1c0"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-i686-release.tar.gz"; - sha256 = "1bjmn64gbr4p9irq426yap4ipq9rb84zsyhjjr7frmmw22xb86ll"; - } - else - null; - - dontBuild = true; - - installPhase = if (isLinux) - then "installPhase" - else '' - mkdir -p "$out"/include/libspotify - mv -v libspotify.framework/Versions/Current/Headers/api.h \ - "$out"/include/libspotify - mkdir -p "$out"/lib - mv -v libspotify.framework/Versions/Current/libspotify \ - "$out"/lib/libspotify.dylib - mkdir -p "$out"/share/man - mv -v man3 "$out"/share/man - ''; - - - # darwin-specific - nativeBuildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; - - # linux-specific - installFlags = lib.optional isLinux - "prefix=$(out)"; - patchPhase = lib.optionalString isLinux - "${gnused}/bin/sed -i 's/ldconfig//' Makefile"; - postInstall = lib.optionalString isLinux - "mv -v share $out"; - - passthru = { - samples = if apiKey == null - then throw '' - Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly - '' else stdenv.mkDerivation { - pname = "libspotify-samples"; - inherit version; - src = libspotify.src; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libspotify readline ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib; - postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; - patchPhase = "cp ${apiKey} appkey.c"; - installPhase = '' - mkdir -p $out/bin - install -m 755 jukebox/jukebox $out/bin - install -m 755 spshell/spshell $out/bin - install -m 755 localfiles/posix_stu $out/bin - ''; - meta = libspotify.meta // { description = "Spotify API library samples"; }; - }; - - inherit apiKey; - }; - - meta = with lib; { - description = "Spotify API library"; - homepage = "https://developer.spotify.com/technologies/libspotify"; - maintainers = with maintainers; [ lovek323 ]; - license = licenses.unfree; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix b/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix deleted file mode 100644 index edba7a84ef2b..000000000000 --- a/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ libssh2, fetchurl }: - -libssh2.overrideAttrs (attrs: rec { - version = "1.10.0"; - src = fetchurl { - url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; - }; - patches = []; -}) diff --git a/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix index d6817550fe7b..1b5d65335b8d 100644 --- a/nixpkgs/pkgs/development/libraries/libssh2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; + patches = [ + # https://github.com/libssh2/libssh2/pull/700 + # openssl: add support for LibreSSL 3.5.x + ./openssl_add_support_for_libressl_3_5.patch + ]; + buildInputs = [ openssl zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; diff --git a/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch b/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch new file mode 100644 index 000000000000..d72a67a63403 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch @@ -0,0 +1,26 @@ +From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001 +From: Viktor Szakats <commit@vsz.me> +Date: Thu, 19 May 2022 13:25:06 +0000 +Subject: [PATCH] openssl: add support for LibreSSL 3.5.x + +LibreSSL 3.5.0 made more structures opaque, so let's enable existing +support for that when building against these LibreSSL versions. + +Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt +--- + src/openssl.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/openssl.h b/src/openssl.h +index 658b040..1733b9e 100644 +--- a/src/openssl.h ++++ b/src/openssl.h +@@ -58,7 +58,8 @@ + #include <openssl/rand.h> + + #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++ !defined(LIBRESSL_VERSION_NUMBER) || \ ++ LIBRESSL_VERSION_NUMBER >= 0x3050000fL + # define HAVE_OPAQUE_STRUCTS 1 + #endif diff --git a/nixpkgs/pkgs/development/libraries/libstroke/default.nix b/nixpkgs/pkgs/development/libraries/libstroke/default.nix index 697616f01f30..d40b5b6b0492 100644 --- a/nixpkgs/pkgs/development/libraries/libstroke/default.nix +++ b/nixpkgs/pkgs/development/libraries/libstroke/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; - buildInputs = [ automake autoconf xlibsWrapper ]; + nativeBuildInputs = [ automake autoconf ]; + buildInputs = [ xlibsWrapper ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. diff --git a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix index a98099cfaec2..49779f825009 100644 --- a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix +++ b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-xAqBxCYNo2IntnHKXY6CSJ+Yiu01lxQ1Q3gb0ioypSs="; + sha256 = "sha256-jT4VIqqUldCj3Rsb5MC74WXYQyTqOZxzFADf47TBV8c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libsurvive/default.nix b/nixpkgs/pkgs/development/libraries/libsurvive/default.nix index 5685cfdbb4d4..02c4ddffd78a 100644 --- a/nixpkgs/pkgs/development/libraries/libsurvive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsurvive/default.nix @@ -7,17 +7,20 @@ , libusb1 , blas , zlib +, eigen }: stdenv.mkDerivation rec { pname = "libsurvive"; - version = "0.4"; + version = "1.01"; src = fetchFromGitHub { owner = "cntools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-atX7QsCjKGa6OVSApnx3seBvZv/mlpV3jWRB9+v7Emc="; + # Fixes 'Unknown CMake command "cnkalman_generate_code"' + fetchSubmodules = true; + sha256 = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -28,6 +31,7 @@ stdenv.mkDerivation rec { libusb1 blas zlib + eigen ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix index 17ac533732f9..3525d057b97a 100644 --- a/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix @@ -1,19 +1,22 @@ -{lib, stdenv, fetchgit, gettext, python2, elfutils}: +{ lib, stdenv, fetchgit +, gettext +, python3 +, elfutils +}: stdenv.mkDerivation { pname = "libsystemtap"; - version = "3.2"; + version = "4.6"; src = fetchgit { url = "git://sourceware.org/git/systemtap.git"; - rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; - sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; - fetchSubmodules = false; + rev = "release-4.6"; + hash = "sha256-z7OUy0VGxK39aYCWFfvJnWk34Je0R+51kK5pGh7TzXM="; }; dontBuild = true; - nativeBuildInputs = [ gettext python2 elfutils ]; + nativeBuildInputs = [ gettext python3 elfutils ]; installPhase = '' mkdir -p $out/include diff --git a/nixpkgs/pkgs/development/libraries/libtermkey/default.nix b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix index 9779ad6b9e5f..a96baf0d9f3e 100644 --- a/nixpkgs/pkgs/development/libraries/libtermkey/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "libtermkey"; - version = "0.22"; src = fetchzip { @@ -10,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "02dks6bj7n23lj005yq41azf95wh3hapmgc2lzyh12vigkjh67rg"; }; - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + makeFlags = [ "PREFIX=$(out)" "LIBTOOL=${libtool}/bin/libtool" ]; nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ ncurses unibilium ]; + strictDeps = true; + meta = with lib; { description = "Terminal keypress reading library"; homepage = "http://www.leonerd.org.uk/code/libtermkey"; diff --git a/nixpkgs/pkgs/development/libraries/libtiff/aarch64-darwin.nix b/nixpkgs/pkgs/development/libraries/libtiff/aarch64-darwin.nix deleted file mode 100644 index 5de481066f67..000000000000 --- a/nixpkgs/pkgs/development/libraries/libtiff/aarch64-darwin.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv -, fetchurl - -, pkg-config -, cmake - -, libdeflate -, libjpeg -, xz -, zlib -}: - -stdenv.mkDerivation rec { - pname = "libtiff"; - version = "4.2.0"; - - src = fetchurl { - url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; - }; - - cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF"; - - # FreeImage needs this patch - patches = [ ./headers-cmake.patch ]; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tiffiop.h $dev_private - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - - propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) - - buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. - - enableParallelBuilding = true; - - doInstallCheck = true; - installCheckTarget = "test"; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format"; - homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; - license = licenses.libtiff; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 190765273409..7f6d11d9e715 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -21,15 +21,13 @@ , imlib }: -#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix - stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf"; + sha256 = "1vdbk3sc497c58kxmp02irl6nqkfm9rjs3br7g59m59qfnrj6wli"; }; patches = [ @@ -39,19 +37,9 @@ stdenv.mkDerivation rec { # `version` in the project's include paths ./rename-version.patch (fetchpatch { - name = "CVE-2022-22844.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64.patch"; - sha256 = "0cfih55f5qpc84mvlwsffik80bgz6drkflkhrdyqq8m84jw3mbwb"; - }) - (fetchpatch { - name = "CVE-2022-0561.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch"; - sha256 = "0m57fdxyvhhr9cc260lvkkn2g4zr4n4v9nricc6lf9h6diagd7mk"; - }) - (fetchpatch { - name = "CVE-2022-0562.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.patch"; - sha256 = "0ycirjjc1vigj03kwjb92n6jszsl9p17ccw5hry7lli9gxyyr0an"; + name = "CVE-2022-34526.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990.patch"; + sha256 = "sha256-faKsdJjvQwNdkAKjYm4vubvZvnULt9zz4l53zBFr67s="; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/libtiff/headers-cmake.patch b/nixpkgs/pkgs/development/libraries/libtiff/headers-cmake.patch deleted file mode 100644 index 5a00502ef281..000000000000 --- a/nixpkgs/pkgs/development/libraries/libtiff/headers-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt ---- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000 -+++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000 -@@ -42,6 +42,9 @@ - libtiffxx.map) - - set(tiff_HEADERS -+ tiffiop.h -+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h -+ tif_dir.h - tiff.h - tiffio.h - tiffvers.h) diff --git a/nixpkgs/pkgs/development/libraries/libtins/default.nix b/nixpkgs/pkgs/development/libraries/libtins/default.nix index b7e02a62fa99..b96c02a35bfd 100644 --- a/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -30,10 +30,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib - ''; checkTarget = "tests test"; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index 470b9137f6e1..6f63ebce165d 100644 --- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -41,11 +41,12 @@ in stdenv.mkDerivation { ]; meta = with lib; { + # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin }; } diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 0f5253f850e3..412446f215f8 100644 --- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.5"; + version = "2.0.7"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-wTyeGTxihnjTGBsVa0Yq2M/cxhWhZ9KLHVy10ya2gc4="; + sha256 = "sha256-ikDtx1BIikVEL5jf37byNbuS+ft1lDtHUlFqegndapw="; fetchSubmodules = true; }; @@ -37,6 +37,7 @@ in stdenv.mkDerivation { ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 5d97a263b880..47bc9456d2f7 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix @@ -38,6 +38,7 @@ let ''; meta = with lib; { + broken = stdenv.isDarwin; description = "P2P FOSS instant messaging application aimed to replace Skype"; homepage = "https://tox.chat"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix index c2348aa31129..831ff2447a21 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation { doCheck = false; meta = with lib; { + broken = stdenv.isDarwin; description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix b/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix index 3be758c906f1..9acbaa479063 100644 --- a/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix +++ b/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; + homepage = "https://developers.yubico.com/libu2f-host"; license = with licenses; [ gpl3Plus lgpl21Plus ]; + mainProgram = "u2f-host"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix index 9261d1b81bac..bb49ad4472cf 100644 --- a/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; license = licenses.isc; - platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + mainProgram = "jshn"; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 8bf2e2acff9f..6b39995f39b9 100644 --- a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - ]; - doCheck = !stdenv.isi686; # tests fail on i686 meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libui/default.nix b/nixpkgs/pkgs/development/libraries/libui/default.nix index 14fb004187d8..a798977b1f41 100644 --- a/nixpkgs/pkgs/development/libraries/libui/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/libuiohook/default.nix b/nixpkgs/pkgs/development/libraries/libuiohook/default.nix new file mode 100644 index 000000000000..3f1f48317fdc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libuiohook/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, nixosTests +, cmake +, pkg-config +, AppKit +, ApplicationServices +, Carbon +, libX11 +, libxkbcommon +, xinput +, xorg +}: + +stdenv.mkDerivation rec { + pname = "libuiohook"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "kwhat"; + repo = pname; + rev = version; + sha256 = "1qlz55fp4i9dd8sdwmy1m8i4i1jy1s09cpmlxzrgf7v34w72ncm7"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = + if stdenv.isDarwin then [ AppKit ApplicationServices Carbon ] + else [ + libX11 + libxkbcommon + xinput + ] ++ + (with xorg; [ + libXau + libXdmcp + libXi + libXinerama + libXt + libXtst + libXext + libxkbfile + ]); + + outputs = [ "out" "test" ]; + + # We build the tests, but they're only installed when using the "test" output. + # This will produce a "uiohook_tests" binary which can be run to test the + # functionality of the library on the current system. + # Running the test binary requires a running X11 session. + cmakeFlags = [ + "-DENABLE_TEST:BOOL=ON" + ]; + + postInstall = '' + mkdir -p $test/share + cp ./uiohook_tests $test/share + ''; + + meta = with lib; { + description = "A C library to provide global keyboard and mouse hooks from userland"; + homepage = "https://github.com/kwhat/libuiohook"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ anoa ]; + }; + + passthru.tests.libuiohook = nixosTests.libuiohook; +} diff --git a/nixpkgs/pkgs/development/libraries/libuldaq/default.nix b/nixpkgs/pkgs/development/libraries/libuldaq/default.nix index 2f8f7fbb30ea..fb234ef60d14 100644 --- a/nixpkgs/pkgs/development/libraries/libuldaq/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuldaq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libuldaq"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mccdaq"; repo = "uldaq"; rev = "v${version}"; - sha256 = "0l9ima8ac99yd9vvjvdrmacm95ghv687wiy39zxm00cmghcfv3vj"; + sha256 = "sha256-DA1mxu94z5xDpGK9OBwD02HXlOATv/slqZ4lz5GM7QM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libunistring/default.nix b/nixpkgs/pkgs/development/libraries/libunistring/default.nix index f7a77832c183..7da2c46fafe2 100644 --- a/nixpkgs/pkgs/development/libraries/libunistring/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunistring/default.nix @@ -7,15 +7,16 @@ stdenv.mkDerivation rec { pname = "libunistring"; - version = "0.9.10"; + version = "1.0"; src = fetchurl { url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; - sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8"; + sha256 = "sha256-PAGEwOSS18IIzjHSXdHSxY8MPtbLvgMsWySM3a0xhUQ="; }; outputs = [ "out" "dev" "info" "doc" ]; + strictDeps = true; propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/nixpkgs/pkgs/development/libraries/libunwind/default.nix index 4bce1341c7d8..89ca036eeed4 100644 --- a/nixpkgs/pkgs/development/libraries/libunwind/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY="; }; - postPatch = if stdenv.cc.isClang then '' + patches = [ + # Fix for aarch64 and non-4K pages. Remove once upgraded past 1.6.2. + (fetchpatch { + url = "https://github.com/libunwind/libunwind/commit/e85b65cec757ef589f28957d0c6c21c498a03bdf.patch"; + sha256 = "1lnlygvhqrdrjgw303pg2k2k4ms4gaghpjsgmhk47q83vy1yjwfg"; + }) + ]; + + postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then '' substituteInPlace configure.ac --replace "-lgcc_s" "" '' else lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh" diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index 678fd0b3f734..c95ea31b3bfb 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.1"; # remove patch when updating + version = "2.2"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-7wSpKqjIdQeOdsQu4xN3kFHV49n6qQ3xVbjUcY1tmas="; + sha256 = "sha256-M/jfxZ+5DmFvlAt8sbXrjBTPf2gLd9UyTNymtjD+55g"; }; separateDebugInfo = true; @@ -43,15 +43,6 @@ stdenv.mkDerivation rec { cp ./examples/ucontext-cp $bin/bin/io_uring-ucontext-cp ''; - # fix for compilation on 32-bit ARM, merged by upstream but not released; remove when - # upstream releases an update - patches = lib.optional stdenv.isAarch32 [ - (fetchpatch { - url = "https://github.com/axboe/liburing/commit/e75a6cfa085fc9b5dbf5140fc1efb5a07b6b829e.diff"; - sha256 = "sha256-qQEQXYm5mkws2klLxwuuoPSPRkpP1s6tuylAAEp7+9E="; - }) - ]; - meta = with lib; { description = "Userspace library for the Linux io_uring API"; homepage = "https://git.kernel.dk/cgit/liburing/"; diff --git a/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix index 1514d2702103..3b23402fe33c 100644 --- a/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -7,33 +7,27 @@ , udev , libobjc , IOKit +, Security , withStatic ? false }: stdenv.mkDerivation rec { pname = "libusb"; - version = "1.0.24"; + version = "1.0.26"; src = fetchFromGitHub { owner = "libusb"; repo = "libusb"; rev = "v${version}"; - sha256 = "18ri8ky422hw64zry7bpbarb1m0hiljyf64a0a9y093y7aad38i7"; + sha256 = "sha256-LEy45YiFbueCCi8d2hguujMsxBezaTUERHUpFsTKGZQ="; }; outputs = [ "out" "dev" ]; - patches = [ (fetchpatch { - # https://bugs.archlinux.org/task/69121 - url = "https://github.com/libusb/libusb/commit/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch"; - sha256 = "1dbahikcbwkjhyvks7wbp7fy2bf7nca48vg5z0zqvqzjb9y595cq"; - excludes = [ "libusb/version_nano.h" ]; - }) ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = lib.optional enableUdev udev ++ - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; dontDisableStatic = withStatic; diff --git a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix index 7bba6e8b4040..28cbd8d8561c 100644 --- a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,24 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libplist +, libimobiledevice-glue +}: stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "unstable-2021-02-06"; + version = "2.0.2+date=2022-05-04"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "3eb50a07bad4c2222e76df93b23a0161922150d1"; - sha256 = "sha256-pBPBgE6s8JYKJYEV8CcumNki+6jD5r7HzQ0nZ8yQLdM="; + rev = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a"; + hash = "sha256-41N5cSLAiPJ9FjdnCQnMvPu9/qhI3Je/M1VmKY+yII4="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libplist ]; + postPatch = '' + echo '${version}' > .tarball-version + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libplist + libimobiledevice-glue + ]; meta = with lib; { description = "A client library to multiplex connections from and to iOS devices"; - homepage = "https://github.com/libimobiledevice/libusbmuxd"; - license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/libimobiledevice/libusbmuxd"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libusbsio/default.nix b/nixpkgs/pkgs/development/libraries/libusbsio/default.nix new file mode 100644 index 000000000000..1982311919ba --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libusbsio/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchzip, pkg-config, libusb1, systemdMinimal }: +let + binDirPrefix = if stdenv.isDarwin then "osx_" else "linux_"; +in +stdenv.mkDerivation rec { + pname = "libusbsio"; + version = "2.1.11"; + + src = fetchzip { + url = "https://www.nxp.com/downloads/en/libraries/libusbsio-${version}-src.zip"; + sha256 = "sha256-qgoeaGWTWdTk5XpJwoauckEQlqB9lp5x2+TN09vQttI="; + }; + + postPatch = '' + rm -r bin/* + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libusb1 + systemdMinimal # libudev + ]; + + installPhase = '' + runHook preInstall + install -D bin/${binDirPrefix}${stdenv.hostPlatform.parsed.cpu.name}/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.nxp.com/design/software/development-software/library-for-windows-macos-and-ubuntu-linux:LIBUSBSIO"; + description = "Library for communicating with devices connected via the USB bridge on LPC-Link2 and MCU-Link debug probes on supported NXP microcontroller evaluation boards"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index 1d9354d48e1a..a350cd378bce 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.43.0"; + version = "1.44.2"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AsXJb2AGNx+SARPmY8uRFRLfX5vqTPNjwL8njSw/e7o="; + sha256 = "sha256-K6v+00basjI32ON27ZjC5spQi/zWCcslDwQwyosq2iY="; }; postPatch = let @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes + "fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927 ] ++ lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog"; maintainers = with maintainers; [ cstrahan ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix b/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix deleted file mode 100644 index ade56ac16ee9..000000000000 --- a/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi -, libGL, mesa -, minimal ? false, libva1-minimal -}: - -stdenv.mkDerivation rec { - pname = "libva"; - version = "1.7.3"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2"; - sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; - }; - - outputs = [ "bin" "dev" "out" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; - # TODO: share libs between minimal and !minimal - perhaps just symlink them - - configureFlags = - # Add FHS paths for non-NixOS applications. - [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ - lib.optionals (!minimal) [ "--enable-glx" ]; - - installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; - - meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; - license = licenses.mit; - description = "VAAPI library: Video Acceleration API"; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libva/1.nix b/nixpkgs/pkgs/development/libraries/libva/1.nix new file mode 100644 index 000000000000..5197420783a1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libva/1.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, libX11 +, pkg-config +, libXext +, libdrm +, libXfixes +, wayland +, libffi +, libGL +, mesa +, minimal ? false +, libva1-minimal +}: + +stdenv.mkDerivation rec { + pname = "libva" + lib.optionalString minimal "-minimal"; + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "libva"; + rev = version; + sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38="; + }; + + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libdrm ] + ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; + # TODO: share libs between minimal and !minimal - perhaps just symlink them + + # Add FHS paths for non-NixOS applications. + configureFlags = [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] + ++ lib.optionals (!minimal) [ "--enable-glx" ]; + + installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + + meta = with lib; { + homepage = "https://www.freedesktop.org/wiki/Software/vaapi/"; + license = licenses.mit; + description = "VAAPI library: Video Acceleration API"; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libva/default.nix b/nixpkgs/pkgs/development/libraries/libva/default.nix index 10f90a16c927..ad4083bf6fea 100644 --- a/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - pname = "libva" + lib.optionalString minimal "minimal"; - version = "2.13.0"; + pname = "libva" + lib.optionalString minimal "-minimal"; + version = "2.15.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "0vsvli3xc0gqqp06p7wkm973lhr7c5qgnyz5jfjmf8kv75rajazp"; + sha256 = "sha256-NJA2FTPrhLj9+vmkBy+GcTiH57gBEQnYhZzYk3sEOBo="; }; outputs = [ "dev" "out" ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/linuxmedia/vaapi"; changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libva/utils.nix b/nixpkgs/pkgs/development/libraries/libva/utils.nix index 05ba3519ff4c..ce060c66a35b 100644 --- a/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.13.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "0ahbwikdb0chf76whm62zz0a7zqil3gzsxmq38ccbqlmnnyjkbbb"; + sha256 = "sha256-oElqJqOa/Q+2NE6gZS2tJnFJfalP6HsuUduk8cbuy84="; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/libva-utils"; changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix index a83893b01a7f..e3be4db26cd8 100644 --- a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libvdpau"; - version = "1.4"; + version = "1.5"; src = fetchurl { url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0c1zsfr6ypzwv8g9z50kdahpb7pirarq4z8avqqyyma5b9684n22"; + sha256 = "sha256-pdUKQrjCiP68BxUatkOsjeBqGERpZcckH4m06BCCGRM="; }; patches = [ ./installdir.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/libversion/default.nix b/nixpkgs/pkgs/development/libraries/libversion/default.nix index 98ad4ef7feec..c8af82d04917 100644 --- a/nixpkgs/pkgs/development/libraries/libversion/default.nix +++ b/nixpkgs/pkgs/development/libraries/libversion/default.nix @@ -13,13 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optional stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests - ]; - - preCheck = '' - export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/development/libraries/libvgm/default.nix b/nixpkgs/pkgs/development/libraries/libvgm/default.nix new file mode 100644 index 000000000000..43b145be62bf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libvgm/default.nix @@ -0,0 +1,122 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, cmake +, libiconv +, zlib +, enableShared ? true + +, enableAudio ? true +, withWaveWrite ? true +, withWinMM ? stdenv.hostPlatform.isWindows +, withDirectSound ? stdenv.hostPlatform.isWindows +, withXAudio2 ? stdenv.hostPlatform.isWindows +, withWASAPI ? stdenv.hostPlatform.isWindows +, withOSS ? stdenv.hostPlatform.isFreeBSD +, withSADA ? stdenv.hostPlatform.isSunOS +, withALSA ? stdenv.hostPlatform.isLinux +, alsa-lib +, withPulseAudio ? stdenv.hostPlatform.isLinux +, libpulseaudio +, withCoreAudio ? stdenv.hostPlatform.isDarwin +, CoreAudio +, AudioToolbox +, withLibao ? true +, libao + +, enableEmulation ? true +, withAllEmulators ? true +, emulators ? [ ] + +, enableLibplayer ? true + +, enableTools ? false +}: + +assert enableTools -> enableAudio && enableEmulation && enableLibplayer; + +let + inherit (lib) optional optionals; + onOff = val: if val then "ON" else "OFF"; +in +stdenv.mkDerivation rec { + pname = "libvgm"; + version = "unstable-2022-06-18"; + + src = fetchFromGitHub { + owner = "ValleyBell"; + repo = "libvgm"; + rev = "001ca758538ca3f82403dff654d82342730b215d"; + sha256 = "O3jvEEW1M0cwZoG6j2ndmuQW4jP0dvt6gGp2BS4VD5s="; + }; + + outputs = [ + "out" + "dev" + ] ++ optional enableTools "bin"; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + libiconv + zlib + ] ++ optionals withALSA [ + alsa-lib + ] ++ optionals withPulseAudio [ + libpulseaudio + ] ++ optionals withCoreAudio [ + CoreAudio + AudioToolbox + ] ++ optionals withLibao [ + libao + ]; + + cmakeFlags = [ + "-DBUILD_LIBAUDIO=${onOff enableAudio}" + "-DBUILD_LIBEMU=${onOff enableEmulation}" + "-DBUILD_LIBPLAYER=${onOff enableLibplayer}" + "-DBUILD_TESTS=${onOff enableTools}" + "-DBUILD_PLAYER=${onOff enableTools}" + "-DBUILD_VGM2WAV=${onOff enableTools}" + "-DLIBRARY_TYPE=${if enableShared then "SHARED" else "STATIC"}" + "-DUSE_SANITIZERS=ON" + ] ++ optionals enableAudio [ + "-DAUDIODRV_WAVEWRITE=${onOff withWaveWrite}" + "-DAUDIODRV_WINMM=${onOff withWinMM}" + "-DAUDIODRV_DSOUND=${onOff withDirectSound}" + "-DAUDIODRV_XAUDIO2=${onOff withXAudio2}" + "-DAUDIODRV_WASAPI=${onOff withWASAPI}" + "-DAUDIODRV_OSS=${onOff withOSS}" + "-DAUDIODRV_SADA=${onOff withSADA}" + "-DAUDIODRV_ALSA=${onOff withALSA}" + "-DAUDIODRV_PULSE=${onOff withPulseAudio}" + "-DAUDIODRV_APPLE=${onOff withCoreAudio}" + "-DAUDIODRV_LIBAO=${onOff withLibao}" + ] ++ optionals enableEmulation ([ + "-DSNDEMU__ALL=${onOff withAllEmulators}" + ] ++ optionals (!withAllEmulators) + (lib.lists.forEach emulators (x: "-DSNDEMU_${x}=ON")) + ) ++ optionals enableTools [ + "-DUTIL_CHARCNV_ICONV=ON" + "-DUTIL_CHARCNV_WINAPI=${onOff stdenv.hostPlatform.isWindows}" + ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/ValleyBell/libvgm.git"; + }; + + meta = with lib; { + homepage = "https://github.com/ValleyBell/libvgm"; + description = "More modular rewrite of most components from VGMPlay"; + license = + if (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) then + licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 + else + licenses.gpl2Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libviperfx/default.nix b/nixpkgs/pkgs/development/libraries/libviperfx/default.nix new file mode 100644 index 000000000000..3c980823f410 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libviperfx/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libviperfx"; + version = "unstable-2018-01-15"; + + src = fetchFromGitHub { + owner = "vipersaudio"; + repo = "viperfx_core_binary"; + rev = "6f7d0da725affe854f083baf5d90c70e172e4488"; + sha256 = "sha256-hfX46Kk91eQgiO3uhew91I6eEHxazhdGwSkhfNZ+HvQ="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D libviperfx_x64_linux.so $out/lib/libviperfx.so + install -D README.md $out/share/licenses/libviperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/vipersaudio/viperfx_core_binary"; + description = "The ViPER FX core"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ rewine ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index f86edf1bfbcb..b7efdf2cf7d8 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -45,8 +45,9 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = [ + buildInputs = (lib.optionals stdenv.isLinux [ libcap_ng + ]) ++ [ libvirt libxml2 gobject-introspection @@ -66,6 +67,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://libvirt.org/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch b/nixpkgs/pkgs/development/libraries/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch deleted file mode 100644 index 375267dcda79..000000000000 --- a/nixpkgs/pkgs/development/libraries/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001 -From: Boris Fiuczynski <fiuczy@linux.ibm.com> -Date: Tue, 1 Mar 2022 18:47:59 +0100 -Subject: [PATCH] qemu: segmentation fault in virtqemud executing - qemuDomainUndefineFlags - -Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. - -Stack trace of thread 664419: - #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618 - #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519 - #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>) - at src/remote/remote_daemon_dispatch_stubs.h:13080 - #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0) - at src/remote/remote_daemon_dispatch_stubs.h:13059 - #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) - at ../src/rpc/virnetserverprogram.c:428 - #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 - #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 - #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 - #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164 - #9 0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256 - #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 - #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 - -Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com> -Reviewed-by: Jim Fehlig <jfehlig@suse.com> -Reviewed-by: Michal Privoznik <mprivozn@redhat.com> ---- - src/qemu/qemu_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index bcd9bdb436..8337eed510 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, - } - } - -- if (vm->def->os.loader->nvram) { -+ if (vm->def->os.loader && vm->def->os.loader->nvram) { - nvram_path = g_strdup(vm->def->os.loader->nvram); - } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { - qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); --- -2.35.1 - diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index cda7c091908d..0142ac4505f9 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -26,6 +26,7 @@ , ninja , perl , perlPackages +, polkit , pkg-config , pmutils , python3 @@ -34,6 +35,7 @@ , stdenv , xhtml1 , yajl +, writeScript # Linux , acl ? null @@ -95,6 +97,8 @@ let ] ++ optionals enableIscsi [ libiscsi openiscsi + ] ++ optionals enableZfs [ + zfs ]); in @@ -109,28 +113,18 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "8.1.0"; + version = "8.5.0"; - src = - if isDarwin then - fetchurl - { - url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ="; - } - else - fetchFromGitLab - { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY="; - fetchSubmodules = true; - }; + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-x6TnMFYjcUSdQZd9ctN2hITCAl9TGVb7/qAObGb9xMk="; + fetchSubmodules = true; + }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - ./0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch ]; # remove some broken tests @@ -141,9 +135,13 @@ stdenv.mkDerivation rec { sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build '' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build + sed -i '/vircryptotest/d' tests/meson.build + '' + optionalString (isDarwin && isx86_64) '' + sed -i '/qemucaps2xmltest/d' tests/meson.build + sed -i '/qemuhotplugtest/d' tests/meson.build + sed -i '/virnetdaemontest/d' tests/meson.build ''; - nativeBuildInputs = [ meson @@ -227,6 +225,9 @@ stdenv.mkDerivation rec { --replace "gmake" "make" \ --replace "ggrep" "grep" + substituteInPlace src/util/virpolkit.h \ + --replace '"/usr/bin/pkttyagent"' '"${if isLinux then polkit.bin else "/usr"}/bin/pkttyagent"' + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); @@ -271,7 +272,7 @@ stdenv.mkDerivation rec { (feat "numactl" isLinux) (feat "numad" isLinux) (feat "pciaccess" isLinux) - (feat "polkit" true) + (feat "polkit" isLinux) (feat "readline" true) (feat "secdriver_apparmor" isLinux) (feat "tests" true) @@ -323,12 +324,27 @@ stdenv.mkDerivation rec { gettext() { "${gettext}/bin/gettext" "$@"; } ' '' + optionalString isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + for f in $out/lib/systemd/system/*.service ; do + substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill + done rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ --prefix PATH : /run/libvirt/nix-emulators:${binPath} ''; + passthru.updateScript = writeScript "update-libvirt" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + + set -eu -o pipefail + + libvirtVersion=$(curl https://gitlab.com/api/v4/projects/192693/repository/tags | jq -r '.[].name|select(. | contains("rc") | not)' | head -n1 | sed "s/v//g") + sysvirtVersion=$(curl https://gitlab.com/api/v4/projects/192677/repository/tags | jq -r '.[].name|select(. | contains("rc") | not)' | head -n1 | sed "s/v//g") + update-source-version ${pname} "$libvirtVersion" + update-source-version python3Packages.${pname} "$libvirtVersion" + update-source-version perlPackages.SysVirt "$sysvirtVersion" --file="pkgs/top-level/perl-packages.nix" + ''; + meta = { homepage = "https://libvirt.org/"; description = '' diff --git a/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix b/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix index 0525ba80b4f9..b2a68ed58680 100644 --- a/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libxml2 freetype librevenge libvisio libwmf libemf2svg ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Library and tools to convert Microsoft Visio documents (VSS and VSD) to SVG"; homepage = "https://github.com/kakwa/libvisio2svg"; diff --git a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 03ca9b0d11b3..e7add08871a6 100644 --- a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "12mwl7vxc3xi0qar386mkhkpah9zzgjb74mzc2qqsgz9zzxp16dm"; + sha256 = "sha256-TkMy2tEdG1FPPWfH/wPnVbs5kocqe4Y0jU4yvbiRZ9k="; }; sourceRoot = "source/libvmaf"; @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; + homepage = "https://github.com/Netflix/vmaf"; changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md"; - platforms = platforms.unix; license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; + mainProgram = "vmaf"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index 1517cf970782..24092d328695 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.0.0"; + version = "2.4.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-k8pEgEu+oWNa0rI47osVPKaZGxgwX/ENaz9jPrQXy0E="; + sha256 = "sha256-9uhnO+MqB7tAnSXjBcJWCzHGiz9izun4nVjFb17G8Gg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/nixpkgs/pkgs/development/libraries/libwebp/default.nix index 4333b4fbda49..e96f442e64cd 100644 --- a/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -1,74 +1,79 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading -, openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) -, pngSupport ? true, libpng ? null # PNG image format -, jpegSupport ? true, libjpeg ? null # JPEG image format -, tiffSupport ? true, libtiff ? null # TIFF image format -, gifSupport ? true, giflib ? null # GIF image format -#, wicSupport ? true # Windows Imaging Component +, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp) +, pngSupport ? true, libpng # PNG image format +, jpegSupport ? true, libjpeg # JPEG image format +, tiffSupport ? true, libtiff # TIFF image format +, gifSupport ? true, giflib # GIF image format , alignedSupport ? false # Force aligned memory operations , swap16bitcspSupport ? false # Byte swap for 16bit color spaces , experimentalSupport ? false # Experimental code , libwebpmuxSupport ? true # Build libwebpmux , libwebpdemuxSupport ? true # Build libwebpdemux , libwebpdecoderSupport ? true # Build libwebpdecoder -}: - -assert openglSupport -> freeglut != null && libGL != null && libGLU != null; -assert pngSupport -> (libpng != null); -assert jpegSupport -> (libjpeg != null); -assert tiffSupport -> (libtiff != null); -assert gifSupport -> (giflib != null); -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in +# for passthru.tests +, freeimage +, gd +, graphicsmagick +, haskellPackages +, imagemagick +, imlib2 +, libjxl +, opencv +, python3 +, vips +}: -with lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-KrvB5d3KNmujbfekWaevz2JZrWtK3PjEG9NEzRBYIDw="; + hash = "sha256-t27d+eJR4iTHSLlI3J7RqHgsWACThjsI9O6R2Zb9F1g="; }; prePatch = "patchShebangs ."; configureFlags = [ - (mkFlag threadingSupport "threading") - (mkFlag openglSupport "gl") - (mkFlag pngSupport "png") - (mkFlag jpegSupport "jpeg") - (mkFlag tiffSupport "tiff") - (mkFlag gifSupport "gif") - #(mkFlag (wicSupport && stdenv.isCygwin) "wic") - (mkFlag alignedSupport "aligned") - (mkFlag swap16bitcspSupport "swap-16bit-csp") - (mkFlag experimentalSupport "experimental") - (mkFlag libwebpmuxSupport "libwebpmux") - (mkFlag libwebpdemuxSupport "libwebpdemux") - (mkFlag libwebpdecoderSupport "libwebpdecoder") + (lib.enableFeature threadingSupport "threading") + (lib.enableFeature openglSupport "gl") + (lib.enableFeature pngSupport "png") + (lib.enableFeature jpegSupport "jpeg") + (lib.enableFeature tiffSupport "tiff") + (lib.enableFeature gifSupport "gif") + (lib.enableFeature alignedSupport "aligned") + (lib.enableFeature swap16bitcspSupport "swap-16bit-csp") + (lib.enableFeature experimentalSupport "experimental") + (lib.enableFeature libwebpmuxSupport "libwebpmux") + (lib.enableFeature libwebpdemuxSupport "libwebpdemux") + (lib.enableFeature libwebpdecoderSupport "libwebpdecoder") ]; nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] - ++ optionals openglSupport [ freeglut libGL libGLU ] - ++ optional pngSupport libpng - ++ optional jpegSupport libjpeg - ++ optional tiffSupport libtiff - ++ optional gifSupport giflib; + ++ lib.optionals openglSupport [ freeglut libGL libGLU ] + ++ lib.optionals pngSupport [ libpng ] + ++ lib.optionals jpegSupport [ libjpeg ] + ++ lib.optionals tiffSupport [ libtiff ] + ++ lib.optionals gifSupport [ giflib ]; enableParallelBuilding = true; - meta = { + passthru.tests = { + inherit freeimage gd graphicsmagick imagemagick imlib2 libjxl opencv vips; + inherit (python3.pkgs) pillow imread; + haskell-webp = haskellPackages.webp; + }; + + meta = with lib; { description = "Tools and library for the WebP image format"; homepage = "https://developers.google.com/speed/webp/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ ajs124 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index faf6acd40b92..0b8d8d8e5817 100644 --- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -5,78 +5,54 @@ , openssl , zlib , libuv -# External poll is required for e.g. mosquitto, but discouraged by the maintainer. + # External poll is required for e.g. mosquitto, but discouraged by the maintainer. , withExternalPoll ? false }: -let - generic = { version, sha256 }: stdenv.mkDerivation rec { - pname = "libwebsockets"; - inherit version; +stdenv.mkDerivation rec { + pname = "libwebsockets"; + version = "4.3.2"; - src = fetchFromGitHub { - owner = "warmcat"; - repo = "libwebsockets"; - rev = "v${version}"; - inherit sha256; - }; - - buildInputs = [ openssl zlib libuv ]; - - nativeBuildInputs = [ cmake ]; + src = fetchFromGitHub { + owner = "warmcat"; + repo = "libwebsockets"; + rev = "v${version}"; + hash = "sha256-why8LAcc4XN0JdTJ1JoNWijKENL5mOHBsi9K4wpYr2c="; + }; - cmakeFlags = [ - "-DLWS_WITH_PLUGINS=ON" - "-DLWS_WITH_IPV6=ON" - "-DLWS_WITH_SOCKS5=ON" - # Required since v4.2.0 - "-DLWS_BUILD_HASH=no_hash" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON" - ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON"; + buildInputs = [ openssl zlib libuv ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; + nativeBuildInputs = [ cmake ]; - postInstall = '' - rm -r ${placeholder "out"}/share/libwebsockets-test-server - ''; + cmakeFlags = [ + "-DLWS_WITH_PLUGINS=ON" + "-DLWS_WITH_IPV6=ON" + "-DLWS_WITH_SOCKS5=ON" + "-DDISABLE_WERROR=ON" + "-DLWS_BUILD_HASH=no_hash" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON" + ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON"; - # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o - disallowedReferences = [ stdenv.cc.cc ]; + postInstall = '' + rm -r ${placeholder "out"}/share/libwebsockets-test-server + ''; - meta = with lib; { - description = "Light, portable C library for websockets"; - longDescription = '' - Libwebsockets is a lightweight pure C library built to - use minimal CPU and memory resources, and provide fast - throughput in both directions. - ''; - homepage = "https://libwebsockets.org/"; - # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation - # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE - license = with licenses; [ mit publicDomain bsd3 asl20 ]; - maintainers = with maintainers; [ mindavi ]; - platforms = platforms.all; - }; - }; - -in { - libwebsockets_3_1 = generic { - sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; - version = "3.1.0"; - }; + # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o + disallowedReferences = [ stdenv.cc.cc ]; - libwebsockets_3_2 = generic { - version = "3.2.2"; - sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; - }; - - libwebsockets_4_2 = generic { - version = "4.2.1"; - sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU="; - }; - - libwebsockets_4_3 = generic { - version = "4.3.0"; - sha256 = "13lxb487mqlzbsbv6fbj50r1717mfwdy87ps592lgfy3307yqpr4"; + meta = with lib; { + description = "Light, portable C library for websockets"; + longDescription = '' + Libwebsockets is a lightweight pure C library built to + use minimal CPU and memory resources, and provide fast + throughput in both directions. + ''; + homepage = "https://libwebsockets.org/"; + # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation + # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE + license = with licenses; [ mit publicDomain bsd3 asl20 ]; + maintainers = with maintainers; [ mindavi ]; + platforms = platforms.all; }; } + diff --git a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix index d0dd593a03dd..11950c634861 100644 --- a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = with platforms; [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 }; } diff --git a/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/nixpkgs/pkgs/development/libraries/libwpe/default.nix index 66de5847d78e..1e0b6ac789bf 100644 --- a/nixpkgs/pkgs/development/libraries/libwpe/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwpe/default.nix @@ -6,15 +6,17 @@ , libxkbcommon , libGL , ninja -, libX11 }: +, libX11 +, webkitgtk +}: stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.12.0"; + version = "1.12.2"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-6O7KIoprTDYpTPtj99O6mtpHpDCQSlqXOzyZyWpEwYw="; + sha256 = "sha256-SsT9CotWK3Ib/9D0aunwbCtaMRRAdYGXi+h1qdZRZCo="; }; nativeBuildInputs = [ @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { description = "General-purpose library for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix b/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix index a711fab63143..736b408323dd 100644 --- a/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix +++ b/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix @@ -10,15 +10,17 @@ , libwpe , libxkbcommon , libGL -, libX11 }: +, libX11 +, webkitgtk + }: stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-YjnJwVUjQQeY1mMV3mtJFxKrMACboYDz4N0HbZsAdKw="; + sha256 = "sha256-RaqDPETsKS8x+pQ7AbjMdeVOtiOte6amb8LxGP5p5ik="; }; depsBuildBuild = [ @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { description = "Freedesktop.org backend for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index f28420229ab9..8fa003ed7741 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "113sk7hxjpfbz3nrgjsc7bi6zrlwb3qq5s6h0zh37hz9bd1brq54"; + sha256 = "sha256-PuLpwhyyht+kkPUTrJTH+VTY5WuOhi2mIUDrFqubF+w="; }; nativeBuildInputs = [ perl cmake gfortran ]; @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" - # needed for tests to link - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # Force compilation of higher derivatives "-DDISABLE_VXC=0" "-DDISABLE_FXC=0" diff --git a/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix index 4df5bde22871..782655ef5ee0 100644 --- a/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxcrypt"; - version = "4.4.18"; + version = "4.4.28"; src = fetchFromGitHub { owner = "besser82"; repo = "libxcrypt"; rev = "v${version}"; - sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1"; + sha256 = "sha256-Ohf+RCOXnoCxAFnXXV9e2TCqpfZziQl+FGJTGDSQTF0="; }; preConfigure = '' @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + configureFlags = [ + "--disable-werror" + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config perl ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index 7bcc62af6ec8..ca7feb996f7e 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0ca00awfzvxiznvd4mgwgxyqxiwvi07j5xxmg5z0l47rcd9fqv0h"; + sha256 = "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l"; }; outputs = [ "out" "dev" "doc" ]; @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ primeos ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 539fca7456ba..6578a86e35b1 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxls/default.nix b/nixpkgs/pkgs/development/libraries/libxls/default.nix index 43c96027d08b..8ba48e15f226 100644 --- a/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { description = "Extract Cell Data From Excel xls files"; homepage = "https://github.com/libxls/libxls"; license = licenses.bsd2; - platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; + mainProgram = "xls2csv"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 3b7cae36a0ee..c4571feb81ef 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.13"; + version = "2.9.14"; outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J2EwYC0S/khOzANEfuXnWdBGVVj7yda9FE43RTBuvw4="; + sha256 = "1vnzk33wfms348lgz9pvkq9li7jm44pvm73lbr3w1khwgljlmmv0"; }; patches = [ @@ -94,8 +94,10 @@ stdenv.mkDerivation rec { doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && - !stdenv.isDarwin && stdenv.hostPlatform.libc != "musl"; + preCheck = lib.optional stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" + ''; preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 @@ -124,7 +126,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://xmlsoft.org/"; + homepage = "https://gitlab.gnome.org/GNOME/libxml2"; description = "XML parsing library for C"; license = licenses.mit; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index 80d6129f18a8..4e44ced6cb28 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -1,9 +1,8 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , glib , gobject-introspection , gtk-doc @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.7"; + version = "0.3.9"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -26,23 +25,16 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-ZzA1YJYxTR91X79NU9dWd11Ze+PX2wuZeumuEuNdC48="; + sha256 = "sha256-4WTuwxpIsE7gHXFiuWuZeu2JMGzPLpsmS1KTEdR3ztg="; }; patches = [ ./installed-tests-path.patch - # Fix darwin build, can be removed on next release - # `--version-script` isn't supported by the macOS linker - # https://github.com/hughsie/libxmlb/pull/119 - (fetchpatch { - url = "https://github.com/hughsie/libxmlb/commit/d83aac5bd78cfbbfa2ecd428ff54b811071dfe4d.patch"; - sha256 = "sha256-UNRMbyNzdxfTZ8xV6J8a622hPnr3mowooP1q8Dg19yw="; - }) ]; nativeBuildInputs = [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc meson diff --git a/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/nixpkgs/pkgs/development/libraries/libxslt/default.nix index ac4dd7492337..a8ed68b088bd 100644 --- a/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://xmlsoft.org/XSLT/"; + homepage = "https://gitlab.gnome.org/GNOME/libxslt"; description = "A C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix index ebb402cc0dda..893fb4697ac9 100644 --- a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, gfortran, gnused +{ lib, stdenv, fetchFromGitHub, gfortran , python3, util-linux, which , enableStatic ? stdenv.hostPlatform.isStatic @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - coreutils gfortran - gnused python3 util-linux which @@ -41,6 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix index d6efe0543db7..45c535d81bf3 100644 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.0.112"; + version = "2.0.231"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-f8x0tC3XcQ9fnUE987GYw8qEo/B+J759vpCImqG3QWs="; + sha256 = "sha256-IntucM8ABJsJNH7XnZ59McwmfSIimclrWzSz4NKdMrE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix b/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix index 7f314410667f..d0fc1cfd9fbd 100644 --- a/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; + homepage = "https://developers.yubico.com/libykneomgr"; license = licenses.bsd3; + mainProgram = "ykneomgr"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libzim/default.nix b/nixpkgs/pkgs/development/libraries/libzim/default.nix index 5191da60ce26..abb570730f66 100644 --- a/nixpkgs/pkgs/development/libraries/libzim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzim/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "7.2.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = version; - sha256 = "sha256-H4YUAbH4X6oJIZyhI23LemngtOtKNrHHl3KSU1ilAmo="; + sha256 = "sha256-FSotc2hkWvkYEdZ3HI3JLzjtKFaWOc1Bx6r0WyeS/Kg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libzip/default.nix b/nixpkgs/pkgs/development/libraries/libzip/default.nix index 3620943d6c53..d3b7e5642546 100644 --- a/nixpkgs/pkgs/development/libraries/libzip/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzip/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libzip"; - version = "1.8.0"; + version = "1.9.2"; src = fetchurl { url = "https://libzip.org/download/${pname}-${version}.tar.gz"; - sha256 = "17l3ygrnbszm3b99dxmw94wcaqpbljzg54h4c0y8ss8aij35bvih"; + sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8="; }; outputs = [ "out" "dev" "man" ]; @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withOpenssl [ openssl ] ++ lib.optionals withZstd [ zstd ]; + # Don't build the regression tests because they don't build with + # pkgsStatic and are not executed anyway. + cmakeFlags = [ "-DBUILD_REGRESS=0" ]; + preCheck = '' # regress/runtest is a generated file patchShebangs regress diff --git a/nixpkgs/pkgs/development/libraries/lief/default.nix b/nixpkgs/pkgs/development/libraries/lief/default.nix index 706408061907..1b538c880a12 100644 --- a/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.11.5"; + version = "0.12.1"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-crYFBeX+YaIvVAv3uvGEeNCg+ZbUryr0NacDG56TUGE="; + sha256 = "sha256-IQqPwTNFHLOr8iwg8IhXpuiyg2rIdFuVDzwT39eA6/c="; }; outputs = [ "out" "py" ]; diff --git a/nixpkgs/pkgs/development/libraries/lime/default.nix b/nixpkgs/pkgs/development/libraries/lime/default.nix index 7e7edff6bffb..38dd0d04e672 100644 --- a/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -3,15 +3,14 @@ , cmake , fetchFromGitLab , lib -, soci +, bc-soci , sqlite -, boost , stdenv }: stdenv.mkDerivation rec { pname = "lime"; - version = "5.0.53"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,17 +18,28 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-M+KdauIVsN3c+cEPw4CaMzXnQZwAPNXeJCriuk9NCWM="; + sha256 = "sha256-vgaxb8sfgtAhqG8kg3C4+UrTOHyTVR9QVO9iuKFgSBk="; }; - buildInputs = [ bctoolbox soci belle-sip sqlite boost ]; + buildInputs = [ + # Made by BC + bctoolbox + belle-sip + + # Vendored by BC + bc-soci + + sqlite + ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { - description = "End-to-end encryption library for instant messaging"; + description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; homepage = "http://www.linphone.org/technical-corner/lime"; license = licenses.gpl3Only; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix index 746771f44fe4..a40882490177 100644 --- a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,23 +1,23 @@ {lib, stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "liquid-dsp"; - version = "20170307"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jgaeddert"; repo = "liquid-dsp"; - rev = "8c1978fa4f5662b8849fe712be716958f29cec0e"; - sha256 = "0zpxvdsrw0vzzp3iaag3wh4z8ygl7fkswgjppp2fz2zhhqh93k2w"; + rev = "v${version}"; + sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0"; }; nativeBuildInputs = [ autoreconfHook ]; meta = { + broken = stdenv.isDarwin; homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; license = lib.licenses.mit; platforms = lib.platforms.unix; }; - } diff --git a/nixpkgs/pkgs/development/libraries/lirc/default.nix b/nixpkgs/pkgs/development/libraries/lirc/default.nix index d5f84455f836..68b3b86a9eec 100644 --- a/nixpkgs/pkgs/development/libraries/lirc/default.nix +++ b/nixpkgs/pkgs/development/libraries/lirc/default.nix @@ -10,11 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; - # Fix installation of Python bindings - patches = [ (fetchpatch { - url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; - sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; - }) ]; + patches = [ + # Fix installation of Python bindings + (fetchpatch { + url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; + sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; + }) + + # Add a workaround for linux-headers-5.18 until upstream adapts: + # https://sourceforge.net/p/lirc/git/merge-requests/45/ + ./linux-headers-5.18.patch + ]; postPatch = '' patchShebangs . diff --git a/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch new file mode 100644 index 000000000000..733c423b7a83 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch @@ -0,0 +1,35 @@ +--- a/daemons/lircd.cpp ++++ b/daemons/lircd.cpp +@@ -110,6 +110,17 @@ int clock_gettime(int clk_id, struct timespec *t){ + #endif + #define WHITE_SPACE " \t" + ++/* Defines removed in linux-headers-5.18: ++ https://sourceforge.net/p/lirc/git/merge-requests/45/ ++ */ ++#ifndef LIRC_CAN_SET_REC_FILTER ++# define LIRC_CAN_SET_REC_FILTER 0x08000000 ++#endif ++ ++#ifndef LIRC_CAN_NOTIFY_DECODE ++# define LIRC_CAN_NOTIFY_DECODE 0x01000000 ++#endif ++ + static const logchannel_t logchannel = LOG_APP; + + /** How long we sleep while waiting for busy write sockets. */ +--- a/tools/lirc-lsplugins.cpp ++++ b/tools/lirc-lsplugins.cpp +@@ -21,6 +21,12 @@ + #include "config.h" + #include "lirc_private.h" + ++/* Defines removed in linux-headers-5.18: ++ https://sourceforge.net/p/lirc/git/merge-requests/45/ ++ */ ++#ifndef LIRC_CAN_NOTIFY_DECODE ++# define LIRC_CAN_NOTIFY_DECODE 0x01000000 ++#endif + + #define USAGE \ + "\nSynopsis:\n" \ diff --git a/nixpkgs/pkgs/development/libraries/live555/default.nix b/nixpkgs/pkgs/development/libraries/live555/default.nix index 1c1b57f39cb1..6b5f6410d54f 100644 --- a/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "live555"; - version = "2022.02.07"; + version = "2022.07.14"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "sha256-bwwfinHOtQa8v5abArSww2l7ThXa623LqYcsh0XOksY="; + sha256 = "sha256-VrWkBmLdP0MYfiFit3Mtkv7Ti8dWPmrndrbKo+BpRCA="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; @@ -27,13 +27,14 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace config.macosx-catalina \ - --replace '/usr/lib/libssl.46.dylib' "${openssl.out}/lib/libssl.dylib" \ - --replace '/usr/lib/libcrypto.44.dylib' "${openssl.out}/lib/libcrypto.dylib" + --replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \ + --replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib" sed -i -e 's|/bin/rm|rm|g' genMakefiles sed -i \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ config.linux - '' + lib.optionalString (stdenv ? glibc) '' + '' # condition from icu/base.nix + + lib.optionalString (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") '' substituteInPlace liveMedia/include/Locale.hh \ --replace '<xlocale.h>' '<locale.h>' ''; @@ -41,27 +42,21 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - ./genMakefiles ${{ - x86_64-darwin = "macosx-catalina"; - i686-linux = "linux"; - x86_64-linux = "linux-64bit"; - aarch64-linux = "linux-64bit"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}")} + ./genMakefiles ${ + if stdenv.isLinux then + "linux" + else if stdenv.isDarwin then + "macosx-catalina" + else + throw "Unsupported platform ${stdenv.hostPlatform.system}"} runHook postConfigure ''; - installPhase = '' - runHook preInstall - - for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do - install -dm755 $out/{bin,lib,include/$dir} - install -m644 $dir/*.a "$out/lib" - install -m644 $dir/include/*.h* "$out/include/$dir" - done - - runHook postInstall - ''; + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; enableParallelBuilding = true; @@ -76,6 +71,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/nixpkgs/pkgs/development/libraries/lmdb/bin-ext.patch b/nixpkgs/pkgs/development/libraries/lmdb/bin-ext.patch new file mode 100644 index 000000000000..2d5af99772c0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/lmdb/bin-ext.patch @@ -0,0 +1,21 @@ +diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile +index 612484e..2e6b562 100644 +--- a/libraries/liblmdb/Makefile ++++ b/libraries/liblmdb/Makefile +@@ -27,6 +27,7 @@ CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) + LDLIBS = + SOLIBS = + SOEXT = .so ++BINEXT = + prefix = /usr/local + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin +@@ -49,7 +50,7 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) + mkdir -p $(DESTDIR)$(libdir) + mkdir -p $(DESTDIR)$(includedir) + mkdir -p $(DESTDIR)$(mandir)/man1 +- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done ++ for f in $(IPROGS); do cp $$f$(BINEXT) $(DESTDIR)$(bindir); done + for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done + for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done + for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done diff --git a/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/nixpkgs/pkgs/development/libraries/lmdb/default.nix index 0a3515db2622..a8b5da5b56da 100644 --- a/nixpkgs/pkgs/development/libraries/lmdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/lmdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab }: +{ lib, stdenv, fetchFromGitLab, windows }: stdenv.mkDerivation rec { pname = "lmdb"; @@ -14,17 +14,20 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; - patches = [ ./hardcoded-compiler.patch ]; + patches = [ ./hardcoded-compiler.patch ./bin-ext.patch ]; patchFlags = [ "-p3" ]; outputs = [ "bin" "out" "dev" ]; + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; + makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] - ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; + ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so" + ++ lib.optionals stdenv.hostPlatform.isWindows [ "SOEXT=.dll" "BINEXT=.exe" ]; doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix index 160cdabed708..6cc40fc70921 100644 --- a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "log4cplus"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2"; - sha256 = "sha256-j626/uK6TlWKD3iEJhPJ+yOcd12D8jNA0JEITA4bEqs="; + sha256 = "sha256-yjaqNmA20cYfwDZqn/vPMrrVXXSHiyw2qcNNzAC4oMo="; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/log4shib/default.nix b/nixpkgs/pkgs/development/libraries/log4shib/default.nix index 0602b4c3b523..1c9a6a1e2ac7 100644 --- a/nixpkgs/pkgs/development/libraries/log4shib/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4shib/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + meta = with lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; diff --git a/nixpkgs/pkgs/development/libraries/loki/default.nix b/nixpkgs/pkgs/development/libraries/loki/default.nix index 49b850eae65b..d89df53907be 100644 --- a/nixpkgs/pkgs/development/libraries/loki/default.nix +++ b/nixpkgs/pkgs/development/libraries/loki/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { make build-shared ''; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/lucene++/default.nix b/nixpkgs/pkgs/development/libraries/lucene++/default.nix index ef55541ed777..08a348505006 100644 --- a/nixpkgs/pkgs/development/libraries/lucene++/default.nix +++ b/nixpkgs/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gtest, zlib }: stdenv.mkDerivation rec { pname = "lucene++"; @@ -14,13 +14,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost gtest zlib ]; - doCheck = true; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + patches = [ + (fetchpatch { + name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; + sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; + }) + ]; postPatch = '' - substituteInPlace src/test/CMakeLists.txt \ - --replace "add_subdirectory(gtest)" "" + substituteInPlace src/test/CMakeLists.txt \ + --replace "add_subdirectory(gtest)" "" ''; + doCheck = true; + checkPhase = '' runHook preCheck LD_LIBRARY_PATH=$PWD/src/contrib:$PWD/src/core \ @@ -30,6 +40,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/include/pkgconfig $out/lib/ + cp $src/src/contrib/include/*h $out/include/lucene++/ ''; meta = { diff --git a/nixpkgs/pkgs/development/libraries/mailcore2/default.nix b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix index 4e5a5fdbcdbc..65e35217f80a 100644 --- a/nixpkgs/pkgs/development/libraries/mailcore2/default.nix +++ b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { checkPhase = '' ( cd unittest - LD_LIBRARY_PATH="$(cd ../src; pwd)" TZ=PST8PDT ./unittestcpp ../../unittest/data + TZ=PST8PDT ./unittestcpp ../../unittest/data ) ''; diff --git a/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/nixpkgs/pkgs/development/libraries/malcontent/default.nix index 791fae96f0fc..4154f0315cd2 100644 --- a/nixpkgs/pkgs/development/libraries/malcontent/default.nix +++ b/nixpkgs/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.4"; + version = "0.10.5"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "sha256-s2wQLb3tCfO3p8yYG8Nc6pu+y2TLfrmo7Ug1LgDLEdw="; + sha256 = "sha256-UPKAStB6wTd3qbbISHMgNw1bJjIRgn89tHnsw4ZptvQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix b/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix index c71bf17a3c77..47b9ba63fc2d 100644 --- a/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -30,6 +30,11 @@ mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; }) + (fetchpatch { + name = "fix-compilation.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native"; + hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI="; + }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix b/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix index 49a7f26220dd..a9a2ad64d7ad 100644 --- a/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -6,31 +6,28 @@ , curl , qtbase , qtlocation -, mapbox-gl-native +, maplibre-gl-native }: mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.7.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI="; + hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ curl qtlocation mapbox-gl-native ]; + buildInputs = [ curl qtlocation maplibre-gl-native ]; postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}" ''; - # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path - NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5"; - meta = with lib; { description = "Unofficial Mapbox GL Native bindings for Qt QML"; homepage = "https://github.com/rinigus/mapbox-gl-qml"; diff --git a/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix b/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix new file mode 100644 index 000000000000..c680f6822b5d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix @@ -0,0 +1,66 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, qtbase +, curl +, libuv +, glfw3 +, rapidjson +}: + +mkDerivation rec { + pname = "maplibre-gl-native"; + version = "unstable-2022-04-07"; + + src = fetchFromGitHub { + owner = "maplibre"; + repo = "maplibre-gl-native"; + rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806"; + fetchSubmodules = true; + hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY="; + }; + + patches = [ + (fetchpatch { + name = "skip-license-check.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; + sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; + }) + ]; + + postPatch = '' + # don't use vendored rapidjson + rm -r vendor/mapbox-base/extras/rapidjson + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + curl + libuv + glfw3 + qtbase + rapidjson + ]; + + cmakeFlags = [ + "-DMBGL_WITH_QT=ON" + "-DMBGL_WITH_QT_LIB_ONLY=ON" + "-DMBGL_WITH_QT_HEADLESS=OFF" + ]; + + meta = with lib; { + description = "Open-source alternative to Mapbox GL Native"; + homepage = "https://maplibre.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.linux; + broken = lib.versionOlder qtbase.version "5.15"; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/nixpkgs/pkgs/development/libraries/mapnik/default.nix index 14eb3c047e2a..13e34bebee63 100644 --- a/nixpkgs/pkgs/development/libraries/mapnik/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapnik/default.nix @@ -1,12 +1,15 @@ { lib, stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib +, sconsPackages # supply a postgresql package to enable the PostGIS input plugin , postgresql ? null }: -stdenv.mkDerivation rec { +let + scons = sconsPackages.scons_3_0_1; +in stdenv.mkDerivation rec { pname = "mapnik"; version = "3.1.0"; @@ -16,10 +19,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-qqPqN4vs3ZsqKgnx21yQhX8OzHca/0O+3mvQ/vnC5EY="; }; + postPatch = '' + substituteInPlace configure \ + --replace '$PYTHON scons/scons.py' ${scons}/bin/scons + rm -r scons + ''; + # a distinct dev output makes python-mapnik fail outputs = [ "out" ]; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ scons ]; buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff diff --git a/nixpkgs/pkgs/development/libraries/matio/default.nix b/nixpkgs/pkgs/development/libraries/matio/default.nix index 7a227e57560d..c92c712e1500 100644 --- a/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C library for reading and writing Matlab MAT files"; + homepage = "http://matio.sourceforge.net/"; license = licenses.bsd2; + maintainers = [ ]; + mainProgram = "matdump"; platforms = platforms.all; - maintainers = [ maintainers.vbgl ]; - homepage = "http://matio.sourceforge.net/"; }; } diff --git a/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix deleted file mode 100644 index 90053b16fc8c..000000000000 --- a/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitLab -, cmake -, extra-cmake-modules -, kconfig -, kio -, mauikit -}: - -mkDerivation rec { - pname = "mauikit-filebrowsing"; - version = "2.1.1"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "maui"; - repo = "mauikit-filebrowsing"; - rev = "v${version}"; - hash = "sha256-2LzGvjh2t4RVZS9Js7ky3hM51L7bx0SHmDlKKPjl3LM="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kio - mauikit - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauikit-filebrowsing"; - description = "MauiKit File Browsing utilities and controls"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/mauikit/default.nix b/nixpkgs/pkgs/development/libraries/mauikit/default.nix deleted file mode 100644 index 22e3748fe48b..000000000000 --- a/nixpkgs/pkgs/development/libraries/mauikit/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitLab -, cmake -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, knotifications -, qtbase -, qtquickcontrols2 -, qtx11extras -}: - -mkDerivation rec { - pname = "mauikit"; - version = "2.1.1"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "maui"; - repo = "mauikit"; - rev = "v${version}"; - hash = "sha256-INvh+J484xkAsNGtYdf8NGGpFGp2AG7s9UYESoem3QY="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcoreaddons - ki18n - knotifications - qtquickcontrols2 - qtx11extras - ]; - - meta = with lib; { - homepage = "https://mauikit.org/"; - description = "Free and modular front-end framework for developing fast and compelling user experiences"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ dotlambda ]; - broken = versionOlder qtbase.version "5.15.0"; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 8bba8f0efe0e..4fa4a5c4503f 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/md4c/default.nix b/nixpkgs/pkgs/development/libraries/md4c/default.nix index 2ad77b2d2fd8..6504d99af3e9 100644 --- a/nixpkgs/pkgs/development/libraries/md4c/default.nix +++ b/nixpkgs/pkgs/development/libraries/md4c/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/mity/md4c"; description = "Markdown parser made in C"; longDescription = '' MD4C is Markdown parser implementation in C, with the following features: @@ -58,8 +57,10 @@ stdenv.mkDerivation rec { "Unicode"). See more details below. - Permissive license: MD4C is available under the MIT license. ''; + homepage = "https://github.com/mity/md4c"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "md2html"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index 5d9cc98b1a9c..bb5bc566bc1d 100644 --- a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -1,31 +1,21 @@ -{ alsa-lib -, bctoolbox +{ bctoolbox , bzrtp , cmake -, doxygen , fetchFromGitLab , ffmpeg , glew , gsm -, intltool , lib -, libGL -, libGLU , libX11 , libXext -, libXv -, libmatroska , libopus -, libpcap , libpulseaudio -, libtheora -, libupnp , libv4l , libvpx , ortp -, pkg-config , python3 -, SDL +, qtbase +, qtdeclarative , speex , srtp , stdenv @@ -33,7 +23,9 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.5.15"; + version = "5.1.20"; + + dontWrapQtApps = true; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-n/EuXEQ9nJKC32PMvWkfP1G+E6uQQuu1/A168n8/cIY="; + sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU="; }; patches = [ @@ -55,54 +47,46 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - doxygen - intltool - pkg-config python3 + qtbase + qtdeclarative ]; propagatedBuildInputs = [ - alsa-lib + # Made by BC bctoolbox bzrtp + ortp + ffmpeg glew - gsm - libGL - libGLU libX11 libXext - libXv - libmatroska - libopus - libpcap libpulseaudio - libtheora - libupnp libv4l - libvpx - ortp - SDL speex srtp + + # Optional + gsm # GSM audio codec + libopus # Opus audio codec + libvpx # VP8 video codec ]; strictDeps = true; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - NIX_CFLAGS_COMPILE = toString [ - "-DGIT_VERSION=\"v${version}\"" - "-Wno-error=deprecated-declarations" - "-Wno-error=cast-function-type" - "-Wno-error=stringop-truncation" - "-Wno-error=stringop-overflow" + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop + "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" + "-DENABLE_STRICT=NO" # Disable -Werror + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables ]; + NIX_LDFLAGS = "-lXext"; meta = with lib; { - description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; + description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix index 08842889f865..83a96175cba5 100644 --- a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -5,25 +5,24 @@ , mediastreamer , openh264 , pkg-config -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "msopenh264"; - # Using master branch for linphone-desktop caused a chain reaction that many - # of its dependencies needed to use master branch too. - version = "unstable-2020-03-03"; + version = "linphone-4.4.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "2c3abf52824ad23a4caae7565ef158ef91767704"; - sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr"; + rev = "5603a432be2ed10f5d5a5ce068ef83ab2a996d6b"; + sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; }; - nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ mediastreamer openh264 ]; # Do not build static libraries @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "H.264 encoder/decoder plugin for mediastreamer2"; + description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project."; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/menu-cache/default.nix b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix index 66fadee0b31f..e05d387846a6 100644 --- a/nixpkgs/pkgs/development/libraries/menu-cache/default.nix +++ b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }: +{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, libfm-extra }: stdenv.mkDerivation rec { pname = "menu-cache"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/lxde/menu-cache/pull/19 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch"; + sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libfm-extra ]; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 23163763ed9b..48df1b0149c1 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -5,16 +5,17 @@ , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd, libunwind +, vulkan-loader , galliumDrivers ? ["auto"] -, driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , OpenGL, Xplugin -, withValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light +, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light , enableGalliumNine ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , libclc +, jdupes }: /** Packaging design: @@ -33,7 +34,8 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.3.7"; + # 22.1 on darwin won't build: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6519 + version = if stdenv.isDarwin then "22.0.4" else "22.1.4"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,7 +49,10 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0ggw3s514z6szasbiy4dv5mdi689121yy2xly2g21gv1mavrvyml"; + sha256 = { + "22.1.4" = "0xhbcjqy3g5dfxhr4flmqncmsjnwljfqm9idx92jm43jifz8q3b7"; + "22.0.4" = "1m0y8wgy48hmcidsr7sbk5hcw3v0qr8359fd2x34fvl2z9c1z5y7"; + }.${version}; }; # TODO: @@ -76,19 +81,11 @@ self = stdenv.mkDerivation { postPatch = '' patchShebangs . - substituteInPlace meson.build --replace \ - "find_program('pkg-config')" \ - "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" - # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency: substituteInPlace src/util/xmlconfig.c --replace \ 'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"' substituteInPlace src/util/meson.build --replace \ "get_option('datadir')" "'${placeholder "out"}/share'" - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - substituteInPlace meson.build --replace \ - "find_program('nm')" \ - "find_program('${stdenv.cc.targetPrefix}nm')" ''; outputs = [ "out" "dev" "drivers" ] @@ -113,7 +110,6 @@ self = stdenv.mkDerivation { "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" "-Dplatforms=${concatStringsSep "," eglPlatforms}" - "-Ddri-drivers=${concatStringsSep "," driDrivers}" "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}" "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}" @@ -145,7 +141,9 @@ self = stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optionals stdenv.isDarwin [ libunwind ] ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ] - ++ lib.optional withValgrind valgrind-light; + ++ lib.optional withValgrind valgrind-light + # Mesa will not build zink when gallium-drivers=auto + ++ lib.optional (elem "zink" galliumDrivers) vulkan-loader; depsBuildBuild = [ pkg-config ]; @@ -153,6 +151,7 @@ self = stdenv.mkDerivation { meson pkg-config ninja intltool bison flex file python3Packages.python python3Packages.Mako + jdupes ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland-scanner ]; @@ -228,6 +227,9 @@ self = stdenv.mkDerivation { fi done + # NAR doesn't support hard links, so convert them to symlinks to save space. + jdupes --hard-links --link-soft --recurse "$drivers" + # add RPATH so the drivers can find the moved libgallium and libdricore9 # moved here to avoid problems with stripping patchelfed files for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do diff --git a/nixpkgs/pkgs/development/libraries/metal/default.nix b/nixpkgs/pkgs/development/libraries/metal/default.nix deleted file mode 100644 index 2f43485e05e0..000000000000 --- a/nixpkgs/pkgs/development/libraries/metal/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - pname = "metal"; - version = "2.1.2"; - - src = fetchFromGitHub { - owner = "brunocodutra"; - repo = "metal"; - rev = "v${version}"; - sha256 = "sha256-1I+EZtIz/2y4+dJGBONhTlUQGHgRdvXc1ZAOC9pmStw="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Single-header C++11 library designed to make you love template metaprogramming"; - homepage = "https://github.com/brunocodutra/metal"; - license = licenses.mit; - maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.all; - }; - -} diff --git a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix index 187508a99818..35765ff2d43f 100644 --- a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , gtest -, fetchurl +, fetchpatch , pkg-config }: @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { patches = [ # Search for GoogleTest via pkg-config first, ref: https://github.com/NixOS/nixpkgs/pull/130525 - (fetchurl { + (fetchpatch { url = "https://github.com/microsoft/GSL/commit/f5cf01083baf7e8dc8318db3648bc6098dc32d67.patch"; - sha256 = "sha256-uouv35crtly8kYhKyvMyZkqwTKt1jXC6dZjw4sQ6uv0="; + sha256 = "sha256-HJxG87nVFo1CGNivCqt/JhjTj2xLzQe8bF5Km7/KG+Y="; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 22d4567c562d..cc67e2070949 100644 --- a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja -, fetchpatch , secureBuild ? false }: @@ -8,21 +7,14 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q3W/w1Ofqt6EbKF/Jf9wcC+7jAxh59B3cOGxudWQXlA="; + sha256 = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc="; }; - patches = [ - (fetchpatch { - name = "older-macos-fixes.patch"; - url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; - sha256 = "15qx2a3axhhwbfzxdis98b8j14y9cfgca0i484aj2pjpqnm0pb8c"; - }) - ]; doCheck = true; preCheck = let diff --git a/nixpkgs/pkgs/development/libraries/mimetic/default.nix b/nixpkgs/pkgs/development/libraries/mimetic/default.nix index 1638caa0d1f8..5a965c3d7d92 100644 --- a/nixpkgs/pkgs/development/libraries/mimetic/default.nix +++ b/nixpkgs/pkgs/development/libraries/mimetic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cutee }: +{ lib, stdenv, fetchurl, fetchpatch, cutee }: stdenv.mkDerivation rec { pname = "mimetic"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ cutee ]; - patches = lib.optional stdenv.isAarch64 ./narrowing.patch; + patches = [ + # Fix build with gcc11 + (fetchpatch { + url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch"; + sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI="; + }) + ] ++ lib.optional stdenv.isAarch64 ./narrowing.patch; meta = with lib; { description = "MIME handling library"; diff --git a/nixpkgs/pkgs/development/libraries/miniz/default.nix b/nixpkgs/pkgs/development/libraries/miniz/default.nix new file mode 100644 index 000000000000..d390a019a52a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/miniz/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "miniz"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "richgel999"; + repo = pname; + rev = version; + sha256 = "sha256-7hc/yNJh4sD5zGQLeHjowbUtV/1mUDQre1tp9yKMSSY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Single C source file zlib-replacement library"; + homepage = "https://github.com/richgel999/miniz"; + license = licenses.mit; + maintainers = with maintainers; [ astro ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 5c58aa4f8aec..9cf5da3e395b 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -60,6 +60,11 @@ mkDerivation rec { outputs = [ "out" "dev" ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" @@ -71,6 +76,7 @@ mkDerivation rec { passthru.updateScript = gitUpdater { inherit pname version; + attrPath = "libsForQt5.mlt"; rev-prefix = "v"; }; diff --git a/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix index e9779cf0a054..8b5753b3aca9 100644 --- a/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The official C client library for MongoDB"; - homepage = "https://github.com/mongodb/mongo-c-driver"; + homepage = "http://mongoc.org"; license = licenses.asl20; + mainProgram = "mongoc-stat"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/monocypher/default.nix b/nixpkgs/pkgs/development/libraries/monocypher/default.nix new file mode 100644 index 000000000000..7ce84cbba835 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/monocypher/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "monocypher"; + version = "3.1.3"; + + src = fetchurl { + url = "https://monocypher.org/download/monocypher-${version}.tar.gz"; + hash = "sha256-tEK1d98o+MNsqgHZrpARtd2ccX2UvlIBaKBONtf1AW4="; + }; + + patches = [ + # Fix cross-compilation + (fetchpatch { + url = "https://github.com/LoupVaillant/Monocypher/commit/376715e1c0ebb375e50dfa757bc89486c9a7b404.patch"; + hash = "sha256-tuwSUaU4w+jkaj10ChMgUmOQmoKYnv5JgJ1og8EXxFk="; + }) + ]; + + makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; + + doCheck = true; + + meta = with lib; { + description = "Boring crypto that simply works"; + homepage = "https://monocypher.org"; + license = with licenses; [ bsd2 cc0 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mpfr/default.nix b/nixpkgs/pkgs/development/libraries/mpfr/default.nix index fc7eeeab9420..bf1625cf2f9f 100644 --- a/nixpkgs/pkgs/development/libraries/mpfr/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpfr/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" "info" ]; + strictDeps = true; # mpfr.h requires gmp.h propagatedBuildInputs = [ gmp ]; diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix index bff44d8aaf56..60e543c46296 100644 --- a/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -11,17 +11,20 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "11rnljqwz6mr88ybj726mk710h7gvz20hy7labmz4jkkaa0gx8b6"; + sha256 = "0hnxvqhhscp3h70zf538dhqz9jwmqpwwnj3fqabdk8nli6lg2hjs"; }; configureFlags = [ "--enable-shared" "--enable-sharedlib" "--with-pm=${withPm}" + ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ + "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 + "FCFLAGS=-fallow-argument-mismatch" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/mps/default.nix b/nixpkgs/pkgs/development/libraries/mps/default.nix index 81b102d9bc36..f990d4de7d6b 100644 --- a/nixpkgs/pkgs/development/libraries/mps/default.nix +++ b/nixpkgs/pkgs/development/libraries/mps/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { + broken = true; description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; license = lib.licenses.sleepycat; diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 619ed721dff2..81b84e1a11fe 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00="; + sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix b/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix index 373f232a9866..ce6dd1d21a9b 100644 --- a/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mustache"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"; }; - nativeBuildInputs = [ cmake ]; + dontBuild = true; installPhase = '' mkdir -p $out/include - cp ../mustache.hpp $out/include + cp mustache.hpp $out/include ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/mvapich/default.nix b/nixpkgs/pkgs/development/libraries/mvapich/default.nix index c496927ebca5..0f358c279628 100644 --- a/nixpkgs/pkgs/development/libraries/mvapich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mvapich/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "--enable-threads=multiple" "--enable-hybrid" "--enable-shared" + "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 ] ++ optional useSlurm "--with-pm=slurm" ++ optional (network == "ethernet") "--with-device=ch3:sock" ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ] diff --git a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix index 477ff27078bf..36208fc09a81 100644 --- a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.4.3"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "sha256-znIX1S0mfOqLYPIcyVziUM1asBjENPEAdafLud1CfFI="; + sha256 = "sha256-NcewcNQcI1CjMNibRF9HCoE2Ibs0/Hy4eOkJ20W3wLo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/nanomsg/default.nix b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix index 49a93abd7fb0..2bc86edef70a 100644 --- a/nixpkgs/pkgs/development/libraries/nanomsg/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; license = licenses.mit; + mainProgram = "nanocat"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/nanopb/default.nix b/nixpkgs/pkgs/development/libraries/nanopb/default.nix index c70298c4ff82..748b02a2ecab 100644 --- a/nixpkgs/pkgs/development/libraries/nanopb/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanopb/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nanopb"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0cjfkwwzi018kc0b7lia7z2jdfgibqc99mf8rvj2xq2pfapp9kf1"; + sha256 = "sha256-B9J+GkgOBR4iZaP6/2ykcjbkifoyhkuukkjK/CLBZj0="; }; nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ]; diff --git a/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/nixpkgs/pkgs/development/libraries/ncnn/default.nix index 8c0f213b8298..0b07fab8668c 100644 --- a/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,18 +11,17 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220216"; + version = "20220729"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; + sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; }; patches = [ ./cmakelists.patch - ./gpu-include.patch ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/ncnn/gpu-include.patch b/nixpkgs/pkgs/development/libraries/ncnn/gpu-include.patch deleted file mode 100644 index 8f751c769947..000000000000 --- a/nixpkgs/pkgs/development/libraries/ncnn/gpu-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gpu.cpp b/src/gpu.cpp -index 51cd7f95..bf7ed828 100644 ---- a/src/gpu.cpp -+++ b/src/gpu.cpp -@@ -21,7 +21,7 @@ - #include <vulkan/vulkan.h> - - #include "glslang/SPIRV/GlslangToSpv.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include "glslang/Public/ShaderLang.h" - - #include "command.h" - #include "layer.h" diff --git a/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/nixpkgs/pkgs/development/libraries/ncurses/default.nix index 2740b95986c9..2cfe41956a4b 100644 --- a/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -11,18 +11,16 @@ }: stdenv.mkDerivation rec { - # Note the revision needs to be adjusted. - version = "6.3"; + ver = "6.3"; + # We pick fresh intermediate release to get a fix for CVE-2022-29458 + # which was fixed in 20220416 patchset. + patchver = "20220507"; + version = "${ver}-p${patchver}"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; - # We cannot use fetchFromGitHub (which calls fetchzip) - # because we need to be able to use fetchurlBoot. - src = let - # Note the version needs to be adjusted. - rev = "v${version}"; - in fetchurl { - url = "https://github.com/mirror/ncurses/archive/${rev}.tar.gz"; - sha256 = "1mawdjhzl2na2j0dylwc37f5w95rhgyvlwnfhww5rz2r7fgkvayv"; + src = fetchurl { + url = "https://invisible-island.net/archives/ncurses/current/ncurses-${ver}-${patchver}.tgz"; + sha256 = "02y4n4my5qqhw3fdhdjv1zc9xpyglzlzmzjwq2zcwbwv738255ja"; }; outputs = [ "out" "dev" "man" ]; @@ -43,7 +41,17 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isWindows [ "--enable-sp-funcs" "--enable-term-driver" - ]; + ] ++ lib.optionals (stdenv.hostPlatform.isUnix && stdenv.hostPlatform.isStatic) [ + # For static binaries, the point is to have a standalone binary with + # minimum dependencies. So here we make sure that binaries using this + # package won't depend on a terminfo database located in the Nix store. + "--with-terminfo-dirs=${lib.concatStringsSep ":" [ + "/etc/terminfo" # Debian, Fedora, Gentoo + "/lib/terminfo" # Debian + "/usr/share/terminfo" # upstream default, probably all FHS-based distros + "/run/current-system/sw/share/terminfo" # NixOS + ]}" + ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; diff --git a/nixpkgs/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix index 90032f774bbc..7ea64aa3f134 100644 --- a/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { description = "NDI Software Developer Kit"; platforms = ["x86_64-linux"]; hydraPlatforms = []; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; }; } diff --git a/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/nixpkgs/pkgs/development/libraries/ndpi/default.nix index 2e8a997299f1..b798320c6913 100644 --- a/nixpkgs/pkgs/development/libraries/ndpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndpi/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; + mainProgram = "ndpiReader"; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/neardal/default.nix b/nixpkgs/pkgs/development/libraries/neardal/default.nix index bbcefa0a4433..94014d0a4e98 100644 --- a/nixpkgs/pkgs/development/libraries/neardal/default.nix +++ b/nixpkgs/pkgs/development/libraries/neardal/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ autoconf automake libtool glib readline ]; + nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ]; + buildInputs = [ glib readline ]; preConfigure = '' substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" @@ -23,10 +23,11 @@ stdenv.mkDerivation { configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "C APIs to exchange datas with the NFC daemon 'Neard'"; license = licenses.lgpl2; homepage = "https://01.org/linux-nfc"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 980424b7fd48..68c0dff173a3 100644 --- a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml +, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1wpq1vyjqra877vwc3n4i0c1dyhmabyn993cslf1k142ikyc0a8w"; + sha256 = "sha256-hdfiF3CUosOksx+Fze54kPfDqS9hvXWmCBB1VQ4uyiQ="; }; nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; + buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ]; meta = with lib; { description = "A VNC server library"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix index 1521c1a63895..5250dcddf845 100644 --- a/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { (lib.withFeature sslSupport "ssl") ]; + preConfigure = '' + export PKG_CONFIG="$(command -v "$PKG_CONFIG")" + ''; + passthru = {inherit compressionSupport sslSupport;}; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix index 40f22b0cabe5..d64d631f94ce 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin CoreFoundation; doCheck = true; + FFLAGS = [ "-std=legacy" ]; + FCFLAGS = [ "-std=legacy" ]; + meta = with lib; { description = "Fortran API to manipulate netcdf files"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; diff --git a/nixpkgs/pkgs/development/libraries/netcdf/default.nix b/nixpkgs/pkgs/development/libraries/netcdf/default.nix index 27af3be4f2df..76478bc80c65 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf/default.nix @@ -1,7 +1,7 @@ { lib, stdenv -, fetchpatch -, fetchurl +, fetchurl, unzip , hdf5 +, libxml2 , m4 , curl # for DAP , removeReferencesTo @@ -11,25 +11,13 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; - version = "4.8.0"; # Remove patch mentioned below on upgrade + version = "4.9.0"; src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz"; - sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; + url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz"; + hash = "sha256-TJVgIrecCOXhTu6N9RsTwo5hIcK35/qtwhs3WUlAC0k="; }; - patches = [ - # Fixes: - # *** Checking vlen of compound file...Sorry! Unexpected result, tst_h_atts3.c, line: 289 - # FAIL tst_h_atts3 (exit status: 2) - # TODO: Remove with next netcdf release (see https://github.com/Unidata/netcdf-c/pull/1980) - (fetchpatch { - name = "netcdf-Fix-tst_h_atts3-for-hdf5-1.12.patch"; - url = "https://github.com/Unidata/netcdf-c/commit/9fc8ae62a8564e095ff17f4612874581db0e4db5.patch"; - sha256 = "128kxz5jikq32x5qjmi0xdngi0k336rf6bvbcppvlk5gibg5nk7v"; - }) - ]; - postPatch = '' patchShebangs . @@ -40,7 +28,13 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ m4 removeReferencesTo ]; - buildInputs = [ hdf5 curl mpi ]; + + buildInputs = [ + curl + hdf5 + libxml2 + mpi + ]; passthru = { inherit mpiSupport mpi; @@ -60,14 +54,18 @@ in stdenv.mkDerivation rec { remove-references-to -t ${stdenv.cc} "$(readlink -f $out/lib/libnetcdf.settings)" ''; - doCheck = !mpiSupport; + doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); + checkInputs = [ unzip ]; + + preCheck = '' + export HOME=$TEMP + ''; meta = { - description = "Libraries for the Unidata network Common Data Format"; - platforms = lib.platforms.unix; - homepage = "https://www.unidata.ucar.edu/software/netcdf/"; - license = { - url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html"; - }; + description = "Libraries for the Unidata network Common Data Format"; + platforms = lib.platforms.unix; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; + changelog = "https://docs.unidata.ucar.edu/netcdf-c/${version}/RELEASE_NOTES.html"; + license = lib.licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/development/libraries/nettle/default.nix b/nixpkgs/pkgs/development/libraries/nettle/default.nix index 0e3c18c0ac30..ed4948cd7f80 100644 --- a/nixpkgs/pkgs/development/libraries/nettle/default.nix +++ b/nixpkgs/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.7.3"; + version = "3.8"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1w5wwc3q0r97d2ifhx77cw7y8s20bm8x52is9j93p2h47yq5w7v6"; + hash = "sha256-dXbGhIHBmPZEsIwWDRpIULqUSeMIBpRVtSEzGfI06OY="; }; } diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index bd639ec3041a..ca8cb6418190 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -1,90 +1,106 @@ -{ lib, stdenv, fetchurl, pkg-config - -# Optional Dependencies -, openssl ? null, zlib ? null -, enableLibEv ? !stdenv.hostPlatform.isWindows, libev ? null -, enableCAres ? !stdenv.hostPlatform.isWindows, c-ares ? null -, enableHpack ? false, jansson ? null -, enableAsioLib ? false, boost ? null -, enableGetAssets ? false, libxml2 ? null -, enableJemalloc ? false, jemalloc ? null +{ lib +, stdenv +, fetchurl +, installShellFiles +, pkg-config + +# Optional dependencies , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic -, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null +, c-ares, libev, openssl, zlib +, enableAsioLib ? false, boost +, enableGetAssets ? false, libxml2 +, enableHpack ? false, jansson +, enableJemalloc ? false, jemalloc +, enablePython ? false, python3Packages, ncurses + +# Unit tests ; we have to set TZDIR, which is a GNUism. +, enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata # downstream dependencies, for testing , curl , libsoup }: -# Note: this package is used for bootstrapping fetchurl, and thus -# cannot use fetchpatch! All mutable patches (generated by GitHub or -# cgit) that are needed here should be included directly in Nixpkgs as -# files. - -assert enableHpack -> jansson != null; -assert enableAsioLib -> boost != null; -assert enableGetAssets -> libxml2 != null; -assert enableJemalloc -> jemalloc != null; -assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; +# Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch! +# All mutable patches (generated by GitHub or cgit) that are needed here +# should be included directly in Nixpkgs as files. -let inherit (lib) optional optionals optionalString; in +assert enableGetAssets -> enableApp; +assert enableHpack -> enableApp; +assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.43.0"; + version = "1.47.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0qhgyphzdv72dgdfxin2xbk9623za3jwbcvhhaxixiwp6djj8vsm"; + sha256 = "11d6w8iqrhnxmjd9ss9fzf66f7a32d48h2ihyk1580lg8d3rkj07"; }; outputs = [ "bin" "out" "dev" "lib" ] - ++ optional enablePython "python"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ optional enableLibEv libev - ++ [ zlib ] - ++ optional enableCAres c-ares - ++ optional enableHpack jansson - ++ optional enableAsioLib boost - ++ optional enableGetAssets libxml2 - ++ optional enableJemalloc jemalloc - ++ optionals enablePython [ python ncurses setuptools ]; + ++ lib.optionals (enablePython) [ "python" ]; + + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals (enableApp) [ installShellFiles ] + ++ lib.optionals (enablePython) [ python3Packages.cython ]; + + buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ] + ++ lib.optionals (enableAsioLib) [ boost ] + ++ lib.optionals (enableGetAssets) [ libxml2 ] + ++ lib.optionals (enableHpack) [ jansson ] + ++ lib.optionals (enableJemalloc) [ jemalloc ] + ++ lib.optionals (enablePython) [ python3Packages.python ncurses python3Packages.setuptools ]; enableParallelBuilding = true; configureFlags = [ - "--with-spdylay=no" "--disable-examples" (lib.enableFeature enableApp "app") - ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" - ++ (if enablePython then [ - "--with-cython=${cython}/bin/cython" - ] else [ - "--disable-python-bindings" - ]); - - preInstall = optionalString enablePython '' - mkdir -p $out/${python.sitePackages} + ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] + ++ lib.optionals (enablePython) [ "--with-cython=${python3Packages.cython}/bin/cython" ]; + + # Unit tests require CUnit and setting TZDIR environment variable + doCheck = enableTests; + checkInputs = lib.optionals (enableTests) [ cunit tzdata ]; + preCheck = lib.optionalString (enableTests) '' + export TZDIR=${tzdata}/share/zoneinfo + ''; + + preInstall = lib.optionalString (enablePython) '' + mkdir -p $out/${python3Packages.python.sitePackages} # convince installer it's ok to install here - export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" + export PYTHONPATH="$PYTHONPATH:$out/${python3Packages.python.sitePackages}" ''; - postInstall = optionalString enablePython '' - mkdir -p $python/${python.sitePackages} - mv $out/${python.sitePackages}/* $python/${python.sitePackages} + postInstall = lib.optionalString (enablePython) '' + mkdir -p $python/${python3Packages.python.sitePackages} + mv $out/${python3Packages.python.sitePackages}/* $python/${python3Packages.python.sitePackages} + rm -r $out/lib + '' + lib.optionalString (enableApp) '' + installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} ''; - #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc - passthru.tests = { inherit curl libsoup; }; meta = with lib; { + description = "HTTP/2 C library and tools"; + longDescription = '' + nghttp2 is an implementation of the HyperText Transfer Protocol version 2 in C. + The framing layer of HTTP/2 is implemented as a reusable C library. On top of that, + we have implemented an HTTP/2 client, server and proxy. We have also developed + load test and benchmarking tools for HTTP/2. + An HPACK encoder and decoder are available as a public API. + We have Python bindings of this library, but we do not have full code coverage yet. + An experimental high level C++ library is also available. + ''; + homepage = "https://nghttp2.org/"; - description = "A C implementation of HTTP/2"; + changelog = "https://github.com/nghttp2/nghttp2/releases/tag/v${version}"; + # News articles with changes summary can be found here: https://nghttp2.org/blog/archives/ license = licenses.mit; + maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index fc2416c2cfb0..41bf84c5b69b 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -1,19 +1,21 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config -, cunit, file, ncurses +, autoreconfHook, pkg-config, file +, cunit, ncurses }: stdenv.mkDerivation rec { pname = "nghttp3"; - version = "unstable-2021-12-22"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "8d8184acf850b06b53157bba39022bc7b7b5f1cd"; - sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E="; + rev = "v${version}"; + sha256 = "sha256-q9rXvMeCXhyytiaGekRlowCYKzvq8aktfN0lk+VPG78="; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; checkInputs = [ cunit ncurses ]; @@ -21,8 +23,6 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file ''; - outputs = [ "out" "dev" ]; - doCheck = true; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index 650516d360cf..90372cc97a26 100644 --- a/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -1,21 +1,23 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config -, cunit, file, ncurses +, autoreconfHook, pkg-config, file , libev, nghttp3, quictls +, cunit, ncurses , withJemalloc ? false, jemalloc }: stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "unstable-2021-12-19"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "20c710a8789ec910455ae4e588c72e9e39f8cec9"; - sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M="; + rev = "v${version}"; + sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no="; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; checkInputs = [ cunit ncurses ]; @@ -24,8 +26,6 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file ''; - outputs = [ "out" "dev" ]; - doCheck = true; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix index c17a0e8c7fe7..e626c3abfe2f 100644 --- a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-Zz8cPHK4w0qimYu6III6XfiKVQIzEMMV9P6ER5fveZY="; + hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64="; }; + patches = [ ./nix-2.9.patch ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ nix boost ]; diff --git a/nixpkgs/pkgs/development/libraries/nix-plugins/nix-2.9.patch b/nixpkgs/pkgs/development/libraries/nix-plugins/nix-2.9.patch new file mode 100644 index 000000000000..f1dc2909175d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nix-plugins/nix-2.9.patch @@ -0,0 +1,35 @@ +diff --git a/extra-builtins.cc b/extra-builtins.cc +index 617807a..c417cb3 100644 +--- a/extra-builtins.cc ++++ b/extra-builtins.cc +@@ -27,7 +27,7 @@ static ExtraBuiltinsSettings extraBuiltinsSettings; + + static GlobalConfig::Register rp(&extraBuiltinsSettings); + +-static void extraBuiltins(EvalState & state, const Pos & pos, ++static void extraBuiltins(EvalState & state, const PosIdx pos, + Value ** _args, Value & v) + { + static auto extraBuiltinsFile = absPath(extraBuiltinsSettings.extraBuiltinsFile); +@@ -44,10 +44,10 @@ static void extraBuiltins(EvalState & state, const Pos & pos, + auto attrs = state.buildBindings(2); + + auto sExec = state.symbols.create("exec"); +- attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = sExec }); ++ attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = "exec" }); + + auto sImportNative = state.symbols.create("importNative"); +- attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = sImportNative }); ++ attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = "importNative" }); + + arg = state.allocValue(); + arg->mkAttrs(attrs); +@@ -64,7 +64,7 @@ static void extraBuiltins(EvalState & state, const Pos & pos, + static RegisterPrimOp rp1("__extraBuiltins", 0, + extraBuiltins); + +-static void cflags(EvalState & state, const Pos & _pos, ++static void cflags(EvalState & state, const PosIdx _pos, + Value ** _args, Value & v) + { + auto attrs = state.buildBindings(3); diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index d8ae8fcaa4ae..ec4df7927f2b 100644 --- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -10,23 +10,23 @@ let rev = "v3.0.0"; sha256 = "O6p2PFB7c2KE9VqWvmTaFywbW1hSzAP5V42EuemX+ls="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; - version = "3.10.2"; + version = "3.10.5"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; - rev = "v${version}"; - sha256 = "/OFNfukrIyfJmD0ko174aud9T6ZOesHANJjyfk4q/Vs="; + rev = "v${finalAttrs.version}"; + sha256 = "DTsZrdB9GcaNkx7ZKxcgCA3A9ShM5icSF0xyGguJNbk="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBuildTests=${if doCheck then "ON" else "OFF"}" + "-DBuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" - ] ++ lib.optional doCheck "-DJSON_TestDataDirectory=${testData}"; + ] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -44,4 +44,4 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/nixpkgs/pkgs/development/libraries/nlopt/default.nix index 279c8a0fd054..2fae17a23236 100644 --- a/nixpkgs/pkgs/development/libraries/nlopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, octave ? null }: +{ lib, stdenv, fetchFromGitHub, cmake, octave ? null, libiconv }: stdenv.mkDerivation rec { pname = "nlopt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = [ octave ]; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/nixpkgs/pkgs/development/libraries/notcurses/default.nix index d23401c0fb49..21b10ad4ed15 100644 --- a/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/nixpkgs/pkgs/development/libraries/notcurses/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-tFdxQEYmSFr3GlJMud2ICToR+IB5sGnQkARUd/LtJXg="; + sha256 = "sha256-5SNWk1iKDNbyoo413Qvzl2bGaR5Lb+q/UPbPQg7YvRU="; }; outputs = [ "out" "dev" ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { replacement for NCURSES on existing systems. ''; license = licenses.asl20; - maintainers = with maintainers; [ jb55 AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; inherit (ncurses.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/libraries/nrf5-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nrf5-sdk/default.nix new file mode 100644 index 000000000000..c8667287a002 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nrf5-sdk/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "nrf5-sdk"; + version = "17.1.0"; + + urlHash = "ddde560"; + + src = fetchzip { + url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/sdks/nrf5/binaries/nrf5_sdk_${version}_${urlHash}.zip"; + sha256 = "sha256-q4WQ7X7/z/42/qcii+mOLnobqcbUy0tInkOfRH/Gwus="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/nRF5_SDK + mv * $out/share/nRF5_SDK + rm $out/share/nRF5_SDK/*.msi + + runHook postInstall + ''; + + meta = with lib; { + description = "Nordic Semiconductor nRF5 Software Development Kit"; + homepage = "https://www.nordicsemi.com/Products/Development-software/nRF5-SDK"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ stargate01 ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/nspr/default.nix b/nixpkgs/pkgs/development/libraries/nspr/default.nix index 1a8eb93ce3d4..44d172dba859 100644 --- a/nixpkgs/pkgs/development/libraries/nspr/default.nix +++ b/nixpkgs/pkgs/development/libraries/nspr/default.nix @@ -3,15 +3,16 @@ , fetchurl , CoreServices , buildPackages +, nixosTests }: stdenv.mkDerivation rec { pname = "nspr"; - version = "4.33"; + version = "4.34.1"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "1mwklrsx05ga30crr9xi6nl4d49d5mzx2x533bxw4l0fpqay6gmj"; + hash = "sha256-xbg1TEi2Mrj0wZcGKBRsDgwMqPMscxXX1XNsAC4Dd08="; }; patches = [ @@ -44,10 +45,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ajs124 hexa ]; platforms = platforms.all; license = licenses.mpl20; }; diff --git a/nixpkgs/pkgs/development/libraries/nss/85_security_load_3.77+.patch b/nixpkgs/pkgs/development/libraries/nss/85_security_load_3.77+.patch new file mode 100644 index 000000000000..bae86c9d26ad --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nss/85_security_load_3.77+.patch @@ -0,0 +1,76 @@ +diff --git nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c +index ad8f3b84e..74676d039 100644 +--- nss/cmd/shlibsign/shlibsign.c ++++ nss/cmd/shlibsign/shlibsign.c +@@ -875,6 +875,8 @@ main(int argc, char **argv) + goto cleanup; + } + lib = PR_LoadLibrary(libname); ++ if (!lib) ++ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so"); + assert(lib != NULL); + if (!lib) { + PR_fprintf(PR_STDERR, "loading softokn3 failed"); +diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c +index 119c8c512..720d39ccc 100644 +--- nss/lib/pk11wrap/pk11load.c ++++ nss/lib/pk11wrap/pk11load.c +@@ -486,6 +486,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) + #else + library = PR_LoadLibrary(mod->dllName); + #endif // defined(_WIN32) ++#ifndef NSS_STATIC_SOFTOKEN ++ if ((library == NULL) && ++ !rindex(mod->dllName, PR_GetDirectorySeparator())) { ++ library = PORT_LoadLibraryFromOrigin(my_shlib_name, ++ (PRFuncPtr) &softoken_LoadDSO, ++ mod->dllName); ++ } ++#endif ++ + mod->library = (void *)library; + + if (library == NULL) { +diff --git nss/lib/util/secload.c nss/lib/util/secload.c +index 12efd2f75..8b74478f6 100644 +--- nss/lib/util/secload.c ++++ nss/lib/util/secload.c +@@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) + + /* Remove the trailing filename from referencePath and add the new one */ + c = strrchr(referencePath, PR_GetDirectorySeparator()); ++ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] ++ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ ++ referencePath = NIX_NSS_LIBDIR; ++ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ ++ } + if (c) { + size_t referencePathSize = 1 + c - referencePath; +- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1); ++ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); + if (fullName) { + memcpy(fullName, referencePath, referencePathSize); + strcpy(fullName + referencePathSize, name); +@@ -82,6 +87,11 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) + #endif + libSpec.type = PR_LibSpec_Pathname; + libSpec.value.pathname = fullName; ++ if ((referencePathSize >= 4) && ++ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { ++ memcpy(fullName + referencePathSize -4, "lib", 3); ++ } ++ strcpy(fullName + referencePathSize, name); + dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL + #ifdef PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory +@@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) + | PR_LD_ALT_SEARCH_PATH + #endif + ); ++ if (! dlh) { ++ strcpy(fullName + referencePathSize, name); ++ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); ++ } + PORT_Free(fullName); + } + } diff --git a/nixpkgs/pkgs/development/libraries/nss/esr.nix b/nixpkgs/pkgs/development/libraries/nss/esr.nix new file mode 100644 index 000000000000..a789f0306d32 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nss/esr.nix @@ -0,0 +1,4 @@ +import ./generic.nix { + version = "3.68.4"; + hash = "sha256-K5/T9aG0nzs7KdEgAmdPcEgRViV1b7R3KELsfDm+Fgs="; +} diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix index d17f4c4a7835..febc2423388e 100644 --- a/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -1,3 +1,4 @@ +{ version, hash }: { lib , stdenv , fetchurl @@ -14,6 +15,7 @@ , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false +, nixosTests }: let @@ -22,21 +24,15 @@ let sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - # NOTE: Whenever you updated this version check if the `cacert` package also - # needs an update. You can run the regular updater script for cacerts. - # It will rebuild itself using the version of this package (NSS) and if - # an update is required do the required changes to the expression. - # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.75"; - + underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version; in stdenv.mkDerivation rec { pname = "nss"; inherit version; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "10l5qn68gly2l4ifv0v6by1qc8nsmhra08nm9m7n913jh83iamzx"; + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + inherit hash; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -67,7 +63,11 @@ stdenv.mkDerivation rec { patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - ./85_security_load.patch + (if (lib.versionOlder version "3.77") then + ./85_security_load.patch + else + ./85_security_load_3.77+.patch + ) ./ckpem.patch ./fix-cross-compilation.patch ]; @@ -187,10 +187,17 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; + passthru.tests = lib.optionalAttrs (lib.versionOlder version "3.69") { + inherit (nixosTests) firefox-esr-91; + } // lib.optionalAttrs (lib.versionAtLeast version "3.69") { + inherit (nixosTests) firefox firefox-esr-102; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_${underscoreVersion}.rst"; + maintainers = with maintainers; [ hexa ajs124 ]; license = licenses.mpl20; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/nss/latest.nix b/nixpkgs/pkgs/development/libraries/nss/latest.nix new file mode 100644 index 000000000000..f313cc328822 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nss/latest.nix @@ -0,0 +1,10 @@ +# NOTE: Whenever you updated this version check if the `cacert` package also +# needs an update. You can run the regular updater script for cacerts. +# It will rebuild itself using the version of this package (NSS) and if +# an update is required do the required changes to the expression. +# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert + +import ./generic.nix { + version = "3.82"; + hash = "sha256-Mr9nO3LC+ZU+07THAzq/WmytMChUokrliMV1plZ8FXM="; +} diff --git a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix index a4538aa370cc..a6974295690e 100644 --- a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nss_wrapper"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; + sha256 = "sha256-zdBg/wnAO32i0wsMta00dSNNQ4rqJ5A9slwvFvVwIYY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/ntdb/default.nix b/nixpkgs/pkgs/development/libraries/ntdb/default.nix deleted file mode 100644 index 021436516c22..000000000000 --- a/nixpkgs/pkgs/development/libraries/ntdb/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv -, fetchurl -, python2 -, python3 -, pkg-config -, readline -, gettext -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_42 -, wafHook -}: - -stdenv.mkDerivation rec { - pname = "ntdb"; - version = "1.0"; - - src = fetchurl { - url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1"; - }; - - nativeBuildInputs = [ - pkg-config - gettext - libxslt - docbook-xsl-nons - docbook_xml_dtd_42 - wafHook - python2 # For wafHook - ]; - - buildInputs = [ - python3 - readline # required to build python - ]; - - wafPath = "buildtools/bin/waf"; - - wafConfigureFlags = [ - "--bundled-libraries=NONE" - "--builtin-libraries=replace,ccan" - ]; - - meta = with lib; { - description = "The not-so trivial database"; - homepage = "https://tdb.samba.org/"; - license = licenses.lgpl3Plus; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/ntl/default.nix b/nixpkgs/pkgs/development/libraries/ntl/default.nix index f204ae68fb52..9335bec35ce8 100644 --- a/nixpkgs/pkgs/development/libraries/ntl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntl/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { dontAddPrefix = true; # DEF_PREFIX instead + # Written in perl, does not support autoconf-style + # --build=/--host= options: + # Error: unrecognized option: --build=x86_64-unknown-linux-gnu + configurePlatforms = [ ]; + # reference: http://shoup.net/ntl/doc/tour-unix.html configureFlags = [ "DEF_PREFIX=$(out)" diff --git a/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix b/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix index ab09931579c7..64108c33b7c1 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = (appendToName "with-dicts" nuspell).name; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' - makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath} + makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${lib.escapeShellArg searchPath} ''; meta = removeAttrs nuspell.meta ["outputsToInstall"]; } diff --git a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 1ba000a8103b..7225efad2f68 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY="; + sha256 = "sha256-/9PCqjs0hiIM7ZLvDesff5Bh0a1B8/w/CTw62spw+j4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/octomap/default.nix b/nixpkgs/pkgs/development/libraries/octomap/default.nix index e35a0df79f08..9b1635511ec6 100644 --- a/nixpkgs/pkgs/development/libraries/octomap/default.nix +++ b/nixpkgs/pkgs/development/libraries/octomap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "octomap"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "OctoMap"; repo = pname; rev = "v${version}"; - sha256 = "1pb58w6vka7wzs533lcy7i6y5nwjfrzy6b35fhrb1dhq2mgszc79"; + hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; }; sourceRoot = "source/octomap"; diff --git a/nixpkgs/pkgs/development/libraries/odpic/default.nix b/nixpkgs/pkgs/development/libraries/odpic/default.nix index b9095f214814..2c5d0e2a3d56 100644 --- a/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "4.3.0"; + version = "4.4.1"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-oL2yehjP8JJxU19VY4e/ueh2xjo1yp4X7FGslqCXO8A="; + sha256 = "sha256-tc6N19jSLkuOvTe5f/pBAd1FvpnOjsa4V9CgygUvpZo="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/nixpkgs/pkgs/development/libraries/okapi/default.nix b/nixpkgs/pkgs/development/libraries/okapi/default.nix index c8981c54c114..b7a75ad6d1b9 100644 --- a/nixpkgs/pkgs/development/libraries/okapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/okapi/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "okapi"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; - sha256 = "sha256-wNruDPjYHDJtpzQIly4da9rQg1ftdCVxRNNLkFsbKXs="; + sha256 = "sha256-wszpCzh1VhqBlox7ywWi6WKUmxQUTsf5N5IiJumlEbM="; }; cargoVendorDir = "vendor"; diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index 6392383c983f..47a265687122 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.10"; + version = "3.2.12"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; + sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 42f05a656163..8137f2b55b31 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.3.2"; + version = "2.6.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-sfTcBthrnt7m9AnzdwWl9yLu1jRpwUp8i9s9DlA3IJo="; + sha256 = "sha256-cO8hT5ZrA9VegxOFH9fHm3YKK4A6XmaWIAfPTytNu6I="; }; outputs = [ "out" "dev" "doc" ]; @@ -21,18 +21,6 @@ stdenv.mkDerivation rec { # Tests fail on some Hydra builders, because they do not support SSE4.2. doCheck = false; - # The test driver doesn't add an RPath to the build libdir - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src - ''; - - # The cmake install gets tripped up and installs a nix tree into $out, in - # addition to the correct install; clean it up. - postInstall = '' - rm -r $out/nix - ''; - meta = with lib; { description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; diff --git a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix index e50750d58ec0..bc084829e7bb 100644 --- a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix +++ b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "onig"; - version = "6.9.7.1"; + version = "6.9.8"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "sha256-IBWxmzmVdKTkHbfy7V8ejpeIdfOU/adGwpUTCMdLU3w="; + sha256 = "sha256-8aFZdhh6ovLCR0A17rvWq/Oif66rSMnHcCYHjClNElw="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix new file mode 100644 index 000000000000..e3ef22676412 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -0,0 +1,117 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, fetchurl +, pkg-config +, cmake +, python3 +, libpng +, zlib +, eigen +, protobuf +, howard-hinnant-date +, nlohmann_json +, boost +, oneDNN +, gtest +}: + +let + # prefetch abseil + # Note: keep URL in sync with `cmake/external/abseil-cpp.cmake` + abseil = fetchurl { + url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip"; + sha256 = "sha256-pFZ/8C+spnG5XjHTFbqxi0K2xvGmDpHG6oTlohQhEsI="; + }; +in +stdenv.mkDerivation rec { + pname = "onnxruntime"; + version = "1.12.1"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "onnxruntime"; + rev = "v${version}"; + sha256 = "sha256-wwllEemiHTp9aJcCd1gsTS4WUVMp5wW+4i/+6DzmAeM="; + fetchSubmodules = true; + }; + + patches = [ + # Use dnnl from nixpkgs instead of submodules + (fetchpatch { + name = "system-dnnl.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; + sha256 = "sha256-58RBrQnAWNtc/1pmFs+PkZ6qCsL1LfMY3P0exMKzotA="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + gtest + ]; + + buildInputs = [ + libpng + zlib + protobuf + howard-hinnant-date + nlohmann_json + boost + oneDNN + ]; + + # TODO: build server, and move .so's to lib output + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + cmakeDir = "../cmake"; + + cmakeFlags = [ + "-Donnxruntime_PREFER_SYSTEM_LIB=ON" + "-Donnxruntime_BUILD_SHARED_LIB=ON" + "-Donnxruntime_ENABLE_LTO=ON" + "-Donnxruntime_BUILD_UNIT_TESTS=ON" + "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" + "-Donnxruntime_USE_MPI=ON" + "-Deigen_SOURCE_PATH=${eigen.src}" + "-Donnxruntime_USE_DNNL=YES" + ]; + + doCheck = true; + + postPatch = '' + substituteInPlace cmake/external/abseil-cpp.cmake \ + --replace "${abseil.url}" "${abseil}" + ''; + + postInstall = '' + # perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh` + install -m644 -Dt $out/include \ + ../include/onnxruntime/core/framework/provider_options.h \ + ../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \ + ../include/onnxruntime/core/session/onnxruntime_*.h + ''; + + meta = with lib; { + description = "Cross-platform, high performance scoring engine for ML models"; + longDescription = '' + ONNX Runtime is a performance-focused complete scoring engine + for Open Neural Network Exchange (ONNX) models, with an open + extensible architecture to continually address the latest developments + in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX + standard with complete implementation of all ONNX operators, and + supports all ONNX releases (1.2+) with both future and backwards + compatibility. + ''; + homepage = "https://github.com/microsoft/onnxruntime"; + changelog = "https://github.com/microsoft/onnxruntime/releases/tag/v${version}"; + # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ jonringer puffnfresh ck3d ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix index d2cdebdf3553..fa1d5af48042 100644 --- a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix +++ b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix @@ -1,40 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , alsaSupport ? !stdenv.isDarwin, alsa-lib +, dbusSupport ? !stdenv.isDarwin, dbus +, pipewireSupport ? !stdenv.isDarwin, pipewire , pulseSupport ? !stdenv.isDarwin, libpulseaudio , CoreServices, AudioUnit, AudioToolbox }: stdenv.mkDerivation rec { pname = "openal-soft"; - version = "1.21.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; rev = version; - sha256 = "sha256-rgc6kjXaZb6sCR+e9Gu7BEEHIiCHMygpLIeSqgWkuAg="; + sha256 = "sha256-MVM0qCZDWcO7/Hnco+0dBqzBLcWD279xjx0slxxlc4w="; }; # this will make it find its own data files (e.g. HRTF profiles) # without any other configuration patches = [ ./search-out.patch ]; postPatch = '' - substituteInPlace alc/helpers.cpp \ + substituteInPlace core/helpers.cpp \ --replace "@OUT@" $out ''; strictDeps = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc - ++ lib.optional alsaSupport alsa-lib + buildInputs = lib.optional alsaSupport alsa-lib + ++ lib.optional dbusSupport dbus + ++ lib.optional pipewireSupport pipewire ++ lib.optional pulseSupport libpulseaudio ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; - NIX_LDFLAGS = toString ( - lib.optional alsaSupport "-lasound" - ++ lib.optional pulseSupport "-lpulse"); + cmakeFlags = [ + # Automatically links dependencies without having to rely on dlopen, thus + # removes the need for NIX_LDFLAGS. + "-DALSOFT_DLOPEN=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # https://github.com/NixOS/nixpkgs/issues/183774 + "-DOSS_INCLUDE_DIR=${stdenv.cc.libc}/include" + ]; meta = with lib; { description = "OpenAL alternative"; diff --git a/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch index 796642aa3c89..5813cd48ee67 100644 --- a/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch +++ b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch @@ -1,7 +1,7 @@ diff --git a/alc/helpers.cpp b/alc/helpers.cpp index 8c1c856..19bbc0f 100644 ---- a/alc/helpers.cpp -+++ b/alc/helpers.cpp +--- a/core/helpers.cpp ++++ b/core/helpers.cpp @@ -402,6 +402,7 @@ al::vector<std::string> SearchDataFiles(const char *ext, const char *subdir) DirectorySearch(path.c_str(), ext, &results); diff --git a/nixpkgs/pkgs/development/libraries/openbr/default.nix b/nixpkgs/pkgs/development/libraries/openbr/default.nix deleted file mode 100644 index 8e56e250ac40..000000000000 --- a/nixpkgs/pkgs/development/libraries/openbr/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: - -stdenv.mkDerivation { - - version = "0.5"; - pname = "openbr"; - - src = fetchFromGitHub { - owner = "biometrics"; - repo = "openbr"; - rev = "cc364a89a86698cd8d3052f42a3cb520c929b325"; - sha256 = "12y00cf5dlzp9ciiwbihf6xhlkdxpydhscv5hwp83qjdllid9rrz"; - }; - - buildInputs = [ opencv qtbase qtsvg ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Open Source Biometric Recognition"; - homepage = "http://openbiometrics.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [flosse]; - platforms = with lib.platforms; linux; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix index 243dfa44d5b3..f4897331c938 100644 --- a/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix @@ -67,15 +67,15 @@ let in stdenv.mkDerivation rec { pname = "opencl-clang"; - version = "unstable-2021-06-22"; + version = "unstable-2022-03-16"; inherit passthru; src = fetchFromGitHub { owner = "intel"; repo = "opencl-clang"; - rev = "fd68f64b33e67d58f6c36b9e25c31c1178a1962a"; - sha256 = "sha256-q1YPBb/LY67iEuQx1fMUQD/I7OsNfobW3yNfJxLXx3E="; + rev = "bbdd1587f577397a105c900be114b56755d1f7dc"; + sha256 = "sha256-qEZoQ6h4XAvSnJ7/gLXBb1qrzeYa6Jp6nij9VFo8MwQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index a660008841a3..81ab688b6436 100644 --- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -1,40 +1,56 @@ -{ - stdenv, lib, fetchFromGitHub, - cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies - - glew, freeglut, # Only required on Linux - Carbon, GLUT, Cocoa, # Only required on Darwin - - pythonBindings ? true, # Python bindings - python3Packages, - - buildApps ? true, # Utility applications - lcms2, openimageio2, openexr, +{ stdenv +, lib +, fetchFromGitHub +, cmake +, expat +, libyamlcpp +, ilmbase +, pystring +, imath +# Only required on Linux +, glew +, freeglut +# Only required on Darwin +, Carbon +, GLUT +, Cocoa +# Python bindings +, pythonBindings ? true # Python bindings +, python3Packages +# Build apps +, buildApps ? true # Utility applications +, lcms2 +, openimageio2 +, openexr }: -with lib; - stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.0.2"; + version = "2.1.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA="; + sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ expat libyamlcpp ilmbase pystring ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] + buildInputs = [ + expat + libyamlcpp + ilmbase + pystring + imath + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] ++ lib.optionals buildApps [ lcms2 openimageio2 openexr ]; - cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ] - ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" - ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; + cmakeFlags = [ + "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" + ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 # doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/openct/default.nix b/nixpkgs/pkgs/development/libraries/openct/default.nix index 92dec5ee2334..e4b6110e1c15 100644 --- a/nixpkgs/pkgs/development/libraries/openct/default.nix +++ b/nixpkgs/pkgs/development/libraries/openct/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/OpenSC/openct/"; license = licenses.lgpl21; description = "Drivers for several smart card readers"; diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 0c6f9fb90c0c..ce7f98223357 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -13,6 +13,7 @@ , protobuf , config , ocl-icd +, buildPackages , enableJPEG ? true , libjpeg @@ -25,6 +26,8 @@ , enableEXR ? !stdenv.isDarwin , openexr , ilmbase +, enableJPEG2000 ? true +, openjpeg , enableEigen ? true , eigen , enableOpenblas ? true @@ -244,9 +247,9 @@ stdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = - [ zlib pcre hdf5 boost gflags protobuf ] + buildInputs = [ zlib pcre boost gflags protobuf ] ++ lib.optional enablePython pythonPackages.python + ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 ++ lib.optional enableVtk vtk @@ -255,6 +258,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] + ++ lib.optional enableJPEG2000 openjpeg ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -291,17 +295,23 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=OFF" "-DBUILD_PERF_TESTS=OFF" "-DBUILD_DOCS=${printEnabled enableDocs}" + # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT" + # but we have proper separation of build and host libs :), fixes cross + "-DOPENCV_ENABLE_PKG_CONFIG=ON" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "WEBP" enableWebP) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) + (opencvFlag "OPENJPEG" enableJPEG2000) + "-DWITH_JASPER=OFF" # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) (opencvFlag "TBB" enableTbb) diff --git a/nixpkgs/pkgs/development/libraries/opencv/default.nix b/nixpkgs/pkgs/development/libraries/opencv/default.nix index 34dcd240838e..73b0874dde5a 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip , zlib -, enablePython ? false, python2Packages , enableGtk2 ? false, gtk2 , enableJPEG ? true, libjpeg , enablePNG ? true, libpng @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] - ++ lib.optional enablePython python2Packages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng @@ -56,8 +54,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] ; - propagatedBuildInputs = lib.optional enablePython python2Packages.numpy; - nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -78,8 +74,6 @@ stdenv.mkDerivation rec { sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|" ''; - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; diff --git a/nixpkgs/pkgs/development/libraries/opendbx/default.nix b/nixpkgs/pkgs/development/libraries/opendbx/default.nix index 9a7877a9938a..0460f012424c 100644 --- a/nixpkgs/pkgs/development/libraries/opendbx/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendbx/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline libmysqlclient postgresql sqlite ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Extremely lightweight but extensible database access library written in C"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix index 2cd76a7ca78b..218059ab1afb 100644 --- a/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.3.5"; + version = "2.4.9"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; - rev = version; - sha256 = "sha256-GGaq8ziOCUDMxILq2QYUkSP4usBjbufbHwQF4Pr6hHw="; + rev = "v${version}"; + sha256 = "sha256-S/eJrSueJOv3+cUyzcCE3l287l0ihvzOZHB6ZCHtHpQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/openexr/3.nix b/nixpkgs/pkgs/development/libraries/openexr/3.nix index 3cfe173875c0..17d4382d0b93 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -9,24 +9,16 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.1.3"; - - outputs = [ "bin" "dev" "out" "doc" ]; + version = "3.1.5"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "sha256-Bi6yTcZBWTsWWMm3A7FVYblvSXKLSkHmhGvpNYGiOzE="; + sha256 = "sha256-mmzrMCYyAAa1z8fLZVbaTL1TZzdRaRTLgK+wzPuH4tg="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-45942.patch"; - url = "https://github.com/AcademySoftwareFoundation/openexr/commit/11cad77da87c4fa2aab7d58dd5339e254db7937e.patch"; - sha256 = "1qa8662ga5i0lyfi9mkj9s9bygdg7h1i6ahki28c664kxrlsakch"; - }) - ]; + outputs = [ "bin" "dev" "out" "doc" ]; # tests are determined to use /var/tmp on unix postPatch = '' @@ -35,14 +27,20 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ imath zlib ]; + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + imath + zlib + ]; doCheck = true; meta = with lib; { description = "A high dynamic-range (HDR) image file format"; - homepage = "https://www.openexr.com/"; + homepage = "https://www.openexr.com"; license = licenses.bsd3; maintainers = with maintainers; [ paperdigits ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/openfst/default.nix b/nixpkgs/pkgs/development/libraries/openfst/default.nix index 599d1cad0cc5..cf4984229129 100644 --- a/nixpkgs/pkgs/development/libraries/openfst/default.nix +++ b/nixpkgs/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A="; + sha256 = "sha256-3ph782JHIcXVujIa+VdRiY5PS7Qcijbi1k8GJ2Vti0I="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix b/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix index 06f2e3542bba..b84e4159f3e7 100644 --- a/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "opengrm-ngram"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; - sha256 = "sha256-5CXf6OXs7owny3yZQrWYA6yhIyN0dgA2B8TSDEUTF1Q="; + sha256 = "sha256-ivMPDy6CPM17hWCToLOVzUgcWZiEt2pjYeizeBLYnYc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/openh264/default.nix b/nixpkgs/pkgs/development/libraries/openh264/default.nix index 42ae370cd901..e85589af0c1a 100644 --- a/nixpkgs/pkgs/development/libraries/openh264/default.nix +++ b/nixpkgs/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l64xP39Uaislqh4D7oSxJiQGhXkklol4LgS9BVPbaGk="; + sha256 = "sha256-OSTsU2E4UWiwBqq3NqD0lj8uqVXeyd3MJ/gre6W2Jvs="; }; nativeBuildInputs = [ nasm ]; diff --git a/nixpkgs/pkgs/development/libraries/openhmd/default.nix b/nixpkgs/pkgs/development/libraries/openhmd/default.nix index a692dcb5e4e3..ce0630bee62f 100644 --- a/nixpkgs/pkgs/development/libraries/openhmd/default.nix +++ b/nixpkgs/pkgs/development/libraries/openhmd/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { "-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}" "-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}" "-DOpenGL_GL_PREFERENCE=GLVND" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; postInstall = lib.optionalString withExamples '' diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/default.nix b/nixpkgs/pkgs/development/libraries/openjpeg/default.nix index 32bfa6f24584..b26738c9ea15 100644 --- a/nixpkgs/pkgs/development/libraries/openjpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/openjpeg/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng libtiff lcms2 ]; - doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux + doCheck = (testsSupport && !stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # " diff --git a/nixpkgs/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix index f9e2b3c0b3fc..f357b8d4b720 100644 --- a/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,33 +1,49 @@ -{ lib, stdenv, fetchurl, openssl, db, groff, libtool, libsodium -, withCyrusSasl ? true +{ lib +, stdenv +, fetchurl +, fetchpatch + +# dependencies , cyrus_sasl +, db +, groff +, libsodium +, libtool +, openssl +, systemdMinimal }: stdenv.mkDerivation rec { pname = "openldap"; - version = "2.4.58"; + version = "2.6.3"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - sha256 = "sha256-V7WSVL4V0L9qmrPVFMHAV3ewISMpFTMTSofJRGj49Hs="; + hash = "sha256-0qKh1x3z13OWscFq11AuZ030RuBgcrDlpOlBw9BsDUY="; }; # TODO: separate "out" and "bin" - outputs = [ "out" "dev" "man" "devdoc" ]; + outputs = [ + "out" + "dev" + "man" + "devdoc" + ]; enableParallelBuilding = true; - nativeBuildInputs = [ groff ]; - - buildInputs = [ openssl cyrus_sasl db libsodium libtool ]; + nativeBuildInputs = [ + groff + ]; - # Disable install stripping as it breaks cross-compiling. - # We strip binaries anyway in fixupPhase. - makeFlags= [ - "STRIP=" - "prefix=$(out)" - "moduledir=$(out)/lib/modules" - "CC=${stdenv.cc.targetPrefix}cc" + buildInputs = [ + cyrus_sasl + db + libsodium + libtool + openssl + ] ++ lib.optionals (stdenv.isLinux) [ + systemdMinimal ]; preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' @@ -35,56 +51,65 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--enable-overlays" - "--disable-dependency-tracking" # speeds up one-time build - "--enable-modules" - "--sysconfdir=/etc" - "--localstatedir=/var" + "--enable-argon2" "--enable-crypt" + "--enable-modules" + "--enable-overlays" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes" - ] ++ lib.optional (!withCyrusSasl) "--without-cyrus-sasl" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + + NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; + + makeFlags= [ + "CC=${stdenv.cc.targetPrefix}cc" + "STRIP=" # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase. + "STRIP_OPTS=" + "prefix=${placeholder "out"}" + "sysconfdir=/etc" + "systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + # contrib modules require these + "moduledir=${placeholder "out"}/lib/modules" + "mandir=${placeholder "out"}/share/man" + ]; + + extraContribModules = [ + # https://git.openldap.org/openldap/openldap/-/tree/master/contrib/slapd-modules + "passwd/sha2" + "passwd/pbkdf2" + "passwd/totp" + ]; postBuild = '' - make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2 - make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2 - make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/argon2 + for module in $extraContribModules; do + make $makeFlags CC=$CC -C contrib/slapd-modules/$module + done ''; - doCheck = false; # needs a running LDAP server + preCheck = '' + substituteInPlace tests/scripts/all \ + --replace "/bin/rm" "rm" + ''; - installFlags = [ - "sysconfdir=$(out)/etc" - "localstatedir=$(out)/var" - "moduledir=$(out)/lib/modules" - # The argon2 module hardcodes /usr/bin/install as the path for the - # `install` binary, which is overridden here. - "INSTALL=install" - ]; + doCheck = true; - # 1. Libraries left in the build location confuse `patchelf --shrink-rpath` - # Delete these to let patchelf discover the right path instead. - # FIXME: that one can be removed when https://github.com/NixOS/patchelf/pull/98 - # is in Nixpkgs patchelf. - # 2. Fixup broken libtool for openssl and cyrus_sasl (if it is not disabled) + # The directory is empty and serve no purpose. preFixup = '' rm -r $out/var - rm -r libraries/*/.libs - rm -r contrib/slapd-modules/passwd/*/.libs - for f in $out/lib/libldap.la $out/lib/libldap_r.la; do - substituteInPlace "$f" --replace '-lssl' '-L${openssl.out}/lib -lssl' - '' + lib.optionalString withCyrusSasl '' - substituteInPlace "$f" --replace '-lsasl2' '-L${cyrus_sasl.out}/lib -lsasl2' - '' + '' - done ''; + installFlags = [ + "prefix=${placeholder "out"}" + "sysconfdir=${placeholder "out"}/etc" + "moduledir=${placeholder "out"}/lib/modules" + "INSTALL=install" + ]; + postInstall = '' - make $installFlags install -C contrib/slapd-modules/passwd/sha2 - make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2 - make $installFlags install-lib -C contrib/slapd-modules/passwd/argon2 + for module in $extraContribModules; do + make $installFlags install -C contrib/slapd-modules/$module + done chmod +x "$out"/lib/*.{so,dylib} ''; @@ -92,7 +117,7 @@ stdenv.mkDerivation rec { homepage = "https://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + maintainers = with maintainers; [ ajs124 das_j hexa ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index aac11dc83bda..ec12527b7350 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -27,11 +27,11 @@ let }; in stdenv.mkDerivation rec { pname = "openmpi"; - version = "4.1.2"; + version = "4.1.4"; src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v"; + sha256 = "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix index 4f83f22856e3..1f4ad96c2977 100644 --- a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch deleted file mode 100644 index 5ecfb4175569..000000000000 --- a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Configure b/Configure -index 494e0b3..0b448aa 100755 ---- a/Configure -+++ b/Configure -@@ -652,6 +652,8 @@ my %table=( - "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - # iPhoneOS/iOS - "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch deleted file mode 100644 index 5765409fdd57..000000000000 --- a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c -index e6d0e6e1a6..b89456fd87 100644 ---- a/crypto/x509/by_file.c -+++ b/crypto/x509/by_file.c -@@ -97,7 +97,10 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, - switch (cmd) { - case X509_L_FILE_LOAD: - if (argl == X509_FILETYPE_DEFAULT) { -- file = ossl_safe_getenv(X509_get_default_cert_file_env()); -+ file = ossl_safe_getenv("NIX_SSL_CERT_FILE"); -+ -+ if (!file) -+ file = ossl_safe_getenv(X509_get_default_cert_file_env()); - - if (file) - ok = (X509_load_cert_crl_file(ctx, file, diff --git a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch deleted file mode 100644 index 3d9ee7e6a822..000000000000 --- a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h ---- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100 -+++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100 -@@ -81,8 +81,8 @@ - - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # else - # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch b/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch deleted file mode 100644 index 813c6bdf44ab..000000000000 --- a/nixpkgs/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h ---- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100 -+++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100 -@@ -81,8 +81,8 @@ - - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # else - # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix deleted file mode 100644 index bae3e53f441f..000000000000 --- a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl, zlib -, withCryptodev ? false, cryptodev -}: - -with lib; -stdenv.mkDerivation { - pname = "openssl-chacha"; - version = "2016-08-22"; - - src = fetchFromGitHub { - owner = "PeterMosmans"; - repo = "openssl"; - rev = "293717318e903b95f4d7e83a98a087282f37efc3"; - sha256 = "134j3anjnj2q99xsd8d47bwvjp73qkdsimdd9riyjxa3hd8ysr00"; - }; - - outputs = [ "bin" "dev" "out" "man" ]; - setOutputFlags = false; - - nativeBuildInputs = [ perl zlib ]; - buildInputs = lib.optional withCryptodev cryptodev; - - configureScript = "./config"; - - configureFlags = [ - "zlib" - "shared" - "experimental-jpake" - "enable-md2" - "enable-rc5" - "enable-rfc3779" - "enable-gost" - "--libdir=lib" - "--openssldir=etc/ssl" - ] ++ lib.optionals withCryptodev [ - "-DHAVE_CRYPTODEV" - "-DUSE_CRYPTODEV_DIGESTS" - ]; - - makeFlags = [ - "MANDIR=$(man)/share/man" - ]; - - # Parallel building is broken in OpenSSL. - enableParallelBuilding = false; - - postInstall = '' - # If we're building dynamic libraries, then don't install static - # libraries. - if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then - rm "$out/lib/"*.a - fi - - mkdir -p $bin - mv $out/bin $bin/ - - mkdir $dev - mv $out/include $dev/ - - # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc - - rmdir $out/etc/ssl/{certs,private} - ''; - - postFixup = '' - # Check to make sure we don't depend on perl - if grep -r '${perl}' $out; then - echo "Found an erroneous dependency on perl ^^^" >&2 - exit 1 - fi - ''; - - meta = { - homepage = "https://www.openssl.org/"; - description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.cstrahan ]; - license = licenses.openssl; - priority = 10; # resolves collision with ‘man-pages’ - }; -} diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 33ddbf7018c5..0b4050c76cce 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -7,6 +7,7 @@ # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform +, removeReferencesTo }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -43,9 +44,23 @@ let substituteInPlace crypto/async/arch/async_posix.h \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + '' + # Move ENGINESDIR into OPENSSLDIR for static builds, in order to move + # it to the separate etc output. + + lib.optionalString static '' + substituteInPlace Configurations/unix-Makefile.tmpl \ + --replace 'ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}' \ + 'ENGINESDIR=$(OPENSSLDIR)/engines-{- $sover_dirname -}' ''; - outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc"; + outputs = [ "bin" "dev" "out" "man" ] + ++ lib.optional withDocs "doc" + # Separate output for the runtime dependencies of the static build. + # Specifically, move OPENSSLDIR into this output, as its path will be + # compiled into 'libcrypto.a'. This makes it a runtime dependency of + # any package that statically links openssl, so we want to keep that + # output minimal. + ++ lib.optional static "etc"; setOutputFlags = false; separateDebugInfo = !stdenv.hostPlatform.isDarwin && @@ -69,6 +84,12 @@ let x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; + mips64el-linux = + if stdenv.hostPlatform.isMips64n64 + then "./Configure linux64-mips64" + else if stdenv.hostPlatform.isMips64n32 + then "./Configure linux-mips64" + else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" @@ -95,7 +116,14 @@ let configureFlags = [ "shared" # "shared" builds both shared and static libraries "--libdir=lib" - "--openssldir=etc/ssl" + (if !static then + "--openssldir=etc/ssl" + else + # Move OPENSSLDIR to the 'etc' output for static builds. Prepend '/.' + # to the path to make it appear absolute before variable expansion, + # else the 'prefix' would be prepended to it. + "--openssldir=/.$(etc)/etc/ssl" + ) ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" @@ -106,7 +134,11 @@ let # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. - ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared"; + ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared" + # This introduces a reference to the CTLOG_FILE which is undesired when + # trying to build binaries statically. + ++ lib.optional static "no-ct" + ; makeFlags = [ "MANDIR=$(man)/share/man" @@ -120,13 +152,19 @@ let enableParallelBuilding = true; postInstall = - lib.optionalString (!static) '' + (if static then '' + # OPENSSLDIR has a reference to self + ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a + '' else '' # If we're building dynamic libraries, then don't install static # libraries. if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then rm "$out/lib/"*.a fi - '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + + # 'etc' is a separate output on static builds only. + etc=$out + '') + lib.optionalString (!stdenv.hostPlatform.isWindows) # Fix bin/c_rehash's perl interpreter line # # - openssl 1_0_2: embeds a reference to buildPackages.perl @@ -147,14 +185,15 @@ let mv $out/include $dev/ # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc + rm -r $etc/etc/ssl/misc - rmdir $out/etc/ssl/{certs,private} + rmdir $etc/etc/ssl/{certs,private} ''; postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' - # Check to make sure the main output doesn't depend on perl - if grep -r '${buildPackages.perl}' $out; then + # Check to make sure the main output and the static runtime dependencies + # don't depend on perl + if grep -r '${buildPackages.perl}' $out $etc; then echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 fi @@ -170,24 +209,10 @@ let in { - openssl_1_0_2 = common { - version = "1.0.2u"; - sha256 = "ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16"; - patches = [ - ./1.0.2/nix-ssl-cert-file.patch - - (if stdenv.hostPlatform.isDarwin - then ./1.0.2/use-etc-ssl-certs-darwin.patch - else ./1.0.2/use-etc-ssl-certs.patch) - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ - ./1.0.2/darwin64-arm64.patch - ]; - extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ]; - }; openssl_1_1 = common rec { - version = "1.1.1n"; - sha256 = "sha256-QNzrUaT2pSdb3g5r8g70uRv8Mu1XwFUuLo4VRjNysXo="; + version = "1.1.1q"; + sha256 = "sha256-15Oc5hQCnN/wtsIPDi5XAxWKSJpyslB7i9Ub+Mj9EMo="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -200,9 +225,9 @@ in { withDocs = true; }; - openssl_3_0 = common { - version = "3.0.2"; - sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M="; + openssl_3 = common { + version = "3.0.5"; + sha256 = "sha256-qn2Nm+9xrWUlxVuhHl9Dl4ic5Jwsk0nc6m0+TwsCSno="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 83eb77b603c5..026465c97ae8 100644 --- a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -1,6 +1,10 @@ { config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? config.cudaSupport or false, cudatoolkit + # For visibility mostly. The whole approach to cuda architectures and capabilities + # will be reworked soon. +, cudaArch ? "compute_37" +, openclSupport ? !cudaSupport , darwin }: @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi ] - ++ lib.optional (!stdenv.isDarwin) ocl-icd + ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ]) ++ lib.optional cudaSupport cudatoolkit; @@ -37,8 +41,10 @@ stdenv.mkDerivation rec { "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" ] ++ lib.optionals cudaSupport [ - "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30" + "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=${cudaArch}" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] ++ lib.optionals (!openclSupport) [ + "-DNO_OPENCL=1" ]; postInstall = "rm $out/lib/*.a"; @@ -46,6 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "An Open-Source subdivision surface library"; homepage = "http://graphics.pixar.com/opensubdiv"; + broken = openclSupport && cudaSupport; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; license = lib.licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix index 655d664d8fa6..f2b95bd07e3c 100644 --- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -1,50 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { pname = "openvdb"; - version = "7.0.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "0hhs50f05hkgj1wni53cwbsx2bhn1aam6z65j133356gbid2carl"; + sha256 = "sha256-OP1xCR1YW60125mhhrW5+8/4uk+EBGIeoWGEU9OiIGY="; }; - outputs = [ "out" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; - setSourceRoot = '' - sourceRoot=$(echo */openvdb) - ''; - - installTargets = [ "install_lib" ]; - - enableParallelBuilding = true; - - buildFlags = [ - "lib" - "DESTDIR=$(out)" - "HALF_LIB=-lHalf" - "TBB_LIB=-ltbb" - "BLOSC_LIB=-lblosc" - "LOG4CPLUS_LIB=" - "BLOSC_INCLUDE_DIR=${c-blosc}/include/" - "BLOSC_LIB_DIR=${c-blosc}/lib/" - ]; - - installFlags = [ "DESTDIR=$(out)" ]; - - NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; - NIX_LDFLAGS="-lboost_iostreams"; - meta = with lib; { description = "An open framework for voxel"; homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; }; } diff --git a/nixpkgs/pkgs/development/libraries/openvino/default.nix b/nixpkgs/pkgs/development/libraries/openvino/default.nix index 86bc3b0d009c..0b870bf9e403 100644 --- a/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { cd ../build ''; - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; nativeBuildInputs = [ cmake @@ -129,6 +129,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; + platforms = platforms.all; + broken = stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 514cbcea4a12..51f86ef38604 100644 --- a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL, vulkan-loader, wayland, pkg-config }: stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.22"; + version = "1.0.24"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-YaK7scnfXkxhRe/PKZukqHD9X70X0/QUDL0znTPbIBE="; + sha256 = "sha256-levPWBSwfw1N2tcBqQXtXznA7dzQRqVf/Rp2owGUamE="; }; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL ]; + nativeBuildInputs = [ cmake python3 pkg-config ]; + buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL vulkan-loader wayland ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=ON" ]; outputs = [ "out" "dev" "layers" ]; diff --git a/nixpkgs/pkgs/development/libraries/openzwave/default.nix b/nixpkgs/pkgs/development/libraries/openzwave/default.nix index 723288ab4a91..07fe1db82925 100644 --- a/nixpkgs/pkgs/development/libraries/openzwave/default.nix +++ b/nixpkgs/pkgs/development/libraries/openzwave/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; homepage = "http://www.openzwave.net/"; license = licenses.gpl3; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix index 8947c6f42394..f5a414786ac3 100644 --- a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix @@ -125,6 +125,7 @@ stdenv.mkDerivation { OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus command line SQL client. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli ]; diff --git a/nixpkgs/pkgs/development/libraries/orcania/default.nix b/nixpkgs/pkgs/development/libraries/orcania/default.nix index 2c43cfb4cc90..abe45b63372f 100644 --- a/nixpkgs/pkgs/development/libraries/orcania/default.nix +++ b/nixpkgs/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lrc4VEqmCp/P/h0+5/ix6tx4pjfkLy9BLBZtKYLlyGI="; + sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; }; nativeBuildInputs = [ cmake ]; @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" - ''; - meta = with lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; homepage = "https://github.com/babelouest/orcania"; diff --git a/nixpkgs/pkgs/development/libraries/ortp/default.nix b/nixpkgs/pkgs/development/libraries/ortp/default.nix index af924ad80d26..e896717644aa 100644 --- a/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -1,12 +1,13 @@ { bctoolbox , cmake , fetchFromGitLab -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "ortp"; - version = "4.5.1"; + version = "5.1.55"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1lc1j7wvkyp5lhcflq3h5y7n8aiwgwj84ffm81ggbsmavamgwkk7"; + sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw="; }; # Do not build static libraries @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A Real-Time Transport Protocol (RFC3550) stack"; + description = "A Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project."; homepage = "https://linphone.org/technical-corner/ortp"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index df6e364d2e9a..fee4a2e8259f 100644 --- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -59,9 +59,10 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-trust-paths=${lib.concatStringsSep ":" [ - "/etc/ssl/trust-source" # p11-kit trust source - "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... - "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS + "/etc/ssl/trust-source" # p11-kit trust source + "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... + "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS + "/var/lib/ca-certificates/ca-bundle.pem" # openSUSE ]}" ]; diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index ee79d5370594..6ce22a8c1c68 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -16,26 +16,21 @@ , ninja , glib , python3 -, x11Support? !stdenv.isDarwin, libXft -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) , gobject-introspection -, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform) +, x11Support? !stdenv.isDarwin, libXft }: stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.6"; + version = "1.50.8"; - outputs = [ "bin" "out" "dev" ] - ++ lib.optionals withDocs [ "devdoc" ]; + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qZi882iBw6wgSV1AvOswT06qkXW9KWfIVlZDTL2v6Go="; + sha256 = "z2JvWd0UbAIxdMQDSSDpZn8dJawsFWlRbWMTbDESVfo="; }; - strictDeps = !withIntrospection; - depsBuildBuild = [ pkg-config ]; @@ -44,9 +39,7 @@ stdenv.mkDerivation rec { meson ninja glib # for glib-mkenum pkg-config - ] ++ lib.optionals withIntrospection [ gobject-introspection - ] ++ lib.optionals withDocs [ gi-docgen python3 ]; @@ -54,6 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi libthai + gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon @@ -71,8 +65,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withDocs}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" + "-Dgtk_doc=true" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 ]; @@ -82,9 +75,20 @@ stdenv.mkDerivation rec { fontDirectories = [ freefont_ttf ]; }; + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + postPatch = '' + substituteInPlace meson.build \ + --replace "dependency('gi-docgen', ver" "dependency('gi-docgen', native:true, ver" + + substituteInPlace docs/meson.build \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + ''; + doCheck = false; # test-font: FAIL - postFixup = lib.optionalString withDocs '' + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" ''; diff --git a/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/nixpkgs/pkgs/development/libraries/pangolin/default.nix index 331284021e3b..468da57b1a90 100644 --- a/nixpkgs/pkgs/development/libraries/pangolin/default.nix +++ b/nixpkgs/pkgs/development/libraries/pangolin/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pangolin"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "stevenlovegrove"; repo = "Pangolin"; rev = "v${version}"; - sha256 = "0abjajxj7lc2yajshimar4w8kf8115prsjnhy83s6jc7cbz63wj8"; + sha256 = "sha256-X8TZWJOQOCItYt/F8E5ahiaPJXoppu9qBlEqfHP0vRc="; }; nativeBuildInputs = [ cmake pkg-config doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix b/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix index fa702177781f..33cc40c96840 100644 --- a/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix +++ b/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "C++ interface to the Pango text rendering library"; homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; diff --git a/nixpkgs/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix index d4af69532b39..69dba0004f59 100644 --- a/nixpkgs/pkgs/development/libraries/partio/default.nix +++ b/nixpkgs/pkgs/development/libraries/partio/default.nix @@ -1,37 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg, python3 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "partio"; - version = "2018-03-01"; + version = "1.14.6"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; - rev = "8b6ea0d20f1ab77cd7f18390999251e60932de4a"; - sha256 = "16sdj103v02l2dgq9y9cna9jakafabz9jxzdxsd737ir6wn10ksb"; + rev = "refs/tags/v${version}"; + hash = "sha256-S8U5I3dllFzDSocU1mJ8FYCCmBpsOR4n174oiX5hvAM="; }; outputs = [ "dev" "out" "lib" ]; nativeBuildInputs = [ unzip cmake doxygen ]; - buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu ]; - - buildPhase = '' - make partio - - mkdir $dev - mkdir $out - ''; + buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu python3 ]; # TODO: # Sexpr support - installPhase = '' - make install prefix=$out - mkdir $dev/include/partio - mv $dev/include/*.h $dev/include/partio - ''; - strictDeps = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix b/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix index 5f09860cb3a4..ae139639c732 100644 --- a/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchpatch, fetchFromGitHub , cmake, git , asio, catch2, spdlog , IOKit, udev @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj"; }; + patches = [ + # Fix build with GCC 11 + (fetchpatch { + url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch"; + sha256 = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g="; + }) + ]; + cmakeFlags = [ "-DNRF_BLE_DRIVER_VERSION=${version}" ]; @@ -35,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; license = licenses.unfreeRedistributable; platforms = platforms.unix; - maintainers = with maintainers; [ jschievink ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 2c7dd440da82..7730b30b3967 100644 --- a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,32 +1,53 @@ -{ config, stdenv, lib, fetchFromGitHub -, autoconf, automake, which, libtool, pkg-config -, portaudio, alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: +{ config +, lib +, stdenv +, fetchFromGitHub +, alsa-lib +, autoconf +, automake +, libpulseaudio +, libtool +, pkg-config +, portaudio +, which +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcaudiolib"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "espeak-ng"; - repo = "pcaudiolib"; - rev = version; - sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE="; }; - nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + which + ]; - buildInputs = [ portaudio ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; + buildInputs = [ + portaudio + ] + ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio; - preConfigure = "./autogen.sh"; + preConfigure = '' + ./autogen.sh + ''; meta = with lib; { - description = "Provides a C API to different audio devices"; homepage = "https://github.com/espeak-ng/pcaudiolib"; - license = licenses.gpl3; + description = "Provides a C API to different audio devices"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ aske ]; - platforms = platforms.all; + platforms = platforms.unix; + badPlatforms = platforms.darwin; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix b/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix index dd94a4a088cb..a957d517bf7a 100644 --- a/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2 +{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python3 , boost, eigen, zlib } : @@ -13,11 +13,18 @@ stdenv.mkDerivation rec { sha256= "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr"; }; + # Glibc 2.34 changed SIGSTKSZ to a dynamic value, which breaks + # PCMsolver. Replace SIGSTKZ by the backward-compatible _SC_SIGSTKSZ. + postPatch = '' + substituteInPlace external/Catch/catch.hpp \ + --replace SIGSTKSZ _SC_SIGSTKSZ + ''; + nativeBuildInputs = [ cmake gfortran perl - python2 + python3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/pcre/default.nix b/nixpkgs/pkgs/development/libraries/pcre/default.nix index 5fc8d496ba91..c4bbcf2ddfd6 100644 --- a/nixpkgs/pkgs/development/libraries/pcre/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcre/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" ]; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 - configureFlags = optional (!stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit" ++ [ + configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [ "--enable-unicode-properties" "--disable-cpp" ] @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/pcre-config "$dev" '' + optionalString (variant != null) '' - ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib} + ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a} ''; meta = { diff --git a/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/nixpkgs/pkgs/development/libraries/pcre2/default.nix index 8393cb8c5910..226b92ccfdd3 100644 --- a/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -1,23 +1,26 @@ { lib , stdenv , fetchurl +, withJitSealloc ? true }: stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.39"; + version = "10.40"; + src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-DwPK9X+B2f82KsKM04nAVewr8GeNJ3NJoaS+4ArW1EA="; + hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg="; }; - # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" - ] ++ lib.optional (!stdenv.hostPlatform.isRiscV && - !(stdenv.hostPlatform.isDarwin && - stdenv.hostPlatform.isAarch64)) "--enable-jit"; + # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51 + "--enable-jit=auto" + ] + # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea + ++ lib.optional withJitSealloc "--enable-jit-sealloc"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; @@ -26,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.pcre.org/"; + homepage = "https://www.pcre.org/"; description = "Perl Compatible Regular Expressions"; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; diff --git a/nixpkgs/pkgs/development/libraries/pdal/2_3.nix b/nixpkgs/pkgs/development/libraries/pdal/2_3.nix new file mode 100644 index 000000000000..094697ba1c18 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pdal/2_3.nix @@ -0,0 +1,89 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, openscenegraph +, curl +, gdal +, hdf5-cpp +, LASzip +, libe57format +, libgeotiff +, libxml2 +, postgresql +, tiledb +, xercesc +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + pname = "pdal"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "PDAL"; + repo = "PDAL"; + rev = version; + sha256 = "sha256-DKIraCyp8fcgnVp5dFrtQ4Wq96cQGC9SiAPLS6htUZc="; + }; + + patches = [ + # fix build with GCC 11 + (fetchpatch { + url = "https://github.com/PDAL/PDAL/commit/47e1eb2dc884d1b8c5caa8e3b48ef90f4f12c68d.patch"; + hash = "sha256-Ls2LkVpbwQAMt2Iuq0zq9D9l2eyP8m1IO3poCnbxGDU="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + openscenegraph + curl + gdal + hdf5-cpp + LASzip + libe57format + libgeotiff + libxml2 + postgresql + tiledb + xercesc + zlib + zstd + ]; + + cmakeFlags = [ + "-DBUILD_PLUGIN_E57=ON" + "-DBUILD_PLUGIN_HDF=ON" + "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" + "-DBUILD_PLUGIN_TILEDB=ON" + + # Plugins can probably not be made work easily: + "-DBUILD_PLUGIN_CPD=OFF" + "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs + "-DBUILD_PLUGIN_GEOWAVE=OFF" + "-DBUILD_PLUGIN_I3S=OFF" + "-DBUILD_PLUGIN_ICEBRIDGE=OFF" + "-DBUILD_PLUGIN_MATLAB=OFF" + "-DBUILD_PLUGIN_MBIO=OFF" + "-DBUILD_PLUGIN_MRSID=OFF" + "-DBUILD_PLUGIN_NITF=OFF" + "-DBUILD_PLUGIN_OCI=OFF" + "-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + "-DBUILD_PLUGIN_RIVLIB=OFF" + ]; + + meta = with lib; { + description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; + homepage = "https://pdal.io"; + license = licenses.bsd3; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/pdal/default.nix b/nixpkgs/pkgs/development/libraries/pdal/default.nix index 2d971444416c..354c68decfb0 100644 --- a/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pdal"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = version; - sha256 = "sha256-DKIraCyp8fcgnVp5dFrtQ4Wq96cQGC9SiAPLS6htUZc="; + sha256 = "sha256-w9Fu4Op6OdaxdvOUM+glpJUEZq//EwRD2lqzYrMXk8w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/pe-parse/default.nix b/nixpkgs/pkgs/development/libraries/pe-parse/default.nix index 445188bd0d9b..d9ccb4447b2f 100644 --- a/nixpkgs/pkgs/development/libraries/pe-parse/default.nix +++ b/nixpkgs/pkgs/development/libraries/pe-parse/default.nix @@ -1,28 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "pe-parse"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pe-parse"; rev = "v${version}"; - sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv"; + hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k="; }; + patches = [ + (fetchpatch { + url = "https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c.patch"; + hash = "sha256-pd6D/JMctiQqJxnJU9Nm/GDVf4/CaIGeXx1UfdcCupo="; + }) + ]; + nativeBuildInputs = [ cmake ]; doInstallCheck = true; installCheckPhase = '' - $out/bin/dump-pe ../test/assets/example.exe + $out/bin/dump-pe ../tests/assets/example.exe ''; meta = with lib; { description = "A principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; + mainProgram = "dump-pe"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/pffft/default.nix b/nixpkgs/pkgs/development/libraries/pffft/default.nix new file mode 100644 index 000000000000..b68b6d486823 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pffft/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "pffft"; + version = "unstable-2022-04-10"; + + src = fetchFromGitHub { + owner = "marton78"; + repo = pname; + rev = "08f5ed2618ac06d7dcc83d209d7253dc215274d5"; + sha256 = "sha256-9LfLQ17IRsbEwGQJZzhW2Av4en1KuJVicLrS2AyjUZY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Pretty Fast FFT (PFFFT) library"; + homepage = "https://github.com/marton78/pffft"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/phash/default.nix b/nixpkgs/pkgs/development/libraries/phash/default.nix index 4596c5aaf4f6..73097db5ccc6 100644 --- a/nixpkgs/pkgs/development/libraries/phash/default.nix +++ b/nixpkgs/pkgs/development/libraries/phash/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pHash"; - version = "0.9.4"; + version = "0.9.6"; buildInputs = [ cimg ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "clearscene"; repo = "pHash"; rev = version; - sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0"; + sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index 3e21415b4c77..73c27e9d8c1b 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config +{ stdenv, lib, fetchurl, fetchpatch, cmake, gst_all_1, phonon, pkg-config , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -22,9 +22,17 @@ stdenv.mkDerivation rec { sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"; }; - # Hardcode paths to useful plugins so the backend doesn't depend - # on system paths being set. - patches = [ ./gst-plugin-paths.patch ]; + patches = [ + # Hardcode paths to useful plugins so the backend doesn't depend + # on system paths being set. + ./gst-plugin-paths.patch + + # Work around https://bugs.kde.org/show_bug.cgi?id=445196 until a new release. + (fetchpatch { + url = "https://invent.kde.org/libraries/phonon-gstreamer/-/commit/bbbb160f30a394655cff9398d17961142388b0f2.patch"; + sha256 = "sha256-tNBqVt67LNb9SQogS9ol8/xYIZvVSoVUgXQahMfkFh8="; + }) + ]; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix index 7028c44b434b..77ad6e201a32 100644 --- a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: +{ lib, stdenv, fetchurl, gfortran, imake, makedepend, motif, xorg }: stdenv.mkDerivation rec { version = "2006"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; [ gfortran motif libX11 libXft libXt ]; - nativeBuildInputs = [ gnumake imake makedepend ]; + nativeBuildInputs = [ imake makedepend ]; sourceRoot = "."; patches = [ ./patch.patch ./0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch ]; @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS = [ "-Wno-return-type" ]; + # Workaround build failure on -fno-common toolchains: + # ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr'; + # libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "FORTRANOPTIONS=$(FFLAGS)" "CCOPTIONS=$(NIX_CFLAGS)" diff --git a/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix b/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix new file mode 100644 index 000000000000..6f648463c854 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, cmake +}: + +stdenv.mkDerivation rec { + pname = "clhep"; + version = "2.4.5.3"; + + src = fetchurl { + url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; + hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM="; + }; + + prePatch = '' + cd CLHEP + ''; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "clhep_ensure_out_of_source_build()" "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Set of HEP-specific foundation and utility classes such as random generators, physics vectors, geometry and linear algebra"; + homepage = "https://cern.ch/clhep"; + license = with licenses; [ gpl3Only lgpl3Only ]; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 9f1b396e4759..5310ffc279d3 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.048"; + version = "1.049"; src = fetchurl { url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-+ZidO2rrIoSLz5EJXDBgfwJ9PvJ3pPD3BKjw/C52aYE="; + sha256 = "sha256-ri7WIGvGJ4tl6ZpPeN8O6ykR8wGij7V7UMVzwNWGmYc="; }; buildInputs = [ fastjet ]; @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { patchShebangs ./configure ./utils/check.sh ./utils/install-sh ''; + # Written in shell manually, does not support autoconf-style + # --build=/--host= options: + # Error: --build=x86_64-unknown-linux-gnu: unrecognised argument + configurePlatforms = [ ]; + enableParallelBuilding = true; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index 18809654c467..b1df2875fab7 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, geant_version }: +{ lib, stdenv, fetchurl, geant4 }: let mkDataset = { pname, version, sha256, envvar }: stdenv.mkDerivation { inherit pname version; - inherit geant_version; + geant_version = geant4.version; src = fetchurl { url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz"; @@ -15,7 +15,7 @@ let dontBuild = true; dontConfigure = true; - datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}"; + datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}"; installPhase = '' mkdir -p $datadir mv ./* $datadir diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 6f29b5909810..3315e5a535ae 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -1,8 +1,7 @@ { enableMultiThreading ? true -, enableG3toG4 ? false , enableInventor ? false -, enableGDML ? false -, enableQT ? false +, enableQT ? false # deprecated name +, enableQt ? enableQT , enableXM ? false , enableOpenGLX11 ? true , enablePython ? false @@ -11,15 +10,12 @@ # Standard build environment with cmake. , lib, stdenv, fetchurl, fetchpatch, cmake -# Optional system packages, otherwise internal GEANT4 packages are used. -, clhep ? null # not packaged currently +, clhep , expat -, zlib - -# For enableGDML. , xercesc +, zlib -# For enableQT. +# For enableQt. , qtbase , wrapQtAppsHook @@ -31,7 +27,7 @@ , soxt , libXpm -# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. +# For enableQt, enableXM, enableOpenGLX11, enableRaytracerX11. , libGLU, libGL , xlibsWrapper , libXmu @@ -48,29 +44,34 @@ let boost_python = boost.override { enablePython = true; python = python3; }; in +lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" + stdenv.mkDerivation rec { - version = "11.0.0"; + version = "11.0.2"; pname = "geant4"; src = fetchurl{ url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - sha256 = "sha256-PMin350/8ceiGmLS6zoQvhX2uxWNOTI78yEzScnvdbk="; + hash = "sha256-/AONuDcxL3Tj+O/RC108qHqZnUg9TYlZxguKdJIh7GE="; }; cmakeFlags = [ "-DGEANT4_INSTALL_DATA=OFF" - "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" - "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}" - "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}" + "-DGEANT4_USE_GDML=ON" + "-DGEANT4_USE_G3TOG4=ON" + "-DGEANT4_USE_QT=${if enableQt then "ON" else "OFF"}" "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}" "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}" "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}" "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_CLHEP=ON" + "-DGEANT4_USE_SYSTEM_EXPAT=ON" + "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DXQuartzGL_INCLUDE_DIR=${libGL.dev}/include" + "-DXQuartzGL_gl_LIBRARY=${libGL}/lib/libGL.dylib" ] ++ lib.optionals (enableMultiThreading && enablePython) [ "-DGEANT4_BUILD_TLS_MODEL=global-dynamic" ] ++ lib.optionals enableInventor [ @@ -80,37 +81,36 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals enableQT [ - wrapQtAppsHook ]; - dontWrapQtApps = !enableQT; + propagatedNativeBuildInputs = lib.optionals enableQt [ + wrapQtAppsHook + ]; + dontWrapQtApps = true; # no binaries buildInputs = [ libGLU xlibsWrapper libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enablePython [ boost_python python3 ]; - propagatedBuildInputs = [ clhep expat zlib libGL ] - ++ lib.optionals enableGDML [ xercesc ] + propagatedBuildInputs = [ clhep expat xercesc zlib libGL ] ++ lib.optionals enableXM [ motif ] - ++ lib.optionals enableQT [ qtbase ]; + ++ lib.optionals enableQt [ qtbase ]; postFixup = '' # Don't try to export invalid environment variables. sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh - '' + lib.optionalString enableQT '' + '' + lib.optionalString enableQt '' wrapQtAppsHook ''; setupHook = ./geant4-hook.sh; passthru = { - data = import ./datasets.nix { - inherit lib stdenv fetchurl; - geant_version = version; - }; + data = callPackage ./datasets.nix {}; tests = callPackage ./tests.nix {}; + + inherit enableQt; }; # Set the myriad of envars required by Geant4 if we use a nix-shell. @@ -119,6 +119,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "A toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. @@ -127,7 +128,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.geant4.org"; license = licenses.g4sl; - maintainers = with maintainers; [ omnipotententity ]; - platforms = platforms.linux; + maintainers = with maintainers; [ omnipotententity veprbl ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index 1c3bfaa2064e..569f8d80e542 100644 --- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; + hash = "sha256-VZmJk3mwGwnjMaJCbXjTm39uwSbbJUPp00Cu/mqlD4Q="; }; nativeBuildInputs = [ autoconf automake libtool gfortran ]; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./ + + # Fix failing "make install" being unable to find HwEvtGenInterface.so + substituteInPlace src/defaults/decayers.in.in \ + --replace "read EvtGenDecayer.in" "" ''; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix index a3753d86356e..991309b54d46 100644 --- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.4.0"; + version = "6.5.1"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-fS8CZ+LWWw3e4EhVOzQtfIk6bbq+HjJsrWLeABDdgQw="; + sha256 = "sha256-ElZBniIn0aT5M4f+HagF5kg1FBfTdV6K9aMKNaamZ1E="; }; # The Apple SDK only exports locale_t from xlocale.h whereas glibc @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { substituteInPlace src/GridPDF.cc --replace '#include <locale>' '#include <xlocale.h>' ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ]; buildInputs = [ python ]; + configureFlags = lib.optionals (python == null) [ "--disable-python" ]; + + preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") '' + rm wrappers/python/lhapdf.cpp + ''; + enableParallelBuilding = true; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh index 6e263dcebfde..dc182ec99ea6 100755 --- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -4,9 +4,9 @@ set -xe : ${SED:="$(nix-build '<nixpkgs>' -A gnused --no-out-link)/bin/sed"} -BASE_URL="https://lhapdfsets.web.cern.ch/lhapdfsets/current/" +BASE_URL="https://lhapdfsets.web.cern.ch/current/" -for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -e "s/.*<a href=\"\([^\"/]*.tar.gz\)\".*/\1/;tx;d;:x" | sort -u`; do +for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -n -e 's/.*<a href=".*\/\([^"/]*\.tar\.gz\)".*/\1/p' | sort -u`; do echo -n " \"${pdf_set%.tar.gz}\" = \"" nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n' echo "\";" diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 694164f5af2e..286cf8355b64 100644 --- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -59,6 +59,9 @@ in "ATLAS-epWZ16-VAR" = "1zkhlv8yxfla46gj57119w9prsd3zyy5vg275bayfwa6b71gmc0b"; "ATLAS-epWZtop18-EIG" = "069rysd9mf3cshx7xkcv7735ydh2g6szvljbfkcqwckaqjg2x3v5"; "ATLAS-epWZtop18-VAR" = "0hpyp52dwl8fnw47pyw8g7fsz97wr6sk4yli6sx0zbj8yy2j28yj"; + "ATLASepWZVjet20-EIG" = "0lvd3zkmisx95rbjx7r9wkk0s0mxvaybp3pk66sxrxf1bj1l9r52"; + "ATLASepWZVjet20-MOD" = "1iyb50isdsy3a5wnlm0185z9bfs6nxwlcl1aqlh4h3j1dbmz4ba9"; + "ATLASepWZVjet20-PAR" = "1kfqii7sbcs8zdsyd9kiy3r233nawc9yfc23fb6ql0xcwfzpyb1d"; "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag"; "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v"; "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9"; @@ -171,7 +174,7 @@ in "CT14nnloIC" = "1wnpwy0mz0c5y29wi497jcn5k47bndd0h65d6a18qcfk0l15rfzx"; "CT14nnlo_NF3" = "0ijns9bjkw8zcinba7rflc7ic03mn5701lqfrxqjyq4q6kh8fia7"; "CT14nnlo_NF4" = "0fhyzaxnm17pi7wfh5hwaic9q4y0hb05ripd6r648wnnhhi353xy"; - "CT14nnlo_NF6" = "1rnacbsh0y9qjd2x7ggs87zi9msrxrp2l6lidg92i2la4pri27zk"; + "CT14nnlo_NF6" = "1dvabji3vrqk8ngln72xqiahm8fai3klgv5yz64b3bfxcr04wmg9"; "CT14nnlo_as_0111" = "1hl88j40czr73h9fbz0zbliawlqwng7ikrmq01hsfns190axm8w9"; "CT14nnlo_as_0112" = "1w9344v9ihr0w8vrfhhxn81gcnr0qm6ihwwijvcdds09jpdlp6vr"; "CT14nnlo_as_0113" = "11symfb1ljislbksrars1k766fa2n1inbarzbw3kp01vxpw8gxf5"; @@ -190,133 +193,157 @@ in "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k"; "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7"; "CT18ANLO" = "16lbhgkbiym3njiffxdcm3hf7kkm33hyj2w1hwgb3mvxx2sja31c"; - "CT18ANLO_as_0110" = "08hwxc99l645a9craimgawwynxcs5cmapgxgk0fy9ihvjvqs6jg2"; - "CT18ANLO_as_0111" = "02ff3s127svdjzawbhzry04rcsw5waggmf3iwpqndzxhqpm0py8a"; - "CT18ANLO_as_0112" = "063g7sqii0gf2rdjg9k9x95kzwg62w8lfq9cgyv3bnkpapnbqhia"; - "CT18ANLO_as_0113" = "01zh34dg4cc8955ipg2i0k6s13h77jg8yaa4v2f4aw0020js9dn2"; - "CT18ANLO_as_0114" = "061lvglsg4889q6qya83f7ngyzi2ibar1c9w6xyl462x5i4frx2x"; - "CT18ANLO_as_0115" = "0a35axfjxywy4yh8pk4w4f57rfljvd593bx7a8wnix0cifnngg4j"; - "CT18ANLO_as_0116" = "1cm3m3m6l93qlr9fxbc0d21gq3x0wn09qi8cxbx7lj0yqhjf2zh8"; - "CT18ANLO_as_0117" = "1nrzrlp7i42z7pv550ggga0fk356i9rqbj60mdxvlw3xl6v4kkf4"; - "CT18ANLO_as_0118" = "19p7x6q9flsz1s82scakgnsfsrjf8ym6ix3gp195fjgfdkannh9i"; - "CT18ANLO_as_0119" = "1jz27f39dpg0g46p834vgvaajxspyqwd8f7zlpv44lfb43va6dgy"; - "CT18ANLO_as_0120" = "0rp9hrvs44d8pbagmc3vipnh5d9amam3prkm2k7spvxahr6dp8dp"; - "CT18ANLO_as_0121" = "15abhrjmmhyka9dxjmwz7103i0bpa605yhy6kisgzf7km5ca14h9"; - "CT18ANLO_as_0122" = "15mxybppydzsxx308hqljahnmrw0islw2zl45kjlhxjxsmaai2nc"; - "CT18ANLO_as_0123" = "19zlyapm5cp1hwvfqcjm3v6mgwdaa6f5d0mvnh68c05sn39xjhz2"; - "CT18ANLO_as_0124" = "1fwzcs50bj6d6cjkvi4qj44mwrwxhjh25lxmk2q82wdmddgpaz0c"; + "CT18ANLO_as_0110" = "1lkxicxmphi4mdc23vig4a5l4gp0n53jblzsl7bvrixbkhd5arv8"; + "CT18ANLO_as_0111" = "1jk8siawnpnclgjc0jhx89ipym0jp94mrklwkn0awh0hgqxd26ra"; + "CT18ANLO_as_0112" = "0rpfx10b5hjwzmlqzkk1zkk38ysn5jfgipk71zl5da6qk1ih5v2s"; + "CT18ANLO_as_0113" = "0chhqgjddrb731y6haa94yypki6pzpjq5rvja61gfbghbvnc02fs"; + "CT18ANLO_as_0114" = "0nvl1a588jvmh7a7przrzpvf9prrpvv610jmsnfrcp4i98ipdn1p"; + "CT18ANLO_as_0115" = "1f757zlavyjxjwyda8rnkzg9kagmciywvvvdcsbks9ij3m4fcw5z"; + "CT18ANLO_as_0116" = "13bdsnwkqzjq63m02vmb7z03rx6chcyy3br4m52gja0qz03rxhyj"; + "CT18ANLO_as_0117" = "0w5pmqry5rd5jsfwiv43cy5z3hlk7gzllnk0vn1qgsjrgd284hj9"; + "CT18ANLO_as_0118" = "1g137nw812zqdkr97hdwvfi4c4bxfazy1wyk30gwgrhqs6xdsmyp"; + "CT18ANLO_as_0119" = "06pjg9nsq6pvda1yg6lg2qi15i3h2radampgk23rbz9g6zn5hw39"; + "CT18ANLO_as_0120" = "0jh6f5jj81sppv5fhm8ccgzwpacfr1nql3r5466z0bl201fc9x6x"; + "CT18ANLO_as_0121" = "0jh4x2y4rcp3l825dl3a89apmb0f94jrk0pl93lv8xg34f8jrb2i"; + "CT18ANLO_as_0122" = "0ma8r5vgdw9hj6cafkj8fbpq8i18cbild4aw4q9lrsszwwcrlv9i"; + "CT18ANLO_as_0123" = "1mv75gga1gdmnwkaxc0c89jxgapc38376xv5yxfqy2dn03pad9im"; + "CT18ANLO_as_0124" = "0913a748xm6lbdci8vicz08h323hbkc4z1bjq1wq8qfrl1cx02ic"; "CT18ANNLO" = "1kbsbvvkkchhwwjdrj4d91lbykid4dcy4ghanpdd9x0nfm5b4sgk"; - "CT18ANNLO_as_0110" = "1a60p22r292hjjcrdkgis6d81hgihnjzyzlbcqrvx9bkbq447kjq"; - "CT18ANNLO_as_0111" = "1gyl4h92xs4s64dm7cwrfqk2zrs1cbzp76dqckf7z44k4pm460m9"; - "CT18ANNLO_as_0112" = "1bsn5q12bgkhyl1d6wkq32m3l7i0wqxpnjxh790xcd3ympbfx16h"; - "CT18ANNLO_as_0113" = "1dri54s71ygnd1pdnmvr9vqbyfllwzr9x39zg01rpj02zy7kidb0"; - "CT18ANNLO_as_0114" = "0f731ryn1031053zv40mak9m7mxmn6dvnhn6ik6kyag9d3az6lvx"; - "CT18ANNLO_as_0115" = "107569wrkjic6xjp574i6r6n8wj2x9cx4h7dqh77wxl8g4aajkh6"; - "CT18ANNLO_as_0116" = "0r951p0a4pan71lkhf701ysw6kyq1wvf15rbjdjr4j7khjfaykcp"; - "CT18ANNLO_as_0117" = "0xsgzga5bya0ng6i7nvk33nrf792vzbd1rs174cix4v406g99xm8"; - "CT18ANNLO_as_0118" = "049534355lxhppw2l85i677ysb2gwzccs0b5afm719sh06rv6jkn"; - "CT18ANNLO_as_0119" = "034kd7pg103ldc3nmgsylv0ffl8v0sp9jkf9073ny11s7b3pb5wa"; - "CT18ANNLO_as_0120" = "1ph23xpirkahpr9x1k2qm9pp3a1hc3i15bhc6xprpc29k53m4wsi"; - "CT18ANNLO_as_0121" = "12qrg3jb1kar46b8lai56lb7wxjr950dzaixfncxvy38hrny6mxh"; - "CT18ANNLO_as_0122" = "1wmkl2rlhkwzxi1yln0m9i6lvpbqkp3bxdnyzz7hp3hy1sa5f60s"; - "CT18ANNLO_as_0123" = "1caz4rfmcmabfdw5b8xg2307bs1bjclgdcxq2k6gf73z3pqbjs8w"; - "CT18ANNLO_as_0124" = "0mx8h8vdhlklgvysmhllkzga3g65zkmzpz7bmyvaqmvbvr6x5q0w"; + "CT18ANNLO_as_0110" = "1inx20r83pfmwxfhyy3hhj2csp016d9cnald1rf8vl9riqxvx0j4"; + "CT18ANNLO_as_0111" = "0zzi0b27xp4xykbwd2y7l2ka1k4kfvhaq7y2w82fky2b842ixsmg"; + "CT18ANNLO_as_0112" = "0y031rslsmwxs76rz184mrjb07pdcxrf07yl5yab1y24vymqj4dy"; + "CT18ANNLO_as_0113" = "1pgrcb6sbahl2jf3v08bki28w9x0ag5n3zj1fi0jc69fxwgkczzq"; + "CT18ANNLO_as_0114" = "0ifzf428gxlmhc8wvpj3qaqr0cl6pripiabmnb5av43d5avwhagr"; + "CT18ANNLO_as_0115" = "1bxf5rs33kfl3q570wm49ad0drlanzq8wkrbd85qjlvyhy52j8vs"; + "CT18ANNLO_as_0116" = "0l43qn45wfj2lljpp8kri1n2p99lxj3gbbqh2p2s7v0my5ds5p06"; + "CT18ANNLO_as_0117" = "0nfh9y2w8lvlqbghxx4i7j7gxq5bm67h3vz1wajg86zndarkq6mz"; + "CT18ANNLO_as_0118" = "0m8s96rgnnl5xk7g3l2pf5qx7dwb8kgn18b9nyr8cyqxn90mh3vr"; + "CT18ANNLO_as_0119" = "1lpkcrcfmn0kc9g21ca90j1shcf3ii89yrr17rgwynmylwvizs2y"; + "CT18ANNLO_as_0120" = "0lmn2p57k7yvr5mpzykljhkpnb1c71f4ya2s4zbp2x84fqfg5wbk"; + "CT18ANNLO_as_0121" = "0arbvp0sc67fsf7slhlv96iwq89yjqqkv84pf76fqdvrrjsmyn61"; + "CT18ANNLO_as_0122" = "1nbkgb0wmjh2bfx944sqb810sn4bb0ppxgv2aw2y93jbfyx7x4ry"; + "CT18ANNLO_as_0123" = "1rlxn70mc299v596y0dwp9a1pdy1yz0r8367cjw5l97y46yxhjrh"; + "CT18ANNLO_as_0124" = "0sfkvhyxp9sqf75wj91h9h59vcs2y2n4qchsg0marjy849xxh6qb"; "CT18NLO" = "04y2p6vz484l3yv6381pfavqs3xh78h3jn6bg7ncp5vywwqp44n9"; - "CT18NLO_as_0110" = "0ncaacfw8dh45vaf84kkj93hwxgwz744qqd6llpy73zdilnl62a8"; - "CT18NLO_as_0111" = "1cib3ggy0wajvvw908wr4bfymcw62iy5abwdadhq69crcg01619r"; - "CT18NLO_as_0112" = "1x242x4y0vykfypm02g02qxpwmsq2p45bxqrqgfy29qagxz6j66d"; - "CT18NLO_as_0113" = "0fkis7l0s1lb2k7qyfwnn5axbpiv9yky4j5qc8g3fa068czijmhi"; - "CT18NLO_as_0114" = "1r6ih2gqiwm7z24iw9xgn2n35659v5nwl2d02f07j1k3d33j175n"; - "CT18NLO_as_0115" = "0z4vm73l16mpjf3wcrv5q659f2mwkx85wpmnq8j1fnk0vhms59dx"; - "CT18NLO_as_0116" = "0g4lxxc9g09alpsff9wr7w0jgi26h3klx8rk6nb71j9yzrwv12vv"; - "CT18NLO_as_0117" = "0hmn5vkgi5981q0s5lyp9mq9jjrzhgr1f9w8np3i2nwcgn1awis5"; - "CT18NLO_as_0118" = "1z6is1f3064wq56lfxrmqckk3yi6wsl42s2xigx87p8zqg3r4nkz"; - "CT18NLO_as_0119" = "0p3r7w5v3pq2dgaq96r3khx1wwjq6i33l0bbf63dxs88gk5cx1s4"; - "CT18NLO_as_0120" = "1h0rcra68yypf1yqwlzql385ks1agxc9njdpyx60j3yg3whk4h63"; - "CT18NLO_as_0121" = "1by1iiy7qby73m8s3qmnrf0dyca3k4z00fclbrm651f79nz8scz7"; - "CT18NLO_as_0122" = "1r8h2cw874dh1mj4r545wp9msr1358qw1lzznwvgkmgwjclndjg4"; - "CT18NLO_as_0123" = "1d8c3bk6bvy3azbv9yqi45cwkcmjbxxw7qaxn6xnc5jfcf6wbsp1"; - "CT18NLO_as_0124" = "1haqxq1jbcz9qbhnw4pxsvlr37908fkdlzyn7c1csrlr8a51s3z4"; + "CT18NLO_as_0110" = "0nrydk44sp7hgabn6xk6r2hnkir7mgddcsbbnqmpwmq3x0xz27pn"; + "CT18NLO_as_0111" = "17xwzcj4n1bmfwz02n2g8afzxc4lp5diij00f2w50pqh2w7vj6g9"; + "CT18NLO_as_0112" = "0a6lsmpz3c1z7dm593nb3r9q7dgpskkls2i6wpdlrrg6s6cr8rmq"; + "CT18NLO_as_0113" = "1kwz9yp0vzyiwy9avxjwibdc6jla32vddf23pvfiv0qjcwfnp6ii"; + "CT18NLO_as_0114" = "161q98jr59vn1qldhd83qxx0qjq1rahgamwfqd3hw6dn6wy39970"; + "CT18NLO_as_0115" = "1dp0683zfn7mg0bj1l5m7i9kdbyxjl0ahhwppvgi5gs5kbmhbs9n"; + "CT18NLO_as_0116" = "0hpi5s175cpz251nav0v34l6qsfqj6181mhhp80kghyyvl7l22sw"; + "CT18NLO_as_0117" = "1v32wxdsvms23sghcszw6csd08kw0xppjzwjnbdsc8k6w67r546m"; + "CT18NLO_as_0118" = "1vd7vc7f49in1i5398p12b9vklxbsif89wv2q93k6m91kb38rm45"; + "CT18NLO_as_0119" = "1h0dlys71cngsxl9dj9l5amikxrvzzb7bins2a6wn6s7zgfyvlck"; + "CT18NLO_as_0120" = "126jfwml027mnpbr6ad7s8d94j3n1sv6fbdy5r5vcb64nyncjach"; + "CT18NLO_as_0121" = "1khffdgqdfl1g4cxp4fnyb900722s6pwzys7cdxmwhzi9f0rwgw8"; + "CT18NLO_as_0122" = "1w7q35igi7fnkrwnr1dnfq646qicz4549c6ddqbkyil10arvq7fk"; + "CT18NLO_as_0123" = "1bl6rf69gjnblvfdh5p8flax9qb65vk25hcfjw2r7qwdz3dxs6sr"; + "CT18NLO_as_0124" = "18mhpn4l3qqg9v79z2vz4jc8w3za726fndfl6sbc9mf94jy72chm"; "CT18NNLO" = "1shkah5ma0hp101aklkz2p8n9y4i4sv6zwa5ifzyj3bgz1020l5f"; - "CT18NNLO_as_0110" = "1smilnmhw8zjd0hl03v7wflbbia5qxqfmvyikbgwc29g212xbq71"; - "CT18NNLO_as_0111" = "0mj77vshb9fmlvc1pp3m701nl574p0k013lg0l25r4nhvlfiiriz"; - "CT18NNLO_as_0112" = "0a87crw7dygf9q28v95h9j02yq5f9rr5fdrxvqj5ggw839nazgmk"; - "CT18NNLO_as_0113" = "011269haxlh2grq60qbmwrilgnkz6hlacd8x56iizl6ify7hcs2c"; - "CT18NNLO_as_0114" = "0im03f2vr9pfd223skadmcfrypxlpka4pqizjcbqq75fddhljivq"; - "CT18NNLO_as_0115" = "0pppdh2vq86iiar18c5wi2qbm6viv0hpyfah8pn1p6bcg1k99srs"; - "CT18NNLO_as_0116" = "17wsn6jxp25klk3x3yfa5abxjjdl5j9vdwxqb51zg6ic3a7is764"; - "CT18NNLO_as_0117" = "0nkdmqyqzzg19m98mqm9n2dcaiy4i97zrxmy7x1c3rxc0n7igkzh"; - "CT18NNLO_as_0118" = "0v931kw5dzqq95940mxmkj1r6a75w525j99yf47pyf55vg22ybkb"; - "CT18NNLO_as_0119" = "1z4kg4na0m2vrflnizxhjdxa9rdzp66mq66bxcjlvqiraf4ygkd4"; - "CT18NNLO_as_0120" = "07bz7q5h0rfxf5989sarchsv2mcn4093b6x5094725p74sw41sq5"; - "CT18NNLO_as_0121" = "0slw6m1scnajlfhxswd05if782k32gcyx9zz50gaiwqimrz188fa"; - "CT18NNLO_as_0122" = "1jrzxq7mqhkfj96whqfr3ny2g1kggc047cvzb7ladlirmi05injg"; - "CT18NNLO_as_0123" = "1zdmvp9pxjjs96yw05l5s0c0ym1hyj7d3an5siy3i20lvyxcgyz7"; - "CT18NNLO_as_0124" = "1lb88y4c68n669c2g2q2zwjp92d9hgbxgpl0b7dxny9a7zdmw0mx"; + "CT18NNLO_as_0110" = "0v7nsjcm1q7hgj726zlvfydl3arqkwyddd20z3g0nwdqcimv3qs9"; + "CT18NNLO_as_0111" = "118444ygv03ryhbb28njbsayvv0rdlcb9djja6p62kk6rnbwi1wz"; + "CT18NNLO_as_0112" = "0djxkvwk628sxgf62bff40m2m6vgzs08jss61f90rscvj6gxid5b"; + "CT18NNLO_as_0113" = "1xg7qs33h8zgj4007r8g4drhm95551slhwv62dzyv9pwy5vrvgdn"; + "CT18NNLO_as_0114" = "0i1g7kwfs39ps9ml0ckkcq7x4g1n764q1r06ilq7bci3m073cffn"; + "CT18NNLO_as_0115" = "16q0hc3p0325bq9zgskkpf9qfyhmz9q0rk3b0jrzpc0d4vk7b5r5"; + "CT18NNLO_as_0116" = "1mhnx8szpp4sfy592f8vzvjlzr9y46qndv3c42hf0jsygx5pc5cr"; + "CT18NNLO_as_0117" = "1bmcnjfzwf4bl70qyx6csix3ps46pd32yb2h33y2f144vp8bmkpg"; + "CT18NNLO_as_0118" = "1r1dmj42qrqprhq06i0h4kpjc1riql963n32icl0mfwjq9wpfa0g"; + "CT18NNLO_as_0119" = "1rxyd21h407zmjn3nnr4cqvinw2nwcdhid6cbr0wif8p2b3gasic"; + "CT18NNLO_as_0120" = "1llhnfijc7v6v4dkbsfgj2c3m0y4q42mvaynz06v2j3aqv3wzhza"; + "CT18NNLO_as_0121" = "19dqq2jz5daq59gv2zdvygyvwi9sx6i3ih82yl82yy82gbw2568h"; + "CT18NNLO_as_0122" = "0p8w4ypaxrpsyz3dn7f0964wgvd30iy4r1haa88hqwx74qrkb4pc"; + "CT18NNLO_as_0123" = "1c1sw5md5xp8l6b3qxbnf994kz2rd60p4bl3s3l2af7f77w57wfv"; + "CT18NNLO_as_0124" = "0ldf7dnzdlwqh0gmb6an0b8cwcjpkiaih49aa77j2irw2yja5p41"; "CT18XNLO" = "1k0cli4j0z5hj24pk9f78flhlvsdfya51hgh90jv4myniapk616l"; - "CT18XNLO_as_0110" = "0yahahfmzzwzxiqanm7029z05f3nx9cs2yjdvyvhazvicsq3ibid"; - "CT18XNLO_as_0111" = "1n0q8d0j8smq2z6n9l091r2q8v319zcf896nk2m0s7n9g9a0vcjq"; - "CT18XNLO_as_0112" = "1wj968g1vb58gz6vslzfmihvqg5f9f2cqgq8inlgdhai1y8vk1lz"; - "CT18XNLO_as_0113" = "1gi939mxv99q2r1m8a6d4ky5nrp24xv16xw6d9h7ly27jrw8kzm5"; - "CT18XNLO_as_0114" = "06gf4m01yr89xklch6ack012in2i1bifyzvp793x9w8m56dx12ms"; - "CT18XNLO_as_0115" = "1g4705l0qb0immd4la2vrj9v4kw7r7i1wz1vn4knbqjwig5kcfws"; - "CT18XNLO_as_0116" = "0vaxwg3ixf4x92vssh8gqrszbfa5zgzbsd5p81j14nlksshrs6bf"; - "CT18XNLO_as_0117" = "10qg2yr63csg4nd62a8h0s1z08cmgbkwvcsh0wp7zkzpw70r7x78"; - "CT18XNLO_as_0118" = "0kxhg2pn7ki4nxcs5jhxvx4fs6c414mq0d0qm3vldv0hsayqsbnd"; - "CT18XNLO_as_0119" = "1xd4ib2fqzhg9c6z2zyc8h3il4msm7rv9kkaaapll4h0gpjdda6x"; - "CT18XNLO_as_0120" = "0jyb8gs0avvlhiwwvrv09p47vs3jim3y315hg7wcy31xab90b91i"; - "CT18XNLO_as_0121" = "1afizsl9phvvdjbyrifx3ii10gpxl51rvx311imz30l51i3fzl7v"; - "CT18XNLO_as_0122" = "0wkpicsv9357lh96vjnrxzddaaaiaagyfph2jcyp97mjhixx2hlg"; - "CT18XNLO_as_0123" = "0hr9m422shvp5yzjdd7lqansim7qcx3iv1p017fp1a4ihj661sra"; - "CT18XNLO_as_0124" = "03zf75f6gx41g3fxrdc6sqkfcyzz03izchwfvabwfxr06yq94jxc"; + "CT18XNLO_as_0110" = "07k9ga6n2gf9qz0flvrd4if0mssddrq1bbk0rpxsy8wfp41cjsl8"; + "CT18XNLO_as_0111" = "1ysz50r2nc57c7srgqw1dcvyfr9h578dkz24sbimxq54akp9jkxy"; + "CT18XNLO_as_0112" = "11wvnvsc6a5c2ygq39avai4xk2mrnfnvi4fqzmkjdcm0kby0swpb"; + "CT18XNLO_as_0113" = "0cyv8y2m3514np7f3fwpf3g1mzy2cz905sc5lrjqff5djwjc23yg"; + "CT18XNLO_as_0114" = "16vj7hhg3psmyr4vqvy8mz4bg7rp6jc6b64n2dfpq5jvb15w2fbv"; + "CT18XNLO_as_0115" = "0ylw7d9g041fgrjfvq0i0ycpxwbm3s4jdgm5mkjk6yj0s4mrrqcy"; + "CT18XNLO_as_0116" = "0mcfgih55zja7k0cdi1yd7gx1gjr6cpzz28gz4fxyxi2l4paxh2k"; + "CT18XNLO_as_0117" = "0klzf5bchabcjc0c8h6f09g37jy6vwrpq7q8iwrfcmar2slx26r2"; + "CT18XNLO_as_0118" = "0hd1bhlkmnchcv0xbrqjc3paa7fqp249sxi9hg71x3qbh03ab036"; + "CT18XNLO_as_0119" = "1xlxw18hcsv7bij4dvnj9dfm8sai5xm9jggb8g7flmvkmcskgzmg"; + "CT18XNLO_as_0120" = "1ixdg56qgm5701al85zkp81xx3h9hsipqka8l3sh0ghp563qxk32"; + "CT18XNLO_as_0121" = "1msa7pp1a77wmvxa9mhr0sgjj4yv1msb0igqj53ahzgisyl3lnml"; + "CT18XNLO_as_0122" = "1kin5bf9bcxadqibqfzb03bxdrj759mlgpbpjvvpxg4ishj0b7yv"; + "CT18XNLO_as_0123" = "1mir3cpvbc30l3m84j1ql1d8phrx7nf0qd5xbq9jfl4gx1kjfw8c"; + "CT18XNLO_as_0124" = "0ims3sl32rria896ckm9fg5dsmbf6ivcfl3drnqpl328ynrkbzlr"; "CT18XNNLO" = "0j7bwzkhax4cm3wnbhqdv48j4wha9zdd7v77ihlgcvcmk79rx1fa"; - "CT18XNNLO_as_0110" = "1vwaz00jwpyd1nafpfw0mw309v10zqxcsygdjsdd9mn5p1j6z3hv"; - "CT18XNNLO_as_0111" = "0g6w519dc13mzgb2wpyy7chnl5wkl0ndrdiw7nymad0csg20yss2"; - "CT18XNNLO_as_0112" = "06wlzpx9b83gblg4rvqv22k60pvjikqs5m5gp2kvrwmc2wxp73d2"; - "CT18XNNLO_as_0113" = "0ybm5v0dprid7vvsnsihkd3vn5gqsqsmib63sh3xl45i58h1szzz"; - "CT18XNNLO_as_0114" = "0hpznnkarzjmf5447jp9za1w52lqpysprnf14v31mda9k7a6kdkn"; - "CT18XNNLO_as_0115" = "0lj637cwm726hqilrnfa064apdsqdav142dy3scz2gxzpzqpya7c"; - "CT18XNNLO_as_0116" = "0m1zh15f975g628npifyqmlj578lpdlc67sdrxgdg97jfvxrq7s2"; - "CT18XNNLO_as_0117" = "1r5kwl333ipq3g78cmn7h5yxk2gl3rfszm1ijzyf8hrjqz9m2p35"; - "CT18XNNLO_as_0118" = "070jcd7y5w0h65ssk359w4kf2j7164pgdkg78mjwifi2garrlv0s"; - "CT18XNNLO_as_0119" = "12nzzjyllr4vs422dxdccjy0qffg9gy8p2wa828cr3a26wjlipfr"; - "CT18XNNLO_as_0120" = "1b9k3wd212nrhhncckj6fml58jzjagiskgmc6h248mcc8mcc2gyz"; - "CT18XNNLO_as_0121" = "1wkgmkw5djzxc5g4iyr4h2cz08jv1clmp8x8xcidg5532zclavmd"; - "CT18XNNLO_as_0122" = "1w7jhlk432qni1kn1big44yk16bxghbzrjb1g1rdxpibzy2jdkw3"; - "CT18XNNLO_as_0123" = "15hqb1c4jx41119h2ahx6zacbigs9xw92jw7c4xsww9dkzr1qsr5"; - "CT18XNNLO_as_0124" = "0fx7am4dv4d09hdk0yxvxzbdlhzc03y3q2x1hfx9wk07kcxw1mj5"; + "CT18XNNLO_as_0110" = "1cxlps6kvm08lkgvrqjd8080ykc1dvd56986iwwzd0s6whlpfsi0"; + "CT18XNNLO_as_0111" = "0bbp4qz3n9pwcfn6m623q2qqmx2wcgpy6759wzwpjnifym832j95"; + "CT18XNNLO_as_0112" = "16p36jf8c8pliaxd6s30cmmmxg9slnmb2527vnwkka0kp9qw3ffq"; + "CT18XNNLO_as_0113" = "15d4qx8x56kcg6p8980bslhfilkld8yf1mwpdzyf8v8ns50wrbw5"; + "CT18XNNLO_as_0114" = "1zsfys0xkgf8zlbzzjmh1wvzxwjqi4rvgik26s5y4ibr68gshvaj"; + "CT18XNNLO_as_0115" = "1x00d2q2lnl5w0l052v9cvkywav26b4r072dpn1jiak6n52yqqaw"; + "CT18XNNLO_as_0116" = "1gm9m0rl9vghswcb4xgp54lc3h8wkh6c077625m9y0166xbv5x2d"; + "CT18XNNLO_as_0117" = "0630arl5qwjhxw0avzlc0mr4hwi09ki8xfn4zvfccgpy2nd85q5b"; + "CT18XNNLO_as_0118" = "1nx75pf5krazrk3ff3lb6zjnxz2qmffrk5vcf06iq5qci9zi5l0q"; + "CT18XNNLO_as_0119" = "0dzjj9f2qkpwfr9pm3pfj6jw5ih2jis8wzc8d0vyh5mm084jlk6a"; + "CT18XNNLO_as_0120" = "17pp23l0brnd0phq23888qbkf1c5j1lcskrbm3v3f2cd8p7jcvvw"; + "CT18XNNLO_as_0121" = "0hlfx8zsxc1x6glny4cp2vpba8jgjix9cpsfixff9vkbqpm2ppk0"; + "CT18XNNLO_as_0122" = "1918l55khrfyb3lcxsbbf9w6v8j54klszl2c32nmna0apf8zc3qm"; + "CT18XNNLO_as_0123" = "02kak35pj6c4hml75na7452ryashfclglhahclzkpq8gs72l5w91"; + "CT18XNNLO_as_0124" = "03wym12nvwdcr13dz6d2gr4bz3csffnn21zfdld42fsyq4glx431"; "CT18ZNLO" = "0iv8laks2ymn5fygk6k9lxm3s7fld5g292n9bfkhn3nmcfxczi03"; - "CT18ZNLO_as_0110" = "0q90c9nx0b3fbqq317qr0j13cc9m3zcgpk3pcn8s2sd6aaksa66i"; - "CT18ZNLO_as_0111" = "0wnxj323k29xvcrrf68mfyhflfnblvvnx63p070l5x52qqbfjl7y"; - "CT18ZNLO_as_0112" = "03qjvv004g99lbi022l9bvr82gvv6gzk651r8x5hwwyr0mar4j0v"; - "CT18ZNLO_as_0113" = "0hw6w7x3bnx2fy03jj5yvbjjab9mj0fzca8bc46phjsmx3nqxq5k"; - "CT18ZNLO_as_0114" = "0gnhqhxcsaslcldhyh69lxdx1misjz5qiwry57n31j6mqjrggqbi"; - "CT18ZNLO_as_0115" = "1dn32bwarggnfq2s9drmdjikcrn0nm0mqih4f5wxr3zbmq70xw4q"; - "CT18ZNLO_as_0116" = "17q8ysl7ar1n7wym55k8vzrx963rip9l9b0kxw2bqkha5ipwmnv3"; - "CT18ZNLO_as_0117" = "1afaqy8afzib6fmyy7ysnfk8w5f92893nvh4fn1sx9ink7i2zqal"; - "CT18ZNLO_as_0118" = "0sbhjzjsjd8m6sgz66vky3w7ymhwpss0dr2p603dxgm84fig1kzx"; - "CT18ZNLO_as_0119" = "0fxplpy2l1fdh5p4csdlabg36xgbpdg8pcdfcnws2cfj3g0941as"; - "CT18ZNLO_as_0120" = "05dk8bvwkn5y5j4rk18an25rg1f1am9vlddal84rbp8m15qnms65"; - "CT18ZNLO_as_0121" = "0ymql1wjxng5i887lx2q6p8gryw29zs0d2hzkfxl4f0zzn2wlwpi"; - "CT18ZNLO_as_0122" = "0gnl23n4ljlry340pwwfs0xs22bl2qp2b8p3f73gpp9xn42nwz1g"; - "CT18ZNLO_as_0123" = "1wfx59iadvn85raa1bq81ipxpjbxli58hs8wpzm1vz10ilifn9d5"; - "CT18ZNLO_as_0124" = "0jm0gnp8g1drz6a10wrdxkj2s8gws80ias1ixdnr5fdmnghf1wl7"; + "CT18ZNLO_as_0110" = "1d0j9nmn9mk90698pxqlpgz7c7cyxswc88n89cr2h8mgcg2w8g2v"; + "CT18ZNLO_as_0111" = "17l7j1j2x529mhk0andkdh83k9z6kg9v3ccfna08i7d4iilsdfrs"; + "CT18ZNLO_as_0112" = "1b8mi0jwln2wvysrkbm1fvay053d17dzvlj9fkz36xmr03bv5mvj"; + "CT18ZNLO_as_0113" = "13dkpjvh5a3p565mhpxqnhijl3jd2zr03np5psknvl121gr007fk"; + "CT18ZNLO_as_0114" = "0drryvq2x42xpf9bmd6n4vz1f8ddh83c3rynnzm54qssxmfkb073"; + "CT18ZNLO_as_0115" = "1wdj056rf02jksa2l2panvkijvvwr6rsb8kh3g2bvx0yjhff8g1c"; + "CT18ZNLO_as_0116" = "1ibf0841irsa4vq9sg0kvrhvakyyshpvs38frz9v3zjbc012cldz"; + "CT18ZNLO_as_0117" = "0l2nabywfsvb1sk44rqgrwf8h0lxkz8qf6pmzr8jc3zhq1fv04sl"; + "CT18ZNLO_as_0118" = "0dnksqqshxqr0y3qr3diyvhfq1jxy1x0hrjw8xk76jzm61xi96x1"; + "CT18ZNLO_as_0119" = "0qljv4d1qfc9rx3p4a8dghij11dv1mi03y30wdilfxrf98znvdyj"; + "CT18ZNLO_as_0120" = "1w0p5gai8qhfjh4jxhyl26xrp8n210cp2a7zjd4id1s4pcvpzvn7"; + "CT18ZNLO_as_0121" = "1ija1nqc4pbprcc3ddhl9rxxbaxngjr256zxiy7gg3wmg6364hjl"; + "CT18ZNLO_as_0122" = "0d7h3vli13m1pm5w91js8skv198aqz9kjkx7w0sa4v2vhvz1rdyh"; + "CT18ZNLO_as_0123" = "14cl8fmkl6jav7byqwcfa1z2ml6lnn6pzp0w4nqy75gc7wxsba0m"; + "CT18ZNLO_as_0124" = "18riha0fflfbsgh7nnc3ghm8cpzpcss0z6l48d28bbq0i7caqad7"; "CT18ZNNLO" = "0zsqrpab6vgcinsxjq3rqdadig5flxzk61wc1aa9rwnkbpm1paa5"; - "CT18ZNNLO_as_0110" = "09ypj0yydkiw82bq3ymsp19i4iz82fm2z2xfplb3iasa86y377in"; - "CT18ZNNLO_as_0111" = "00h0zd5indm57xhn467qffpx7aadzb73vyfazq09pl5vdqq9fn8x"; - "CT18ZNNLO_as_0112" = "19vlb1bvp7r9jnknd2dvblggim1xqf4yjqyf5h04r90b89pyzxn8"; - "CT18ZNNLO_as_0113" = "0h8i68dligavf051dpil2bqvlxm19156v1951n340pcncaxxi5d1"; - "CT18ZNNLO_as_0114" = "1n2drxdd6f36njq0lcfm7s6cyignqdqvirh03ixvvar2pgj02yay"; - "CT18ZNNLO_as_0115" = "0cv633f5gg6hcyhwfh22h5n4irnk1pxsk7949wiax7qkl84mcm1j"; - "CT18ZNNLO_as_0116" = "17z25cky2ysrcplsxblrzka667npnnp42k6n8jsm73pagscsj91n"; - "CT18ZNNLO_as_0117" = "1yrbrzbg5r2pvwhbnvfwcp9d9rvfmqqxwph0rd0sdfix9agwy2yd"; - "CT18ZNNLO_as_0118" = "019lbvb8pjfbwz8hz8h2xw76nf1ly9mgnbz6pzi3v9msk0qbmlp1"; - "CT18ZNNLO_as_0119" = "1x08wg3y3fqa8ah6m0c6x2fckjjyylkhnmry6vg93rp3n7qlvynw"; - "CT18ZNNLO_as_0120" = "0m9mfr8553yrysbcksx17nz1gm1vi2zvs5bp8d3v82phsv5alhf5"; - "CT18ZNNLO_as_0121" = "0snzl818ag926n0i67hdwkjclfvykx546vfnvsx7n2z5pabakd1j"; - "CT18ZNNLO_as_0122" = "10i7dk1bllyk6f3l92kbiqdib8l2zvqf91g9c20k12sim6n6x2g5"; - "CT18ZNNLO_as_0123" = "0v2h2fjkdsnyssb6ralw32c23l0nmdxbg3sx38vxh2y2s2nycz5h"; - "CT18ZNNLO_as_0124" = "0w29hn728p8yip40mr27kqmv5wndfkq6nx0vnl53x41pwczkhkdl"; + "CT18ZNNLO_as_0110" = "06qzlfshx8gwrhnmjfvz6sxq7h2is1dqvx5sz8jxrr1gl7gl92h9"; + "CT18ZNNLO_as_0111" = "08k101cn9x9y44zcpn6iql85qqx89rv7xjhvak4y6s309p9rlnzi"; + "CT18ZNNLO_as_0112" = "1c72mz93kha8mdfdcwj8fs8dqqylxmmc4vs7fjf9h7xbrqzmss7m"; + "CT18ZNNLO_as_0113" = "0z7s1kmlrv99r5mb6p1xwrydx0s896kr3va0ld3gq39a0f6bqvfz"; + "CT18ZNNLO_as_0114" = "0ir6n8i170czq7h3badim28540478cq5fb5vv4kdi0ncypsasr4d"; + "CT18ZNNLO_as_0115" = "0dncvhp99v5s9746ql37gdm65byih9ppg30c77k50i2485a1zfap"; + "CT18ZNNLO_as_0116" = "0qihfcsgxv66l781dmvmmpbr0s0c52s90jfmz5y52gyy1lplw569"; + "CT18ZNNLO_as_0117" = "0agqd4vgj53w9p7ghfkrskqyvg7lw5g9ilj0fid0jia8adfh58xp"; + "CT18ZNNLO_as_0118" = "07y1l00igx7d2yaj9gi60fvqz1p8f8z44fmxm84fpjikajabff5v"; + "CT18ZNNLO_as_0119" = "16nnwwj16c8fmqh5mwnihzvbgfj3cnvw01i1il1gr0g4zqpn0yhi"; + "CT18ZNNLO_as_0120" = "0yy0lxwm41aa727wdrq27l6ih7fdaqwiy4bkrbh0zrns0km9r958"; + "CT18ZNNLO_as_0121" = "0yg70dx2wi9wf5914shfqaf2j90dnkfnbp1pq2jzxd0h0sxhlphj"; + "CT18ZNNLO_as_0122" = "1bd4193ggv4nb48d0mw2n93ia30h4myfy197k9b0m3qc90xjq77z"; + "CT18ZNNLO_as_0123" = "0r2vri1brq0xcrpj0cg9hf9kwhkh2czmimrsg5bfvx35adiiis19"; + "CT18ZNNLO_as_0124" = "1wq0nz9jfb5fmzwnnh0xyra2j62kb5xpmh2nyy8ih4lvxhgi16mg"; + "EPPS16_B_90CL_Au_hess" = "0ab3pnv8fq45mdp29m6lfmrhhnr88k6qvkq6lwxmn17k39v8j9w4"; + "EPPS16_B_90CL_Pb_hess" = "1cjc79sygpxnir3qw9n6cdwvd3flfn11ajqs5y64svrpsqcx5ng0"; + "EPPS16_B_c_90CL_Au_hess" = "1ijvnglq4wrjhhvksyd60s7c6nv50vwyk5vd8c3gs0qr8yz1fk69"; + "EPPS16_B_c_90CL_Pb_hess" = "1347cqsfkim0xcds5imxmsdxh8x0h2n97x5zwpf035rbdk5mkr4n"; + "EPPS16_B_d_90CL_Au_hess" = "088jrj6xf1ph19sypa5dizllydfzi6ikxq2gisdlxpj1qnwjymsg"; + "EPPS16_B_d_90CL_Pb_hess" = "0x12r31l0nvqsc2ml1zkil0w1iji52xgbnxn3wss9pnmswrf3cah"; + "EPPS16_B_u_90CL_Au_hess" = "1pq7agglirpk2w566c1ql15ps1aglmnph2p2dfa535zlv89s7c0d"; + "EPPS16_B_u_90CL_Pb_hess" = "137jkcbikmcjaxp8rpr5j193cmr329mcvyy7j0s0a6ynglhpr76k"; + "EPPS16_D_90CL_Au_hess" = "01ggm0xxwd3nc95cjcf36sy0pdb0xvk6bkiaq328w2sfajccr5mk"; + "EPPS16_D_90CL_Pb_hess" = "1z3zam84m2kbs7zinn87xhlca90d5zwk8j72yj19nx3r92brnq8h"; + "EPPS16_D_c_90CL_Au_hess" = "18sviyvm3rm9n7x79w1sx8j9mcc6dnc2il8hsw2avjgy2aqmwj87"; + "EPPS16_D_c_90CL_Pb_hess" = "1ryv83iq1lrphgxvdsmh70j6iky993sax0s9cfrswpjyl2pcilq2"; + "EPPS16_D_d_90CL_Au_hess" = "15j6s9mj1ci9wjgsfhbxfikcyxc5pilv56cyzxjhgjhfgwvi1xyz"; + "EPPS16_D_d_90CL_Pb_hess" = "1qjyb57fhf6d3g7l48jcl6jizj2c5g63xahzanrmkm9r538hvhcc"; + "EPPS16_D_u_90CL_Au_hess" = "0jjk2rccvv0ngxn7wf33j21y72wvs4dhwl56yhmf7bfzd6v70rp2"; + "EPPS16_D_u_90CL_Pb_hess" = "09npz68wwvcsvd6h8lsgmlr19l0af4h4rppcd6jlwd88c2zpb3r3"; + "EPPS16_Jpsi_90CL_Au_hess" = "0msvkihdmhap0bbiydxbp552k1sgk20wadvc2s2h9jldakdx0pk9"; + "EPPS16_Jpsi_90CL_Pb_hess" = "13vc490k1769gbph3xn1lffj0ilvhz78by3lhw45lwkra4vx5zp4"; + "EPPS16_Jpsi_c_90CL_Au_hess" = "069lzrnm5kx56rblr4lxqvr014nrf2yyf1iw42s37q2xsxpjip87"; + "EPPS16_Jpsi_c_90CL_Pb_hess" = "1895iqzmcnaqkidcy96z4766wppycp1riwg9clg71cb404wz74as"; + "EPPS16_Jpsi_d_90CL_Au_hess" = "0ndh23dyaszam144dsdbg4281c61vai8avgi4y7x8kb0paha4icm"; + "EPPS16_Jpsi_d_90CL_Pb_hess" = "0xflijnwabg931z19v8c18dzh1lbqivkg94kpwm8j135ya1vpmm2"; + "EPPS16_Jpsi_u_90CL_Au_hess" = "1hagv9akwm337kq3kvkpkdkcpnic7klnigh9pyif1gm16i1q40jf"; + "EPPS16_Jpsi_u_90CL_Pb_hess" = "0dw68rky105lyaagkzkmfx6l9jk763m293m7s972jhnl5037bj74"; "EPPS16nlo_CT14nlo_Ag108" = "1p7gckhv44h04rvknd6fdizy9c1jqfwic7ppf0ra14ic8wp1g7wg"; "EPPS16nlo_CT14nlo_Al27" = "0hxyakfgknmixxndfj14i44afp5gcfz9afjvjdaj702sv42a7qa8"; "EPPS16nlo_CT14nlo_Au197" = "1g272110y3a1fr6raxdfhagn68i0lcnwbdhiiqg4j6wb6v4m3p6i"; @@ -421,10 +448,15 @@ in "JAM19FF_kaon_nlo" = "05mcahzr0k5w0hqfbn902lmkwxlkbf8wrk6akpqnfsyqpbmhja5k"; "JAM19FF_pion_nlo" = "06krcf0c9jbbpwf1rk1xd5z7rz904ji984xz05kv9p1j1vgk0ha0"; "JAM19PDF_proton_nlo" = "1zrcijik60rci6km5d8pn8ivww8w3v8pb1m5dshqjs51lhf56ayp"; - "JAM20-SIDIS_FF_hadron_nlo" = "11g4syy0r46m1wvzq0pb84s4kk2aihjmhx16mr8gzv5b11520a6d"; - "JAM20-SIDIS_FF_kaon_nlo" = "1b2rz6k0g6ck3m28vdqjnnfc025ql5alhjmgn1l84cflf4fvkkgp"; - "JAM20-SIDIS_FF_pion_nlo" = "15l98gmzsqxw615802si94dmj8ihsz6n1mraxkkwjl86hm8nalzi"; - "JAM20-SIDIS_PDF_proton_nlo" = "07xwp9as0nscm4whl5x9bry1p54yl5qmj2r3hqh6vjsz6mxksdjp"; + "JAM20-SIDIS_FF_hadron_nlo" = "0bx3igckr2dszxskz5f952vl0q7kwvxgyb28yksjk75325dp2f9c"; + "JAM20-SIDIS_FF_kaon_nlo" = "060r6ah5843vm1r3rhjvlgp7w45z39cqgibfc2g2m1q7mwjqccjy"; + "JAM20-SIDIS_FF_pion_nlo" = "0fpkbl5fw76wgk8l599kf51mqa0fy92bq9ksfjfks0c4m6ah1g5i"; + "JAM20-SIDIS_PDF_proton_nlo" = "1g1g9n2ij58yzvgrw8g1f8jbqyhj9yvbvl9iqjxllkhkb2zbllpl"; + "JAM21PionPDFnlo" = "0zn7p9ny6072dkhsiaq64f2gdzpqbqc06d9a21rvvg3cgsba9jg3"; + "JAM21PionPDFnlo_pT" = "1wxpkk1wzx1z1kwxfj6kz14pxlckb96aqaq2fa4sf1a0ph1ibrc8"; + "JAM21PionPDFnlonll_cosine" = "0nbmdc0744kl6r7r9lfs20gffpjyxpcfpkp7f336fn1mcl89wggn"; + "JAM21PionPDFnlonll_double_Mellin" = "1n8fqar0dddc92054kg3pl1xlh6z7smm3glv5fvfxr933bxli5g8"; + "JAM21PionPDFnlonll_expansion" = "0dmmalgmp4xjwimyfx0sa8yafzzm0xzqk557qwkli3ramzwrwy8p"; "JR14NLO08FF" = "16azkqxf1yw1j32ay6j01gf8n9n7qm56jh4yzgjag0zdhm01lbip"; "JR14NLO08VF" = "1ilw38pp4vy8c8v1glfi4ixca73wjkdg3di1wh9p8xqrifdb096p"; "JR14NNLO08FF" = "1w0pywmjb4xi7bsvv1mdd4q2adf1g7khspfbkphmlh8zipx29nxx"; @@ -435,6 +467,9 @@ in "LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c"; "LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n"; "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib"; + "MAPFF10NLOPIm" = "0w875dh5klqgggcr84g0g7qmh4q2xim8nrf0xdnfc665xww7v4my"; + "MAPFF10NLOPIp" = "1493k3p7b03sw0n7va60vqxcry2b3xgpww6fnk2gx8b4w1632yn2"; + "MAPFF10NLOPIsum" = "0x6sashkhg1hs7wy6fyln12s1f4yavvc90zv4k7rclbah4hr75wm"; "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16"; "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj"; "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg"; @@ -486,7 +521,6 @@ in "MMHT2015qed_nnlo" = "1ypqiz0yz6hnxfml7ym83k4qqvqsbl39abbr38galns8xzzpi03m"; "MMHT2015qed_nnlo_elastic" = "17in1cz5j7mm9qjk8i27fif6x276lcqmccl7kfz8a5yn73xxzja4"; "MMHT2015qed_nnlo_inelastic" = "1ngk4p7w8l8b8sfg6hlm8ypxz97i1iwzlrc48szy7bi99kn8rmy1"; - "MRST2004qed" = "1kdrzk2arvs36lnpkbc94w06hx3nh8nixh2qjhb271c2blwgahzh"; "MRST2004qed_neutron" = "12vna0ic6gh313k22b44b0k9kd939v7zjl2hj65k1075j23mq425"; "MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc"; "MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6"; @@ -494,9 +528,45 @@ in "MSHT20lo_as130" = "0ivjvqabk9jnrlrczjlqywmijx5ql8wy579j77qkl1vhv7sqccm1"; "MSHT20nlo_as118" = "1qwbwcq8p4hrprz4ib18mp5142b0lbyyzc1bf5a4iq5jjvi5qm93"; "MSHT20nlo_as120" = "10y1a6iryahrafzdqskypjrnad6xxq08gm72pa9yc61xdy6andc6"; + "MSHT20nlo_as120_mbrange_nf3" = "0548pw6lkwwqhlrg7c4cyqh76bcyz78yh06fs7crdbx7hfl47cj7"; + "MSHT20nlo_as120_mbrange_nf4" = "0pg49mad4845llj49a1piaggd8wpwb2s4ar7jydlhrv7im886by4"; + "MSHT20nlo_as120_mbrange_nf5" = "0148agm89p7pwzdfjk8gjdaicll30xhz6sawca632kp5qwyd4g3d"; + "MSHT20nlo_as120_mcrange_nf3" = "187hgg8klk5jhcadiy8viyrfi0jfb3i18jckv6d7nsapixz1wgkz"; + "MSHT20nlo_as120_mcrange_nf4" = "12pjy0igjcsih100g238v143kq5cjjm5a13cghcipgcz2w4ldglf"; + "MSHT20nlo_as120_mcrange_nf5" = "00mipn9ndnw1k4nx6pmxb95wddmh98hg9k0317vlirxrf2n2jy7g"; + "MSHT20nlo_as120_nf3" = "1zy0j9qc28xpav3gx24r6r02zfz49r11ic66hkyq83d3q3fj751b"; + "MSHT20nlo_as120_nf4" = "0fpyf9s9ppb6w49chsmb2xfp9gwkx3ky9v8gwwqxli9fpzsc2ywn"; + "MSHT20nlo_as_largerange" = "1f57dvxas2c6qnv38ysnsyf0y8imafnrxkcqh3b0an19mkln5mmg"; "MSHT20nlo_as_smallrange" = "1rygvj33g84whl24kgpqa47g11c48l93jlnpzqq8f5zr1ijqcq7i"; + "MSHT20nlo_as_smallrange_nf3" = "1d6cr1akc25mwfyghvn1986i60l76fxb8fd02h7f4pl4lmnn6i8n"; + "MSHT20nlo_as_smallrange_nf4" = "08js1l5g6knjx3813i0rf34xfjkbn3mdsrbawzkn00vf49xzcxdj"; + "MSHT20nlo_mbrange_nf3" = "1bwl4inshg5h3sslss4lgvcqahb5q0n794ag73hyacxd1kmx7d2z"; + "MSHT20nlo_mbrange_nf4" = "1sm995pzzr601wcs4rjgjs6alm74vc23szgmkqa5dvxghw7x8w55"; + "MSHT20nlo_mbrange_nf5" = "1sal7iqma7770593ifxypl9zapvba693asc8m2fjsbgpbfjjid60"; + "MSHT20nlo_mcrange_nf3" = "0lmv6m8m7zv0s8kjfm8parr9xlfy39dhwxn71z33f5x6cyp08zlg"; + "MSHT20nlo_mcrange_nf4" = "0875zfv0dws8n44fqawa1jp5p8b9vky8yyq48wijhrcph8qbxbrx"; + "MSHT20nlo_mcrange_nf5" = "0qjvam29zwibx54fgijry58vdwqkiwyavdwn736bmckjycncnv8p"; + "MSHT20nlo_nf3" = "1v0mzsa2sxp0g3m3d8yqcs7dgi74am6cpx79f341ahpwybz5x829"; + "MSHT20nlo_nf4" = "1lyii55adqaah6sm8b778q8scaq5yjycq3s8jdi3k48z8m23zqng"; "MSHT20nnlo_as118" = "1yz0003ixjg97974648qba5d37vb4fhzzmq4k9xh4c37pnc3kgyn"; + "MSHT20nnlo_as_largerange" = "014a9x6zsw3w7b6w3v6lg8qxdjicxslr79bnagi6ci0skqs2v7z9"; "MSHT20nnlo_as_smallrange" = "1bv7cbdynp6dm5c9v7r32gqy1lch4428apw426pr0d7xpm0abnxv"; + "MSHT20nnlo_as_smallrange_nf3" = "0n1j9dd069qdmgmd85m7wp29g96cnbgsdxrvlh6y51q063lkqbwb"; + "MSHT20nnlo_as_smallrange_nf4" = "1jkdl3rd933czz753qbi7yvszg376r6bvwq2inqbslnzfkfav5bh"; + "MSHT20nnlo_mbrange_nf3" = "095zcxhpfhlsb67ki4j6a8z4d1r5hzx92xlzprwkwd4v5ya4f732"; + "MSHT20nnlo_mbrange_nf4" = "1114z5a0pk9svps918zifff23difxf37rbmr3jnzxnyp1vfgzws7"; + "MSHT20nnlo_mbrange_nf5" = "12i6m01bmnzqadi6jg5gmah1jliq4wr4p0vpjgmpgyagsk4drx4b"; + "MSHT20nnlo_mcrange_nf3" = "01wq537083dr9ibiahwdwdaxj0j2ys211m478w9wgvihdjjvjvvv"; + "MSHT20nnlo_mcrange_nf4" = "04abrnlnbr94lksn29w9ws9a3b6sqkqvi9awmbk4715dxk2amnpk"; + "MSHT20nnlo_mcrange_nf5" = "0za255xi66a1mfch2b91qqmsr305m0kvs4rzvqlzf7k0v141j90y"; + "MSHT20nnlo_nf3" = "10yx59r32q4rl0yn4gpc29z8xskbvizkdr7k219qf16lnv892jpa"; + "MSHT20nnlo_nf4" = "17d10rba8b0aqi1npnx93j1995has5sw2l4izd6lly3yhjynbgp6"; + "MSHT20qed_nnlo" = "05c2hjgysyvkcyqg1lq3y00hqixgc8w984zivxkr76nj5csyf6m3"; + "MSHT20qed_nnlo_elastic" = "0in0y27gn4k9h6ya77krhizv8rg3i6s3d6h4bk0fhz91hbi4l3gh"; + "MSHT20qed_nnlo_inelastic" = "0vna0gbadf92w3xngb8gnsxd3lil8m029as8260wlki2axm4gqlw"; + "MSHT20qed_nnlo_neutron" = "1hiq7m8j7736477vfs18mqwhkxyvjmcrs7jiqysa8v6rmhb4bali"; + "MSHT20qed_nnlo_neutron_elastic" = "06dbvsysszpbvabgafb569vq88q1sm9mvz1iwv1m2b9vzin2ixiy"; + "MSHT20qed_nnlo_neutron_inelastic" = "0gfh6nhl4vq4qz1jhnv5vhhz4h4wlkwgj4ffjqll6jqa5anfhbqr"; "MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51"; "MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3"; "MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l"; @@ -854,6 +924,32 @@ in "NNPDF31_nnlo_pch_hessian_pdfas" = "08baysni2lhbpr1scx7h0zf64gyncj2ahcv4y86142gl4zqrafvp"; "NNPDF31_nnlo_pch_pdfas" = "09mw3gr7dz0vwdnralaplvlz2c464lmdizf673xsb0wlm12pqf6g"; "NNPDF31_nnlo_pdfas" = "0l92q3xhdk5nrnhkmrirxnvplj531rdpnblnacd759cl4hgxcs2q"; + "NNPDF40_lo_as_01180" = "0m630n5i7s0qnlxzk6ka43qfp6ipz2jgzr7ys42hdb66kg3z5lkc"; + "NNPDF40_lo_pch_as_01180" = "0wrvmcgdaipi7vy7j85yszaa3c57hs3xll9lfn9cdbjscvmsx6x5"; + "NNPDF40_nlo_as_01170" = "14j21qryc25k1jk4ypdcr3cgfkhyy4hsb57hy8x5pggfwc2w3f36"; + "NNPDF40_nlo_as_01180" = "0399bnxvgl2h2ini198jmzjjb179f6dpxfv5x8imlfl515llivx2"; + "NNPDF40_nlo_as_01180_nf_4" = "01kwziiyg8vbl26znv7khqdckm501d7ccxlkq1y0cd9s1f5ff8xi"; + "NNPDF40_nlo_as_01180_nf_6" = "1gv8anb3vqpzdymp9g69702x64pbh6l2rn9257hdpz4i4m98rsjy"; + "NNPDF40_nlo_as_01190" = "0wf8p2i4mxs3hkqvxg1clj082yinbdgccr6qx5kbwkzsck4yybar"; + "NNPDF40_nlo_nf_4_pdfas" = "1ia9glingyds6bj6yxy867ahriqdhfkxczzc4nki933h6jbj74bf"; + "NNPDF40_nlo_pch_as_01180" = "0gad0hjq9kwiymc9pljj4z52jsg794m3knb38zj9icgjk0p9lwxm"; + "NNPDF40_nlo_pch_as_01180_nf_3" = "15j3vvc0vaf13d8cnyr4h7gwb7iznrcajnw59ryx6ksz7cn84sy4"; + "NNPDF40_nnlo_as_01160" = "0y9115xlg14m1ahfffiam4zp0axga86bhzfxf0xiaxb36yzbmdhw"; + "NNPDF40_nnlo_as_01170" = "1h6if1zw9dqlfnn7glbl5flj792i7fqiy7pprhwk93k4snh3800i"; + "NNPDF40_nnlo_as_01175" = "1dkzzhmkmzm92gmb83lyirj3clicrg70h5grzh0j8nfcw0xlz4rm"; + "NNPDF40_nnlo_as_01180" = "1bhysjkji0k7xy9njarkfvxff05kjl1byhkknxv0875p2znzkpva"; + "NNPDF40_nnlo_as_01180_1000" = "04yai94qwd7187wg26icwf2wbwi20747l6zikd66ygsz9n34xn9y"; + "NNPDF40_nnlo_as_01180_hessian" = "0cmpqgaz341hif0gdkzq8mnfh9apxn1zxjwa12fk5svbig9i1a81"; + "NNPDF40_nnlo_as_01180_nf_4" = "1aj5y3fyvna2jwxbsrgr2cbc452aprxnwv78vh3ph20jlnww20pd"; + "NNPDF40_nnlo_as_01180_nf_6" = "0bf6s6s0w7l592bm87mazwff05d8s4qlblzl9yj91am3xlv0cvn1"; + "NNPDF40_nnlo_as_01185" = "0y1xn9qcv2l81sbz9rayzrpd1bjsdyixr42lzfgmqbq45sw2m04n"; + "NNPDF40_nnlo_as_01190" = "1ibz4yfrw1n8plq4gi03yxi9afaca2yprxfk2y9lvbkycn608d0q"; + "NNPDF40_nnlo_as_01200" = "1cfcn819aali7ylv9y6yb2ggqy0yghyj0dys9lf9gv5wiqjwh5q2"; + "NNPDF40_nnlo_hessian_pdfas" = "1b5jvhdk7fmnz8gl38i3408h2qrqcsr7s9v7bh6ilc7x52xsg65k"; + "NNPDF40_nnlo_nf_4_pdfas" = "1ssp315xcqpc4md5gijbi2c02r6hpazp8yw1661r4m7xy5qm62wc"; + "NNPDF40_nnlo_pch_as_01180" = "173l2178plrir9fb3bq17l4dw5qfy9clic4m54wqg7y3r71bmv7p"; + "NNPDF40_nnlo_pch_as_01180_nf_3" = "1mh0pl1f1ayx1fjj0q1fw9s7wc7gmj7a46jli87s4g5nxrhyki9f"; + "NNPDF40_nnlo_pdfas" = "16d81h0pzxzgwwrfjghmradx4bijf08xbrdn79y9bxf6czacm8n6"; "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8"; "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8"; "PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7"; @@ -871,6 +967,14 @@ in "PDF4LHC15_nnlo_asvar" = "03fh1jcbmvla7n2jj3zq4ibwvq66h0rniply7h93d94zawcgsy4v"; "PDF4LHC15_nnlo_mc" = "0c6nfkv3x1p5iw514knjvqcs1dcaryf74qqg1za8x234yr5ndi3p"; "PDF4LHC15_nnlo_mc_pdfas" = "0l8hlcz69cdii7mpgargi9nsx7iy746nad5pnn7pvycrc40marij"; + "PDF4LHC21_40" = "037bs1l7zr3z8zi6wzh5kxgml84bl64258fr2sm0dzv9yxh8lvp5"; + "PDF4LHC21_40_nf4" = "0m2ki4qmgl1ggim2inlgynjzqr4ya3qgjph63jf72kia8ks2hfl0"; + "PDF4LHC21_40_pdfas" = "0pigpix2x2bv1a5ib17zjlfjqygjpjra0pgvmf6knm7mbgwxhqm3"; + "PDF4LHC21_40_pdfas_nf4" = "0dayiilh94cszqiphr487589qacawfp4za2cngr3da03yg1aswbd"; + "PDF4LHC21_mc" = "17fbwk7fp2m3fd0xzp94sp7m0mmjmzakg870rbhg8vi88bimmwry"; + "PDF4LHC21_mc_nf4" = "1n7h45yxw2mwppf6zblc8v415khy9vgrackmbfkm5lb9c79faas6"; + "PDF4LHC21_mc_pdfas" = "1pn9a7z0xl1bn18z461j90sjglccswimm4p23nyq0fxal5ziidbl"; + "PDF4LHC21_mc_pdfas_nf4" = "1andl5n1lw5iyd337czph5abd0sqc3l90b21g67af96am5pprcpk"; "TUJU19_nlo_119_50" = "1q1dhsxz1kq75rpzv6gg6p6bzvvv0d44pc4y3wsiy9g14aff85vq"; "TUJU19_nlo_12_6" = "006j6y4xbjss9apzagjcc3r1z6s61a1hzafhcyriiffqhn8bg50k"; "TUJU19_nlo_131_54" = "0ymf35alyar6fwagmdny2zz2aag576f38kail7gh2lvqpmjmv6np"; @@ -916,7 +1020,6 @@ in "abm12lhc_3_nnlo" = "09k90vhjq7p0i0aaq2697pq2dc86bkmnv4q8zyqxjp3wnqx1v95f"; "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz"; "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j"; - "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix"; "cteq61" = "14hbc855b3wsjk7ypg86md46cjm1bj7n4hins9nr8kgzs69i6vss"; "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y"; "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; @@ -943,6 +1046,162 @@ in "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2"; "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d"; "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1"; + "nCTEQ15HIX_108_47" = "0iqv6rsvvr5mqiaddn2cs6psrslw6ncqxca993v0z0hng9ahnnwd"; + "nCTEQ15HIX_119_50" = "0gxdr596gk69sb76r90p5ksvx9bk4axj21qrsyxjf1bmgdg2rv72"; + "nCTEQ15HIX_12_6" = "0vkkz3hq0irvfb08cpdijfvv17bcvzaba5c1bf8kwx1i2zl5s6xz"; + "nCTEQ15HIX_131_54" = "0pbm6390cdglxqzrpl2slv65m943m32i10c49pf70fg68x3l2dff"; + "nCTEQ15HIX_14_7" = "1yshwpa3zzzmf7s5v3c3130ysm1wciicz202hrraz4px102h8a06"; + "nCTEQ15HIX_184_74" = "1wy1691pc776kv456cbjl5x5rg2z7cycyfny24caq1qvjifvbr94"; + "nCTEQ15HIX_197_79" = "0ckbp8cw49ch78q4nsm1fccn6nizpipdp8q85nnipql53xsnr4zm"; + "nCTEQ15HIX_1_1" = "13sfws9cmrsnp26mx4m2n03gary2m10l67bd8xic8pykgpr8c695"; + "nCTEQ15HIX_208_82" = "0fqvzpqszkyqb4f2y44hrdj7rvadbqj6y8fzkl9xzk432lalm8w5"; + "nCTEQ15HIX_27_13" = "0z356q82x6cm52f3qym7vkajlkf2amkz87as0jvfiygvi4gnilcn"; + "nCTEQ15HIX_2_1" = "117dgz8nx1j64xgqlp40zmgpg0z8b0p1j75d1llvshmksba43avb"; + "nCTEQ15HIX_3_2" = "1k1hxpcg39hrh629ml2kwnhir6pq41rpic48njq2lagmrcdpbn52"; + "nCTEQ15HIX_40_20" = "0q1ggww4a5cdf802737kh7igb0br3q50xw205v4b5p7v237wsiym"; + "nCTEQ15HIX_4_2" = "0n9zf4yxvp3b3ryxbkdw0yilsb21nrjh40ms883d6j42slzhf37f"; + "nCTEQ15HIX_56_26" = "1z39vjgp6jryvqaxv6jq05jj0lfxsj212g17amch65pgxm4l7cwg"; + "nCTEQ15HIX_64_29" = "1iy1g1226irrjxz9wwabwd6x0712dm1aap7ka6fy9wwwbn87f6d8"; + "nCTEQ15HIX_6_3" = "0ljq0h0cdwbfvlpd40v2nypklimw4hh6k999mnyxqfvq47m13ffl"; + "nCTEQ15HIX_7_3" = "1y9k2snzymzgs26ayfn2c8n6isqzqq14pzf05xvlxmc3k1fbsfyx"; + "nCTEQ15HIX_84_36" = "130g553b22s7plgy51n56az05v1pnfgrg5knpg1knx8xr8a9xhh5"; + "nCTEQ15HIX_9_4" = "05igk9g2i1gm7d7npdwd7y3k7xf39scx1mwiw4m39b52kbq7kszp"; + "nCTEQ15HIX_FullNuc_108_47" = "1h2x2h2n02nwinf8ba3yyqa61384p4g29ib8vnrzwzc7q34940i0"; + "nCTEQ15HIX_FullNuc_119_50" = "0m5z036py2m1863k62pzysjdr92dhyiwmb8lxgky5skd7514rrsd"; + "nCTEQ15HIX_FullNuc_12_6" = "13rsl7lczf5qzjgy8m3dp4f1gyib2ffvf86iwci91sq51sma5kk9"; + "nCTEQ15HIX_FullNuc_131_54" = "1bsi3y6b7sxykwablgghqc89s3vxrvjr9y4bvhwcm21c2i4y6vbp"; + "nCTEQ15HIX_FullNuc_14_7" = "0w93qfiqdnzvrry9ddpbqcy6y16sszxfmvvgdy6r8i8py8dzfkyr"; + "nCTEQ15HIX_FullNuc_184_74" = "1q93f9rvlc4z3hzfhdmmxlyqfschrf99a0xyrc78rq1z2pfgmm9b"; + "nCTEQ15HIX_FullNuc_197_79" = "0kb2lnvh8mq25i5pkfis86ggs0s6hmpmyqqgimhcsamk8xnf2pcv"; + "nCTEQ15HIX_FullNuc_1_1" = "1nk792chip0iamc6dlqgqqlc2qlxlbgvgnhsvbmzkmmzvp2ji961"; + "nCTEQ15HIX_FullNuc_208_82" = "1l038nhnwc0pd7sq4yki3sjrrn66bsvqkvba2j3kf4f852gsyswr"; + "nCTEQ15HIX_FullNuc_27_13" = "1gdb09429xn5n07qqjch9x1cnq4xinf05wla8fsq69qr7bcdq9mp"; + "nCTEQ15HIX_FullNuc_2_1" = "0fnbpwv8qzgchc2r2gcjgw9yh4r94vm1rzbwj1f6ahbwrsl4rfp3"; + "nCTEQ15HIX_FullNuc_3_2" = "1r1s7ljwa169nbgc1439cj0gkaqza6ilx3x4gyq2jg9byz30khzx"; + "nCTEQ15HIX_FullNuc_40_20" = "13p7mnh2h8abih8y24rfapnrsd036pc8xy8qm82j8g4bk0j5jacx"; + "nCTEQ15HIX_FullNuc_4_2" = "0j1w7d11ybmpfci79lz99i94szxf5xn6z4kxvh8hly3qlcgn636j"; + "nCTEQ15HIX_FullNuc_56_26" = "08wds8afv0fzlaxck5i2d3pzvi5nqnc1jmq58fpnc7i0g238wl8k"; + "nCTEQ15HIX_FullNuc_64_29" = "0w4hn5iwqa65lnf6mhihx5qrq4wpcqw04ii3jphy79l58j3i1iam"; + "nCTEQ15HIX_FullNuc_6_3" = "1ki2cfsg0wmvfkzv2j9akiyl4d4b8v3d6f65iryxakjkhqj6vvgx"; + "nCTEQ15HIX_FullNuc_7_3" = "14mx5lh278p3zdc572bhxw9sc6n7ga0ak0ch85h3lx9zwg2a1m5i"; + "nCTEQ15HIX_FullNuc_84_36" = "0hyxyhb2mn64fwmijigw8m3v5zlj52hf2hicvx4gcq0lw063jxj4"; + "nCTEQ15HIX_FullNuc_9_4" = "17pydzll5lgs974gz4bchl2wxc9ixfpnqjrsidzksl4jf03gn77z"; + "nCTEQ15WZSIH_108_54" = "02z08pzvl8fa0bi6ddrlbknj0iryimw02r40z0nn7p8xf99qabhz"; + "nCTEQ15WZSIH_119_59" = "0r03k6j6nd2mvdkidw4gx1xm1s9hil9z5kanxsn2hzp30ab971db"; + "nCTEQ15WZSIH_12_6" = "00d4lis1qas1k8yzfb3dbqgvy9ynv7h9lx67ys3mj1ws5fqyn5al"; + "nCTEQ15WZSIH_131_54" = "10frai6qmzvp8xpkanl1qlpnc6chf6k5j70f4pw4abw8ycbjymij"; + "nCTEQ15WZSIH_14_7" = "02qd5x041p6n8rzv5l446481jb9vkc5nrc018vcg41735azr0d0p"; + "nCTEQ15WZSIH_16_8" = "164ciyxkrxp33r5nrkl86gq0jvdzm90hf602raamn1b5l5yrnadl"; + "nCTEQ15WZSIH_184_74" = "00nrwb8q6sa3zwbdc9mx4jz5ndibml84lfz8gad9vhy20zayyh3q"; + "nCTEQ15WZSIH_197_79" = "03hzr05vhb0l58iv9c2743c688ygagy1bi5a7zqn8nilsmykbvag"; + "nCTEQ15WZSIH_197_98" = "1mdlhp643z0gkjpj2jdi5zdd4qxxjqsy93rkv69cn1x5abawdl8l"; + "nCTEQ15WZSIH_1_1" = "13wskph284niaxqx92yaa4jg749ry6y98ds1ifvwc9970iccdnk2"; + "nCTEQ15WZSIH_207_103" = "0mpc6msqqjbcs756zd426xgzxmmmcmk8cp8wh2mpagib1drrg1x8"; + "nCTEQ15WZSIH_208_82" = "130bs9y9337pmgwi1ix0ar2xvhfhl4rs0626kbin5yrxhdy7rpha"; + "nCTEQ15WZSIH_27_13" = "1r01sbzixlrqxkjp9kx3s4zgsd48myivyc70p7ha83i1qrq50g7w"; + "nCTEQ15WZSIH_2_1" = "1qlh3zxbg13sq187k1fmssan00ifmqr0q2l7i45vc8jz3mk70098"; + "nCTEQ15WZSIH_3_1" = "057zyvlxz3hwlwgydccl2y124bvc6iwqqgav2jqw0r53a39rc25g"; + "nCTEQ15WZSIH_40_20" = "11psi56yk2yd75v396j68hfdacsnxvng2bw4v9g4afbjv9697jgr"; + "nCTEQ15WZSIH_4_2" = "0g4rvlgksw5gf6a7zh7yzsi2sq5jqkwbrx6d7jgz7zpg8jkg4qrz"; + "nCTEQ15WZSIH_56_26" = "12d0bj92b615kzadxwivp1q0j906m2rlcxfflwgwg21sv9axhi4l"; + "nCTEQ15WZSIH_56_28" = "12yx9v87y59qf14005fmj55n38xnhlvc7qgcrgfsicmdbx3ncm5x"; + "nCTEQ15WZSIH_64_32" = "02w3a4sbygc72acxnfc6lhird4nxcgq5dprfldg10h7f9lr7441y"; + "nCTEQ15WZSIH_6_3" = "05x3cknlnc1kbqnmi3hk6fjgx07dhl7b36rg3abaqn4yg65i79sj"; + "nCTEQ15WZSIH_7_3" = "0d6cmpv6csysr96knip033mw7sg56ls1gcq8gvz2qy7isj167gx7"; + "nCTEQ15WZSIH_84_42" = "15zva7n91p6s98kkhcfsvws20s26fl1bvjql8m1n1c2d5pr29wj5"; + "nCTEQ15WZSIH_9_4" = "04cs89s2m99p31jkc2k4f5i5rr0l4fpa6a41d59zvknhgfy74yvw"; + "nCTEQ15WZSIH_FullNuc_108_54" = "1wk8vhhlzj3wrb994s66q5zmwxhcy9vxpyks36s3jr5729jxk1j1"; + "nCTEQ15WZSIH_FullNuc_119_59" = "1rrkj7inah6bg03mmxgza39z40ghdr8km9hy5v5b69bvqcyr42a3"; + "nCTEQ15WZSIH_FullNuc_12_6" = "14wgacbimifnaji6byq1cds9zz266a63bvv616b0n06391plvzff"; + "nCTEQ15WZSIH_FullNuc_131_54" = "0k6gncwq4l5avlnr4qpvakklysi6g855yqksylc42ndlgjm4jxfy"; + "nCTEQ15WZSIH_FullNuc_14_7" = "1mlffwsn3f942flxvvi0rp63xlcrq88ir9vffmkzh3br3qpm4q41"; + "nCTEQ15WZSIH_FullNuc_16_8" = "1ga0kijnlzjz98j32bakcan89bfhbhq8y08d84d90xpgaqkpb9z2"; + "nCTEQ15WZSIH_FullNuc_184_74" = "1nhly8065kabzjjkapr75vafx46f1zl21xc6fdcv15a2qwx54n0p"; + "nCTEQ15WZSIH_FullNuc_197_79" = "0l9c684f427b8hhwm68swh78n6104nbpdxq6v50zipwc6df0j6w9"; + "nCTEQ15WZSIH_FullNuc_197_98" = "0vc285bd21arpmaykb6baspzr8ak42yx9h4j0sx2vj07l648g5hi"; + "nCTEQ15WZSIH_FullNuc_1_1" = "13gbjq46f5cdpdr902nxv261hqw041f7ryxbwgvxr3k2zm7h8fw0"; + "nCTEQ15WZSIH_FullNuc_207_103" = "08m08pcz0f72nd7zcrvi8cl5va49djlvdff1w4is4gmsb44khyv2"; + "nCTEQ15WZSIH_FullNuc_208_82" = "04x5icmidi1p3j8bdarl3sj0ak6g2ygyc5wmkkn9g80qqn4mxwva"; + "nCTEQ15WZSIH_FullNuc_27_13" = "0x4iv1kxb5lp514qm1nr3k32m68aw7sgy12nhdjhy2dv018snd8n"; + "nCTEQ15WZSIH_FullNuc_2_1" = "177qv17wv15sr1zcm2p6av20h32cjkspf4jj3jvvvgvks947n7dl"; + "nCTEQ15WZSIH_FullNuc_3_1" = "0aawk1ppg3nhl5n6gpdi6l1rw53l2x2sv3fwjz5821b6d7cmb9f6"; + "nCTEQ15WZSIH_FullNuc_40_20" = "1271dlp580a5gm29sv6b8plpc8d06j57x2xrfjyp7kafxa1158ii"; + "nCTEQ15WZSIH_FullNuc_4_2" = "0sv20zpzbinrz5biia1g3jzgyq0wbqaqrmrhhcyg2yxg9z48vgca"; + "nCTEQ15WZSIH_FullNuc_56_26" = "1wz1vwy2q85qz85kdy9gzzhnvv0jy4iazzavf9janz2xzw7833gg"; + "nCTEQ15WZSIH_FullNuc_56_28" = "01y0f2bz5yxmfd719fq8s1i3q5wb0dd81l0qkllpa961db83zmz2"; + "nCTEQ15WZSIH_FullNuc_64_32" = "1a93nqx26pj9kyvy66dmm4ib2pl5qwf03420q84zdl1hlcgaszzc"; + "nCTEQ15WZSIH_FullNuc_6_3" = "157j927a4x53gcam5kmpcpkyk76qgdlszxa4bcj9wlqrygwxsk3k"; + "nCTEQ15WZSIH_FullNuc_7_3" = "0l369wpd3gcb6i452w2hsjvidz80xl623xf1g1p8d2485nrvh6jm"; + "nCTEQ15WZSIH_FullNuc_84_42" = "1nikb7yk35s27g43k1wlgcfxqfyjf40csn8a6aiabliqdfjacaqv"; + "nCTEQ15WZSIH_FullNuc_9_4" = "0nnxf32kllwvm3fyjlswnyjx8cpsanx15qwsn03z6d67wx2f87sw"; + "nCTEQ15WZ_108_47" = "0v1s95f0wxyz73pfv5z6hc4mslxb7ml6imjmkhn2p9yx5mvk94qf"; + "nCTEQ15WZ_108_54" = "0zqw1p1sls58v7aacmwamlic0vsjyjijfam6bas5lh92rrmcf9h6"; + "nCTEQ15WZ_119_50" = "1wwx1rsjhd8rqrvyq68r70issnsby8zrlr8d76br3622mxqr83a7"; + "nCTEQ15WZ_119_59" = "11hckxdqyfrbsv3lc12q8zjysr2nw9mhx438ff13azp93ha7h1v6"; + "nCTEQ15WZ_12_6" = "0naqqy223p6gyw2r1qy5fs185dhmxzmb3zmkx3bbccqnspk7qcnz"; + "nCTEQ15WZ_131_54" = "0fi4sjv7rs90yac1zmnlf38dv5ry9zwzxrjwakpzh00irxw0cz8r"; + "nCTEQ15WZ_14_7" = "1k4sc588n3rd8fvcvwhxzc405iqj28xzv7y1md45kz1c7m6qy4cj"; + "nCTEQ15WZ_16_8" = "0ndjlgbggbk3zk5bm9nm726ci1v8b3qfy3gag14jmp7q780zyhmy"; + "nCTEQ15WZ_184_74" = "08cdkqbjihls2sg4waj9rxg7nvs0mjzxfv3dx1jppiw6f7ljjzrr"; + "nCTEQ15WZ_197_79" = "0ss7wgvx8rv03x1g10c516i0yd65njc7qjh19maij49aizf1fd4l"; + "nCTEQ15WZ_197_98" = "0vlyjqlj9plniim0z7mdhia307i296iha94l8b3iqgzyp9553gly"; + "nCTEQ15WZ_1_0" = "13wnm5sz1sf3hng70j8d3ml53knrx9b7wrg2h6x947jl51flrkh4"; + "nCTEQ15WZ_1_1" = "0pllq4zdgjaklad9j87vilx8gapzfhjh478gcw479ahgjcbbbxxp"; + "nCTEQ15WZ_207_103" = "088d8sr9mq9q4bi0ipxznbm3k2b2k347bj9k5fxsb27f4dl5d0jp"; + "nCTEQ15WZ_207_82" = "0cxagqav2q6kwq83syiad67nmzzkmrg9q0hlshbz6bjlcqmdi4jr"; + "nCTEQ15WZ_208_82" = "1c7vacsr2m6r7dy1b439c46xgxjqvq1gj9y68p2vargm5az444sz"; + "nCTEQ15WZ_20_10" = "1y38sqjgsjrfhmyhf688jir2hgkk871sjz8dm89lm5g7m5c1mgmq"; + "nCTEQ15WZ_27_13" = "0gb2zg5j3jcqjisa3nzsbif4rfi8vshl5vq2vq93d2132qgpzq3l"; + "nCTEQ15WZ_2_1" = "04nhmrvy2m4a2i8b5qadsg8h51k171df1kb7mdqn3hjzga7lg0j7"; + "nCTEQ15WZ_3_1" = "00aansn8jjh8yqyhr2fx8h453nahrdf8j1j0qgny1n1mhad4mc56"; + "nCTEQ15WZ_3_2" = "1pk6gp5a1g15zn5w00l89liz4w7w4xsmpcdk4x50vc7k5phy6vj7"; + "nCTEQ15WZ_40_18" = "0m58lby911lxqy6rvvs959qg5gjbppnfxl34hn81glc0lr90qiz6"; + "nCTEQ15WZ_40_20" = "0dnk9yikivxd557bpi9j7dbpwkf4sk49bg8lf0lxf86bdmi2l330"; + "nCTEQ15WZ_4_2" = "00rr4qwwp7i419sy5wr6f2lz82121ilrvvj0js45bvcqknx26c7i"; + "nCTEQ15WZ_56_26" = "09qjjavqjwrh9adkz6yhcjjiy55dg6c7imnbsi8qxi8xspz8nqq3"; + "nCTEQ15WZ_56_28" = "0pdqsrj4dphjb50r3v95wp1drc8rkdgsbisgg430dj9xaa703ijr"; + "nCTEQ15WZ_64_29" = "1qjvvfzv5nfjp1k1kdv2kz5pjssr2avrnjlxznqvlxwgs7rv8p7v"; + "nCTEQ15WZ_64_32" = "172whqdyyvqxyr3lijw2v45y8nvc0vk7z47i9xfmcydi2qfz8g3s"; + "nCTEQ15WZ_6_3" = "0kr0cf8aqwsn4x8kjwihsynvb99i8bdp4g91digbgcfpp02jyvgd"; + "nCTEQ15WZ_7_3" = "1c76h9xfflfihqyxi9a6dlmg1gwwr2wh93mfac3a3jnx73981gq3"; + "nCTEQ15WZ_84_36" = "1cvykpl9r41dwahjv3kik98y6sx53wiyyzywqc87mhnlx1x5876f"; + "nCTEQ15WZ_84_42" = "1jslkk9wc0fzbm6s5czpmaf004pndwc2ggwnxgkga2idn45204xz"; + "nCTEQ15WZ_9_4" = "0farphic6jyzc5x3ja715wdmvv5rfcgil1c49i8fxqlap5mlgv89"; + "nCTEQ15WZ_9_4_iso" = "01zxmn50r14n1a5gq75pia8mz4ibyqhyjl5d31kv3h69xgdrlizc"; + "nCTEQ15WZ_FullNuc_108_47" = "0yl5ll4j3mr6nhiz9ynn9w3hybgwdypg0b8zwsxz1rjcr3c8bmz5"; + "nCTEQ15WZ_FullNuc_108_54" = "1c8cdilw9n91apqj9lrv9j6hf6mcg3ndndchc96d5svrqlqk4fg6"; + "nCTEQ15WZ_FullNuc_119_50" = "19lb71cmmi4fvpb0bxmz0ipjlzg6b5hrlwiml4bj5r65km46whyk"; + "nCTEQ15WZ_FullNuc_119_59" = "0r9cwy2znpl59ynv2av6whjl3igm4b19rzh6sjqsm6a85d5jjdpc"; + "nCTEQ15WZ_FullNuc_12_6" = "1972j8lziq1ckwq2s7qpcf9g7mg3762kfrnbdjf4ilfw5b2b9i9n"; + "nCTEQ15WZ_FullNuc_131_54" = "06w9yl6a11ir8qjyxaakyzs8b51hf3jhm8nj5nvrh4f6cicp1g66"; + "nCTEQ15WZ_FullNuc_14_7" = "095x9pphc9lx71hlhpwcb71p8wx3b1pnv6qd3s6992visismyb02"; + "nCTEQ15WZ_FullNuc_16_8" = "005h4mbf9c7d9w61pmgghpxb5yh63i6cbyxyylngznbbbaxggjcc"; + "nCTEQ15WZ_FullNuc_184_74" = "0niyiq85bmbr596gfrsmf79rksql7n2gqdxw72yrki5ywc3iy4sr"; + "nCTEQ15WZ_FullNuc_197_79" = "0vbgg6m0b1wlrsx2c5xxga0crz0nwvcq9a88f032yjzihh6rscjd"; + "nCTEQ15WZ_FullNuc_197_98" = "0sf4q5bb4b44zkbxq51pf0xhpldr5dj5d0gqpqs40qkdlmkb9z7k"; + "nCTEQ15WZ_FullNuc_1_0" = "1il9j3ggn9kc8k8jpql46lw5c9lq45ngaip45vqppgvl3zcrc4fv"; + "nCTEQ15WZ_FullNuc_1_1" = "0nxvm11qlapnpdkkymqhy86axcvcx84r9hk0dswa2ji5gmk18jww"; + "nCTEQ15WZ_FullNuc_207_103" = "05qqg6ckkhv30nfbs5rdpiwz7dkgywjrd8a9gr3skvlayj2bisni"; + "nCTEQ15WZ_FullNuc_207_82" = "0s27py7i2h0va79q9ivmgrpwk5pxrjx9csyad76fc7pmvi4xsgjl"; + "nCTEQ15WZ_FullNuc_208_82" = "1xygz9px4jwz3vkbx86384775vhiqqv5l2rp2qi42zy8y8ijwaqd"; + "nCTEQ15WZ_FullNuc_20_10" = "06bgr8r6pz8cpvqbncjaazxw7j2qzhh183brs7r5mi6yckg318gz"; + "nCTEQ15WZ_FullNuc_27_13" = "1qrs82jscmxyhqkd4fa2kjglzgig23kqwc7r2n8p23352ggcsn9x"; + "nCTEQ15WZ_FullNuc_2_1" = "0jxam0p1ypd3x8l83d2f14h2av9wk1r69prfhl6pgd6pdh3nx2gh"; + "nCTEQ15WZ_FullNuc_3_1" = "0kjgsiidi33p442bpp1g6sss62qn4pj90ag4hcmdqsdf5m9vpc5s"; + "nCTEQ15WZ_FullNuc_3_2" = "0srxdvk5jh4ga4r8hniikzanfa8fh65xc4g51arxwd9sda4n0mqb"; + "nCTEQ15WZ_FullNuc_40_18" = "1x7d1cpglijq4rag57m8sp6qyzn3c7r3zs5z9jqarsaqc9wv2ypw"; + "nCTEQ15WZ_FullNuc_40_20" = "1l58bvdhqs9i4mgc39dw9c13rsh5vq5vh6zq8xk35150cbysiwza"; + "nCTEQ15WZ_FullNuc_4_2" = "0s1zdn5r9hk7bjk2ggn7bhrzq2iaxspdhmwi9rq1xbsk7n8k3wif"; + "nCTEQ15WZ_FullNuc_56_26" = "15ilca90cvw7p3w1xr15jynqnvnyw8zhpydhyq11x1kc647bgirm"; + "nCTEQ15WZ_FullNuc_56_28" = "16bs4yq4jr4y3431csabgps6330gcw1ymgm2161z4nmmyp988w1g"; + "nCTEQ15WZ_FullNuc_64_29" = "17wqyn8g5zbrm6ywvqn2y5kphy9xwbgijwlzxsni5k821nzmjyxn"; + "nCTEQ15WZ_FullNuc_64_32" = "0ivyka1g2cj6ign8wm28pzim3saas3bvnxqhixxkr91m1gl40b86"; + "nCTEQ15WZ_FullNuc_6_3" = "00v5wydvrvw1fgbzc436cap7amk8yr7dj5wf3ykyd6415vxmlzl3"; + "nCTEQ15WZ_FullNuc_7_3" = "06z2p0gx988q5w4d3c0qx6pj7lp6mqlz1qrnwy5lf4i4i4vcqkkx"; + "nCTEQ15WZ_FullNuc_84_36" = "0rfn82f8f9f6bgngrs67maip2kfhy42i4ppa904d7dspyqkgfa31"; + "nCTEQ15WZ_FullNuc_84_42" = "14lyhhc5jwccqnz85msaqzdx7cn2vxkvm2l9mf1p2kmgy7p5jis3"; + "nCTEQ15WZ_FullNuc_9_4" = "1895lr4yydzk4cry5wnjhpl6gs2kcspjlm2mv2y00sb7gzinjs94"; + "nCTEQ15WZ_FullNuc_9_4_iso" = "0kvjk4wvw98w7y02ishjacn9frncspl6rsxlzcd4y2pdk1ckr29i"; "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8"; "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5"; "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi"; @@ -966,6 +1225,30 @@ in "nCTEQ15_7_3" = "13b9wbm2hqx4lixq3dad1y3cr6didcch8kg7mqm9lgbism7dwaqw"; "nCTEQ15_84_42" = "12vkqpvjjyh0x0hbn7r4gx5za01yqs9a7lqirdxd15k04fp5rnjr"; "nCTEQ15_9_4" = "1rkxhxwp0v9dm6f71c5635ihlspfx0sj666maif4iaw1sf4hazln"; + "nCTEQ15_B_90CL_Au_hess" = "13sdn1ng4nd6935dksk7jin8yilp29zys3d0jvf7m7vx8gyxi187"; + "nCTEQ15_B_90CL_Pb_hess" = "1j11x8y5sbs5lz4z06wcl702ijvh1bcb4i222jdcq9gh9j40xn17"; + "nCTEQ15_B_c_90CL_Au_hess" = "0k0pn3yqb632j254h8w9wbdvcasnfxr7d9g47drqw3f4w1as3s16"; + "nCTEQ15_B_c_90CL_Pb_hess" = "0gvvwnc298qgxhpj4wgnzcrgz0wqlj5r7sfsl1fj21zhm3kc45jl"; + "nCTEQ15_B_d_90CL_Au_hess" = "0lzfa2gsl5cs2i6y833lhvf2pifzkysj9jgq22v9iyyz5q0nbsh4"; + "nCTEQ15_B_d_90CL_Pb_hess" = "0zp7dirc2l42f9zjyq1a2qbnir1bbj1firmg3s856mn7sp3p4i0k"; + "nCTEQ15_B_u_90CL_Au_hess" = "1w2ifnl9waqvsaz1yg696mmqxcijm2bphq8zp3rcbimck3rmr978"; + "nCTEQ15_B_u_90CL_Pb_hess" = "0j95dg6kyvd30qgivd9495glcd152cr1j3zh1cg76s6sdzfkhvs5"; + "nCTEQ15_D_90CL_Au_hess" = "0y3n008i22g9ny0v8z6hyc47730xb6qldkpall6p8icn8yzfdga9"; + "nCTEQ15_D_90CL_Pb_hess" = "0mp1plqxsd6j0ybnf7yrl4hgl68a85q56vdjhs911xah1bgrpix1"; + "nCTEQ15_D_c_90CL_Au_hess" = "1xk6ngc488n9immd9nbv8ygvxav5n7b7902k44rkxnw42kbx2c4m"; + "nCTEQ15_D_c_90CL_Pb_hess" = "1ldig46l08n00jvj0dl36jsnpjl2ycv3jdr9d9g375rwgv671kad"; + "nCTEQ15_D_d_90CL_Au_hess" = "059fz4rfhydnk25hmabavwi346cy2hzxaw2ciq8jx64fmawb3v79"; + "nCTEQ15_D_d_90CL_Pb_hess" = "0zgs89yjypn2sd97948z2r78sydadivvw6wy7pwi3a5b0yx1zpzn"; + "nCTEQ15_D_u_90CL_Au_hess" = "0j8sfih3r2wps1l7vapnllh88ibw7672f646m5p67aw5k2an4f8j"; + "nCTEQ15_D_u_90CL_Pb_hess" = "0d2nxsabard1yq8f2v9a7kwk0fzv549hx1k15k0dfif9523i6xqf"; + "nCTEQ15_Jpsi_90CL_Au_hess" = "0x75jizpqi8vss62xb2913vdhvckq2b468iqxd0ggr0fic1f8q9a"; + "nCTEQ15_Jpsi_90CL_Pb_hess" = "09a9s6gmf7q9rk8c88iskra5kxaiz131s5650964znxv29lpzlqm"; + "nCTEQ15_Jpsi_c_90CL_Au_hess" = "0mh3ikdkca7xc5bc2knjbyr7dkgbydnaa4i1gqln0i29b89j5nw0"; + "nCTEQ15_Jpsi_c_90CL_Pb_hess" = "1gs39gla77sqgry1799l9kapc1c48pzxgfba6p70fdbwdac45n3j"; + "nCTEQ15_Jpsi_d_90CL_Au_hess" = "1qn4f4nn8avjrsdqgab25053zadwx7vlr27w8bsmcxg25si104y9"; + "nCTEQ15_Jpsi_d_90CL_Pb_hess" = "107w4yiv6dl8gqfx0mpbnii06wzf15ih2kqmb8hkmz988x49l65q"; + "nCTEQ15_Jpsi_u_90CL_Au_hess" = "1mdm8qlzkyzrszsng49ns9hq7zdqaal61vbi64449fkvmxd0a7mk"; + "nCTEQ15_Jpsi_u_90CL_Pb_hess" = "1y0bcr3g9znjz2c3s4487yjl1ipf0ls05krfpdn8gcsxymf4cirm"; "nCTEQ15npFullNuc_108_54" = "1g8id10rpys9566r8h92diqrr43mww6q8nhvlns0kfjkvkr22m9y"; "nCTEQ15npFullNuc_119_59" = "0df499pvfls1281zkvngrhicnc0ac0bfwamzs027k7f2y6ygkfb4"; "nCTEQ15npFullNuc_12_6" = "0mb3zixcikagsqzpxb7jzrcg05dln37d7anz5359ssjyd6p1mqyi"; @@ -1057,11 +1340,30 @@ in "nNNPDF20_nlo_as_0118_Li6" = "0pwdqrmivpm0j7hrg6h2qqshpna2vjlslxnz0sd100kc3lfq7xab"; "nNNPDF20_nlo_as_0118_N1" = "09y7pd3nnys49w25gb4524x5xkahillvaypjgncbn8n5x1a11nsr"; "nNNPDF20_nlo_as_0118_N14" = "0nb3kcmhbyncp9frs27ww550mjl3f7yiahyyrm3aik93ycpm16n7"; - "nNNPDF20_nlo_as_0118_O16" = "12kfhldvg8gqxjaian14dng6qqc6nikydwcj5jz2i2d1da3dyhgg"; + "nNNPDF20_nlo_as_0118_O16" = "1wmi63l6cpj3nx0vwiqaa1pfw0im5ps96g7842428skzrg0q4yx3"; "nNNPDF20_nlo_as_0118_Pb208" = "1rwb7vca0y1aj38mz8m3wg07q9hq66qd5j3y6hs9bh0jz6hkifzh"; "nNNPDF20_nlo_as_0118_Sn119" = "1dan86ckd5padipp4x12x8msfg5p97b8hwxm78gfyf88kq725m6z"; - "nNNPDF20_nlo_as_0118_W184" = "1g0br4gdrb2vzwmqhgj5778a6vl0lykc4ymylibxlqbqrhf8j89b"; + "nNNPDF20_nlo_as_0118_W184" = "0wzd8vw2svf3mzpyy1wryr5jz3anhykp5z3cx4hdljprws2b8nll"; "nNNPDF20_nlo_as_0118_Xe131" = "1a62qi3qy5kli9q80p2w80mj5v3ps2g6p40zxlgm65q5mphkx1qi"; + "nNNPDF30_nlo_as_0118_A108_Z54" = "0n67w44rmz5s6cg2h58d8sf51dsfd0i5g09dh08mgfcn640bqlqw"; + "nNNPDF30_nlo_as_0118_A119_Z59" = "1zj5gn5021ig0j6p7jpyy683avg0890blmr90yjm6skqzxfjq48i"; + "nNNPDF30_nlo_as_0118_A12_Z6" = "0jvaq9a1w19dybv2hzvn8swk4i4z16lab9yfhbywq0vixyfn1swd"; + "nNNPDF30_nlo_as_0118_A131_Z54" = "01mcqnixjw5m9di508aq8fp74f3aqnvhc1bjirfvi3ca0jz0c1jz"; + "nNNPDF30_nlo_as_0118_A14_Z7" = "0hqpni9fxbf5qfamcirglr04cbwx58pwylqh8hqm3vc03ap3nmjd"; + "nNNPDF30_nlo_as_0118_A16_Z8" = "0f0h3hckxg4xgfd6ldblavhcidzdy2b5660a5nvv96y63sdsx2x4"; + "nNNPDF30_nlo_as_0118_A184_Z74" = "01jsbla72c3b6gbc7w4nx5bb5ws3g864avznb9vxmmk3prib7n8x"; + "nNNPDF30_nlo_as_0118_A197_Z79" = "1gm7nx0cn3lmjlsy6c7dr5vzyfmi1fcdib9656d4039m0ningrhg"; + "nNNPDF30_nlo_as_0118_A208_Z82" = "0r1spnj4qmjwpjybqv9aa6w3wybvgk4qzivzwz4s9bacz0kb3z4n"; + "nNNPDF30_nlo_as_0118_A27_Z13" = "17vmr3pwjp1prb83yngada7sw8553sv39dnncksabnklfp1l5x59"; + "nNNPDF30_nlo_as_0118_A2_Z1" = "1g97mc7c14hnkfsfvg4n9jmb4l461i9lka643s626hw0gcq053f5"; + "nNNPDF30_nlo_as_0118_A31_Z15" = "0h5rx9113yq6jw1l2alwyvw77vv733y5mcpa3m9773s7y61w3fpk"; + "nNNPDF30_nlo_as_0118_A40_Z20" = "1937kk4039hi9cslw4417174s83rs4n9vm16ay70pp1c8bcqzp6l"; + "nNNPDF30_nlo_as_0118_A4_Z2" = "147npkmbvzk6j95hnnil6jafc2gxjqavaawl9cilr93f9h64w54w"; + "nNNPDF30_nlo_as_0118_A56_Z26" = "06dxsapqirmajh107j24b3w2nhqz39gs9c2pglq71fc53i0fra5a"; + "nNNPDF30_nlo_as_0118_A64_Z29" = "1drvfd3i1drrb15m3vk9sm2lzx2x01da44gdq3wbc90nxvzc7d56"; + "nNNPDF30_nlo_as_0118_A6_Z3" = "0zp1cixj6ixayzdra2i5qyfn2b6y6qfxd5d1l101n8sgf4bdh6fb"; + "nNNPDF30_nlo_as_0118_A9_Z4" = "07i30jk29cgdbdk4n5acdki5aihaki5w0mqibjww1hy7mwh4y45w"; + "nNNPDF30_nlo_as_0118_p" = "0k4bs4zhlm7l14mbd2q9n0n7rdnpqwgnfwj289ql62v3kh8mnn18"; "xFitterPI_NLO_EIG" = "1v6mfhmcrmdvica0wlc2ilfca1srxc7vjyli113wjvpd7wfpnvj5"; "xFitterPI_NLO_VAR" = "09mlsww89hhm2s96rlkqbkfwwf9qkblw7n3nnrgas6l1kn2hxq1i"; } diff --git a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix index 834e3fcbba89..f09a1a0e19bd 100644 --- a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; buildInputs = [ zlib ]; + FFLAGS = [ + "-std=legacy" # fix build with gfortran 10 + ]; + enableParallelBuilding = true; meta = { diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index 9739530f8ba3..1b97997c5c11 100644 --- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo="; + hash = "sha256-HPbrtqedGBxEHR0MfG1iPEI4F8YQk/NvIa2q4j5nkJA="; }; - patches = [ - # Fixes build - (fetchpatch { - name = "rivet-3.1.5-namespace-fix.patch"; - url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff"; - sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms="; - }) - ]; - latex = texlive.combine { inherit (texlive) scheme-basic collection-pstricks diff --git a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix index ed92889b5b21..adef606be546 100644 --- a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "0gif4vb9lw2px2qdywqm7x0frbv0h5gq9lq36c50f2hv77a5bgwp"; + hash = "sha256-8hRzGXp2H8MpF7CKjSTSv6+T/1fzRB/WBdqZrJ3l1Qs="; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index a2bb09b58a27..5424ad73787c 100644 --- a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.4"; + version = "1.9.6"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-KifrhuZH11szennCDC2sJeHxO9JZJbnJWuKK3JN5NwU="; + hash = "sha256-IVI/ova2yPM0iVnzqUhzSpMMollR08kZC0Qk4Tc18qQ="; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix b/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix index eb98c2f9ef6b..ca46d203b348 100644 --- a/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-cc1UTc1aswtJzuaUdYNcCzLtQ9+Wggiy/eRE+UoxSgE="; + sha256 = "sha256-Yf3cVFdI8vR/qcxghcx8fsbYs1qD8r6O5aqZ0AkSLDc="; }; nativeBuildInputs = [ cmake ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/raspberrypi/picotool"; description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; license = licenses.bsd3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index d37e0a050866..991ac1ad594c 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -2,12 +2,13 @@ , lib , buildPackages , fetchFromGitLab -, fetchpatch , removeReferencesTo , python3 , meson , ninja +, eudev , systemd +, enableSystemd ? true , pkg-config , docutils , doxygen @@ -68,7 +69,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.48"; + version = "0.3.56"; outputs = [ "out" @@ -86,7 +87,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-+gk/MJ9YimHBwN2I42DRP+I2OqBFFtZ81Fd/l89HcSk="; + sha256 = "sha256-wbHHr7BW8Gdj9D1IjzOuD6VuXApJ5E0Zde2iKWImzxg="; }; patches = [ @@ -128,8 +129,8 @@ let vulkan-headers vulkan-loader webrtc-audio-processing - systemd - ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] + ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) + ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] @@ -149,18 +150,22 @@ let "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" + "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" "-Droc=${mesonEnableFeature rocSupport}" "-Dlibpulse=${mesonEnableFeature pulseTunnelSupport}" "-Davahi=${mesonEnableFeature zeroconfSupport}" "-Dgstreamer=${mesonEnableFeature gstreamerSupport}" - "-Dsystemd-system-service=enabled" + "-Dsystemd-system-service=${mesonEnableFeature enableSystemd}" + "-Dudev=${mesonEnableFeature (!enableSystemd)}" + "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" "-Dffmpeg=${mesonEnableFeature ffmpegSupport}" "-Dbluez5=${mesonEnableFeature bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}" "-Dbluez5-backend-hfp-native=${mesonEnableFeature nativeHfpSupport}" "-Dbluez5-backend-ofono=${mesonEnableFeature ofonoSupport}" "-Dbluez5-backend-hsphfpd=${mesonEnableFeature hsphfpdSupport}" + "-Dbluez5-codec-lc3plus=disabled" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" @@ -194,8 +199,11 @@ let cp ${buildPackages.pipewire}/nix-support/*.json "$out/nix-support" ''} - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" + ${lib.optionalString enableSystemd '' + moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" + ''} + moveToOutput "bin/pipewire-pulse" "$pulse" moveToOutput "bin/pw-jack" "$jack" diff --git a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 7b9759f553bc..8769587605ea 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , nix-update-script , # base build deps meson @@ -26,7 +27,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.9"; + version = "0.4.11"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -35,9 +36,18 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-U92ozuEUFJA416qKnalVowJuBjLRdORHfhmznGf1IFU="; + sha256 = "sha256-3NrzOsL0MekxMMXCFubEkazzSWFNsjUsX8n2ECcr7yY="; }; + patches = [ + # fix sound not working in VMs + # FIXME: drop in next release + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253.patch"; + sha256 = "sha256-xhhAlhOovwIjwAxXxvHRTG4GzpIPYvKQE2F4ZP1Udq8="; + }) + ]; + nativeBuildInputs = [ meson pkg-config @@ -49,7 +59,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (enableDocs || enableGI) [ doxygen (python3.withPackages (ps: with ps; - lib.optionals enableDocs [ sphinx sphinx_rtd_theme breathe ] ++ + lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ lib.optionals enableGI [ lxml ] )) ]; diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index be41526c4f23..ffdaeaef035a 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; + preConfigure = '' + # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 + export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES)) + ''; + doCheck = true; postInstall = glib.flattenInclude; diff --git a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix index 4de361a59842..660313092202 100644 --- a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix +++ b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.28"; + version = "1.29.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "sha256-gy04f62TX42mW4hKD/jTZXTpz9v6gQXNrY/pv8Ie4p0="; + sha256 = "sha256-HPaPmsCJ81NaS7mgRGbR7KFG6AM3s6HXdWKdfREhcLc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 082702ec46f7..7db287e5a44f 100644 --- a/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-t0/6yWnvBn5HGA50imejoYFrcVf/TqYg7UQy9Ztw8B8="; + sha256 = "sha256-CE4mhcqmHZTG/obc4AayJHTXu0s0xMuWvXY7l+MF+tY="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/development/libraries/platform-folders/default.nix b/nixpkgs/pkgs/development/libraries/platform-folders/default.nix new file mode 100644 index 000000000000..8ed0c7a744be --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/platform-folders/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "platform-folders"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "sago007"; + repo = "PlatformFolders"; + rev = version; + hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + + meta = with lib; { + description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code"; + homepage = "https://github.com/sago007/PlatformFolders"; + license = licenses.mit; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/plplot/default.nix b/nixpkgs/pkgs/development/libraries/plplot/default.nix index dca1248b8b6b..f3a703ce1878 100644 --- a/nixpkgs/pkgs/development/libraries/plplot/default.nix +++ b/nixpkgs/pkgs/development/libraries/plplot/default.nix @@ -33,7 +33,9 @@ in stdenv.mkDerivation rec { ; }; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ]; + cmakeFlags = [ + "-DBUILD_TEST=ON" + ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/pmdk/default.nix b/nixpkgs/pkgs/development/libraries/pmdk/default.nix index 6e0b6ab6722b..1f02bfa0dab3 100644 --- a/nixpkgs/pkgs/development/libraries/pmdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/pmdk/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pmdk"; - version = "1.9.2"; + version = "1.11.1"; src = fetchFromGitHub { owner = "pmem"; repo = "pmdk"; rev = "refs/tags/${version}"; - sha256 = "0awmkj6j9y2pbqqmp9ql00s7qa3mnpppa82dfy5324lindq0z8a1"; + hash = "sha256-8bnyLtgkKfgIjJkfY/ZS1I9aCYcrz0nrdY7m/TUVWAk="; }; nativeBuildInputs = [ autoconf pkg-config gnum4 pandoc ]; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { patchPhase = "patchShebangs utils"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + installPhase = '' make install prefix=$out diff --git a/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix b/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix deleted file mode 100644 index fadc14240831..000000000000 --- a/nixpkgs/pkgs/development/libraries/pocketsphinx/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, fetchurl -, sphinxbase -, pkg-config -, python27 # >= 2.6 -, swig2 # 2.0 -}: - -stdenv.mkDerivation rec { - pname = "pocketsphinx"; - version = "5prealpha"; - - src = fetchurl { - url = "mirror://sourceforge/cmusphinx/pocketsphinx-${version}.tar.gz"; - sha256 = "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg"; - }; - - propagatedBuildInputs = [ sphinxbase ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python27 swig2 ]; - - meta = { - description = "Voice recognition library written in C"; - homepage = "http://cmusphinx.sourceforge.net"; - license = lib.licenses.free; - platforms = lib.platforms.linux; - }; -} - -/* Example usage: - - -1. - -$ cat << EOF > vocabulary.txt -oh mighty computer /1e-40/ -hello world /1e-30/ -EOF - -2. - -$ pocketsphinx_continuous -inmic yes -kws vocabulary.txt 2> /dev/null -# after you say "hello world": -hello world -... - -*/ diff --git a/nixpkgs/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix index 15a1f8d62bf7..0e42ff730c8a 100644 --- a/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl unixODBC libmysqlclient ]; - propagatedBuildInputs = [ zlib pcre expat sqlite ]; + buildInputs = [ unixODBC libmysqlclient ]; + propagatedBuildInputs = [ zlib pcre expat sqlite openssl ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix index ee99ab5de6f7..c4aab614915c 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/default.nix +++ b/nixpkgs/pkgs/development/libraries/podofo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; pname = "podofo"; src = fetchurl { url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; - sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw"; + sha256 = "sha256-XeYH4V8ZK4rZBzgwB1nYjeoPXM3OO/AASKDJMrxkUVQ="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix index 86ef2af96e7c..e6cb90994d9e 100644 --- a/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "polkit-qt-1"; - version = "0.113.0"; + version = "0.114.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c="; + sha256 = "sha256-LrDyJEWIgpX/or+8DDaThHoPlzu2sMPkzOAhi+fjkH4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/polkit/default.nix b/nixpkgs/pkgs/development/libraries/polkit/default.nix index 72907f7aedc8..163e3bb9965c 100644 --- a/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -6,13 +6,14 @@ , expat , pam , meson +, mesonEmulatorHook , ninja , perl , rsync , python3 , fetchpatch , gettext -, spidermonkey_78 +, duktape , gobject-introspection , libxslt , docbook-xsl-nons @@ -21,12 +22,8 @@ , gtk-doc , coreutils , useSystemd ? stdenv.isLinux -, systemd +, systemdMinimal , elogind -# needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222) -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) -# cross build fails on polkit-1-scan (https://github.com/NixOS/nixpkgs/pull/152704) -, withGtkDoc ? (stdenv.buildPlatform == stdenv.hostPlatform) # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, @@ -40,7 +37,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "0.120"; + version = "121"; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin @@ -50,7 +47,7 @@ stdenv.mkDerivation rec { owner = "polkit"; repo = "polkit"; rev = version; - sha256 = "oEaRf1g13zKMD+cP1iwIA6jaCDwvNfGy2i8xY8vuVSo="; + sha256 = "Lj7KSGILc6CBsNqPO0G0PNt6ClikbRG45E8FZbb46yY="; }; patches = [ @@ -60,17 +57,6 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch"; sha256 = "ebbLILncq1hAZTBMsLm+vDGw6j0iQ0crGyhzyLZQgKA="; }) - # pkexec: local privilege escalation (CVE-2021-4034) - (fetchpatch { - url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.patch"; - sha256 = "162jkpg2myq0rb0s5k3nfr4pqwv9im13jf6vzj8p5l39nazg5i4s"; - }) - # File descriptor leak allows an unprivileged user to cause a crash (CVE-2021-4115) - (fetchpatch { - name = "CVE-2021-4115.patch"; - url = "https://src.fedoraproject.org/rpms/polkit/raw/0a203bd46a1e2ec8cc4b3626840e2ea9d0d13a9a/f/CVE-2021-4115.patch"; - sha256 = "sha256-BivHVVpYB4Ies1YbBDyKwUmNlqq2D1MpMipH9/dZM54="; - }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 @@ -82,6 +68,10 @@ stdenv.mkDerivation rec { }) ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ glib gtk-doc @@ -91,7 +81,8 @@ stdenv.mkDerivation rec { ninja perl rsync - (python3.withPackages (pp: with pp; [ + gobject-introspection + (python3.pythonForBuild.withPackages (pp: with pp; [ dbus-python (python-dbusmock.overridePythonAttrs (attrs: { # Avoid dependency cycle. @@ -103,17 +94,19 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_412 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection expat pam - spidermonkey_78 + dbus + duktape ] ++ lib.optionals stdenv.isLinux [ # On Linux, fall back to elogind when systemd support is off. - (if useSystemd then systemd else elogind) - ] ++ lib.optionals withIntrospection [ - gobject-introspection + (if useSystemd then systemdMinimal else elogind) ]; propagatedBuildInputs = [ @@ -130,9 +123,7 @@ stdenv.mkDerivation rec { "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "-Dpolkitd_user=polkituser" #TODO? <nixos> config.ids.uids.polkituser "-Dos_type=redhat" # only affects PAM includes - "-Dintrospection=${lib.boolToString withIntrospection}" "-Dtests=${lib.boolToString doCheck}" - "-Dgtk_doc=${lib.boolToString withGtkDoc}" "-Dman=true" ] ++ lib.optionals stdenv.isLinux [ "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" diff --git a/nixpkgs/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch b/nixpkgs/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch deleted file mode 100644 index 5c2af7a2adc2..000000000000 --- a/nixpkgs/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc ---- a/poppler/JPEG2000Stream.cc -+++ b/poppler/JPEG2000Stream.cc -@@ -201,7 +201,7 @@ void JPXStream::init() - if (getDict()) smaskInData = getDict()->lookup("SMaskInData"); - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { - -@@ -365,7 +365,7 @@ void JPXStream::init() - } - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { diff --git a/nixpkgs/pkgs/development/libraries/poppler/0.61.nix b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix deleted file mode 100644 index e46da53f68dc..000000000000 --- a/nixpkgs/pkgs/development/libraries/poppler/0.61.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, cairo -, cmake -, curl -, fontconfig -, freetype -, lcms -, libiconv -, libintl -, libjpeg -, ninja -, openjpeg -, pkg-config -, zlib -, withData ? true, poppler_data -, qt5Support ? false, qtbase ? null -, introspectionSupport ? false, gobject-introspection ? null -, utils ? false -, minimal ? false, suffix ? "glib" -}: - -let - version = "0.61.1"; - mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; -in -stdenv.mkDerivation rec { - pname = "poppler-${suffix}"; - inherit version; - - src = fetchurl { - url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - # Fix internal crash: a negative number that should not be - (fetchpatch { - name = "CVE-2018-13988"; - url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; - sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; - }) - # Fix internal crash: a negative number that should not be (not the above!) - ./0.61-CVE-2019-9959.patch - ]; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - - buildInputs = [ - libiconv - libintl - ] - ++ lib.optional withData poppler_data; - - # TODO: reduce propagation to necessary libs - propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg openjpeg ] - ++ optionals (!minimal) [ cairo lcms curl ] - ++ optional qt5Support qtbase - ++ optional introspectionSupport gobject-introspection; - - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - cmakeFlags = [ - (mkFlag true "XPDF_HEADERS") - (mkFlag (!minimal) "GLIB") - (mkFlag (!minimal) "CPP") - (mkFlag (!minimal) "LIBCURL") - (mkFlag utils "UTILS") - (mkFlag qt5Support "QT5") - ]; - - dontWrapQtApps = true; - - meta = with lib; { - homepage = "https://poppler.freedesktop.org/"; - description = "A PDF rendering library"; - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix index 5547e492a65b..8d2e91513f1e 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -19,7 +19,7 @@ , openjpeg , pkg-config , python3 -, scribusUnstable +, scribus , texlive , zlib , withData ? true, poppler_data @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "22.03.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-cox4upTXWlX2tjVdT72qb0mTTZYWvljl5nmpz9CYDh4="; + sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs="; }; nativeBuildInputs = [ @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { passthru = { tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters texlive scribusUnstable; + inherit inkscape cups-filters texlive scribus; }; }; diff --git a/nixpkgs/pkgs/development/libraries/portaudio/default.nix b/nixpkgs/pkgs/development/libraries/portaudio/default.nix index c1c76a900175..22ff1e450c19 100644 --- a/nixpkgs/pkgs/development/libraries/portaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/portaudio/default.nix @@ -3,6 +3,7 @@ , fetchurl , alsa-lib , pkg-config +, which , AudioUnit , AudioToolbox , CoreAudio @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config which ]; buildInputs = lib.optional (!stdenv.isDarwin) alsa-lib; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; @@ -34,6 +36,11 @@ stdenv.mkDerivation rec { # https://github.com/PortAudio/portaudio/commit/28d2781d9216115543aa3f0a0ffb7b4ee0fac551.patch enableParallelBuilding = false; + postPatch = '' + # workaround for the configure script which expects an absolute path + export AR=$(which $AR) + ''; + # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install diff --git a/nixpkgs/pkgs/development/libraries/precice/default.nix b/nixpkgs/pkgs/development/libraries/precice/default.nix index ba35a55d9207..60c026b36004 100644 --- a/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0p8d2xf4bl41b30yp38sqyp4fipwgcdhl0khxcv5g69fxvz2i2il"; + sha256 = "0qmwdxpbmy4dvjxav3dls18qns734j0yfvxvjrh1nnkk36qhfp3q"; }; cmakeFlags = [ @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; - license = with lib.licenses; [ gpl3 ]; homepage = "https://precice.org/"; - platforms = lib.platforms.unix; + license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ Scriptkiddi ]; + mainProgram = "binprecice"; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/presage/default.nix b/nixpkgs/pkgs/development/libraries/presage/default.nix index df15e73f73cf..5f03a425dcc0 100644 --- a/nixpkgs/pkgs/development/libraries/presage/default.nix +++ b/nixpkgs/pkgs/development/libraries/presage/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj"; }) ./fixed-cppunit-detection.patch + # fix gcc11 build + (fetchpatch { + name = "presage-0.9.1-gcc11.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/presage/presage-0.9.1-gcc11.patch?rev=3f8b4b19c99276296d6ea595cc6c431f"; + sha256 = "sha256-pLrIFXvJHRvv4x9gBIfal4Y68lByDE3XE2NZNiAXe9k="; + }) ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix index 8251a17a83c6..2593c04fa158 100644 --- a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { description = "Repository for proj datum grids"; homepage = "https://proj4.org"; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; + mainProgram = "nad2bin"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/proj/7.nix b/nixpkgs/pkgs/development/libraries/proj/7.nix index 3eb4789939ff..95c02febdabc 100644 --- a/nixpkgs/pkgs/development/libraries/proj/7.nix +++ b/nixpkgs/pkgs/development/libraries/proj/7.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff"; sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf"; }) + ./tests-sqlite-3.39.patch ]; postPatch = lib.optionalString (version == "7.2.1") '' @@ -53,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ vbgl dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index 376cb36edd61..68b47e2a2eb3 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -3,40 +3,49 @@ , fetchFromGitHub , cmake , pkg-config +, buildPackages , sqlite , libtiff , curl , gtest +, nlohmann_json }: stdenv.mkDerivation rec { pname = "proj"; - version = "8.2.1"; + version = "9.0.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-tnaIqYKgYHY1Tg33jsKYn9QL8YUobgXKbQsodoCXNys="; + sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg="; }; - outputs = [ "out" "dev"]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ sqlite libtiff curl ]; + buildInputs = [ sqlite libtiff curl nlohmann_json ]; checkInputs = [ gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" "-DRUN_NETWORK_DEPENDENT_TESTS=OFF" + "-DNLOHMANN_JSON_ORIGIN=external" + "-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3" ]; - preCheck = '' - export HOME=$TMPDIR - export TMP=$TMPDIR - ''; + preCheck = + let + libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + '' + export HOME=$TMPDIR + export TMP=$TMPDIR + export ${libPathEnvVar}=$PWD/lib + ''; doCheck = true; @@ -45,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://proj.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ vbgl dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/proj/tests-sqlite-3.39.patch b/nixpkgs/pkgs/development/libraries/proj/tests-sqlite-3.39.patch new file mode 100644 index 000000000000..0654ff5eadb6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/proj/tests-sqlite-3.39.patch @@ -0,0 +1,13 @@ +Drop tests that time out with newest sqlite. +https://github.com/OSGeo/PROJ/issues/3254 + +--- a/test/cli/CMakeLists.txt ++++ b/test/cli/CMakeLists.txt +@@ -16 +15,0 @@ +-proj_add_test_script_sh("testprojinfo" PROJINFO_BIN) +--- a/test/unit/CMakeLists.txt ++++ b/test/unit/CMakeLists.txt +@@ -144,3 +143,0 @@ +-add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api) +-set_property(TEST proj_test_cpp_api +- PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) diff --git a/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix b/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix index 9b18b25c7268..938d16d3776e 100644 --- a/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/prometheus-client-c/default.nix @@ -43,6 +43,13 @@ let ) ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: CMakeFiles/prom.dir/src/prom_process_stat.c.o:(.bss+0x0): multiple definition of + # `prom_process_start_time_seconds'; CMakeFiles/prom.dir/src/prom_collector.c.o:(.bss+0x0): first defined here + # Should be fixed in 1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25 + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' cd ${subdir} ''; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix b/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix deleted file mode 100644 index 9d7bb38cf3c9..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.5.0"; - # make sure you test also -A pythonPackages.protobuf - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; - sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.1.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.1.nix deleted file mode 100644 index 91ef87512c84..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.1.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.1.0"; - sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.10.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.10.nix deleted file mode 100644 index 5ecb8e67f841..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.10.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.10.1"; - sha256 = "1kbi2i1m5c7ss02ip8h0bdzvns4dgxx30a5c0iiph8g2ns02lr33"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix deleted file mode 100644 index 6ea64a023800..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.12.4"; - sha256 = "1gzvnd0g5hmx5ln39w7p4z4qphw87ksgsa1fgbpvi8d0asmwab2p"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix deleted file mode 100644 index 8499ac069e84..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.13.0.1"; - sha256 = "1r3hvbvjjww6pdk0mlg1lym7avxn8851xm8dg98bf4zq4vyrcw12"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.14.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.14.nix deleted file mode 100644 index 82896b0dadee..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.14.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.14.0"; - sha256 = "1k4kkb78kdbz732wsph07v3zy3cz7l1msk2byrfvp0nb02sfl3a4"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix deleted file mode 100644 index e4783be6a351..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.15.8"; - sha256 = "1q3k8axhq6g8fqczmd6kbgzpdplrrgygppym4x1l99lzhplx9rqv"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix deleted file mode 100644 index fdbbed733d85..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.16.1"; - sha256 = "sha256-eOwUyZtrmyh3HwLQ1kLnk+briaXQPrlUqtbFol/nGBo="; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix deleted file mode 100644 index 0d5d2c652cba..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.18.2"; - sha256 = "sha256-IXxVTZOAKVMuGCJtD32rVQRBJRWUJMEK2d+fPEmgzRU="; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix index 7e2be4bec04c..e47bb62e736a 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.19.3"; - sha256 = "sha256-nA6L064MuyP5Si4MCLk2yg8PDM7RWggFEGQyibputYQ="; + version = "3.19.4"; + sha256 = "sha256-mxQ8XonVgctfaNAyd3vqQHMLHVnkjBa9EObk47vxH24="; } diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix new file mode 100644 index 000000000000..93d180159b87 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix @@ -0,0 +1,6 @@ +{ callPackage, abseil-cpp, ... }: + +callPackage ./generic-v3.nix { + version = "3.20.1"; + sha256 = "sha256-pAMacD0UQetqysZHszu5slPqp0iREtDmHFv1cgcUBJA="; +} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix new file mode 100644 index 000000000000..70c6095ae7b6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix @@ -0,0 +1,6 @@ +{ callPackage, abseil-cpp, ... }: + +callPackage ./generic-v3-cmake.nix { + version = "3.21.2"; + sha256 = "sha256-DUv07pWiZV7jNeSA2ClDOz9DY0x/hiJynxkbSTeJOSs="; +} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix deleted file mode 100644 index 16decc44e847..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.6.1.3"; - sha256 = "1spj0d4flx6h3phxx3sg9r00yv734hina3365avkcz9brnm089c1"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.9.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.9.nix deleted file mode 100644 index e74d5c527b1d..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.9.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.9.2"; - sha256 = "080zxa9w1pxp5y05aiwc0c8mlqkkh98wmid4l7m99cliphsd4qnn"; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix new file mode 100644 index 000000000000..0b6967a67385 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -0,0 +1,107 @@ +# The cmake version of this build is meant to enable both cmake and .pc being exported +# this is important because grpc exports a .cmake file which also expects for protobuf +# to have been exported through cmake as well. +{ lib +, stdenv +, abseil-cpp +, buildPackages +, cmake +, fetchFromGitHub +, fetchpatch +, gtest +, zlib +, version +, sha256 + +# downstream dependencies +, python3 + +, ... +}: + +let + self = stdenv.mkDerivation { + pname = "protobuf"; + inherit version; + + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "protobuf"; + rev = "v${version}"; + inherit sha256; + }; + + # re-create submodule logic + postPatch = '' + rm -rf gmock + cp -r ${gtest.src}/googlemock third_party/gmock + cp -r ${gtest.src}/googletest third_party/ + chmod -R a+w third_party/ + + ln -s ../googletest third_party/gmock/gtest + ln -s ../gmock third_party/googletest/googlemock + ln -s $(pwd)/third_party/googletest third_party/googletest/googletest + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + patches = lib.optionals (lib.versionOlder version "3.22") [ + # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute + # https://github.com/protocolbuffers/protobuf/pull/10090 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; + sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + }) + ]; + + nativeBuildInputs = let + protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; + in [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf${protobufVersion}" + ]; + + buildInputs = [ + abseil-cpp + zlib + ]; + + # After 3.20, CMakeLists.txt can now be found at the top-level, however + # a stub cmake/CMakeLists.txt still exists for compatibility with previous build assumptions + cmakeDir = "../cmake"; + cmakeFlags = [ + "-Dprotobuf_ABSL_PROVIDER=package" + ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ + "-Dprotobuf_BUILD_SHARED_LIBS=ON" + ]; + + # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail + doCheck = false; + + passthru = { + tests = { + pythonProtobuf = python3.pkgs.protobuf.override(_: { + protobuf = self; + }); + }; + }; + + meta = { + description = "Google's data interchange format"; + longDescription = '' + Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = with lib.maintainers; [ jonringer ]; + }; + }; +in + self diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index 6867940d1f23..130f681d8496 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -48,9 +48,10 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; + homepage = "https://developers.google.com/protocol-buffers/"; license = lib.licenses.bsd3; + mainProgram = "protoc"; platforms = lib.platforms.unix; - homepage = "https://developers.google.com/protocol-buffers/"; }; passthru.version = version; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix deleted file mode 100644 index 7d64df436260..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, version, src -, autoreconfHook, zlib, gtest -, ... -}: - -stdenv.mkDerivation { - pname = "protobuf"; - inherit version; - - inherit src; - - postPatch = '' - rm -rf gtest - cp -r ${gtest.src}/googletest gtest - chmod -R a+w gtest - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - outputs = [ "out" "lib" ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib ]; - - # The generated C++ code uses static initializers which mutate a global data - # structure. This causes problems for an executable when: - # - # 1) it dynamically links to two libs, both of which contain generated C++ for - # the same proto file, and - # 2) the two aforementioned libs both dynamically link to libprotobuf. - # - # One solution is to statically link libprotobuf, that way the global - # variables are not shared; in fact, this is necessary for the python Mesos - # binding to not crash, as the python lib contains two C extensions which - # both refer to the same proto schema. - # - # See: https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684 - # https://github.com/google/protobuf/issues/1489 - dontDisableStatic = true; - configureFlags = [ - "CFLAGS=-fPIC" - "CXXFLAGS=-fPIC" - ]; - - doCheck = true; - - meta = { - description = "Protocol Buffers - Google's data interchange format"; - longDescription = - '' Protocol Buffers are a way of encoding structured data in an - efficient yet extensible format. Google uses Protocol Buffers for - almost all of its internal RPC protocols and file formats. - ''; - license = "mBSD"; - homepage = "https://developers.google.com/protocol-buffers/"; - platforms = lib.platforms.unix; - }; - - passthru.version = version; -} diff --git a/nixpkgs/pkgs/development/libraries/protolock/default.nix b/nixpkgs/pkgs/development/libraries/protolock/default.nix index ef6338207e3f..324c21df9288 100644 --- a/nixpkgs/pkgs/development/libraries/protolock/default.nix +++ b/nixpkgs/pkgs/development/libraries/protolock/default.nix @@ -11,9 +11,7 @@ buildGoModule rec { sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo="; }; - vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk="; - - doCheck = false; + vendorSha256 = "sha256-pYtP+Tkh2TcGsbk7zQNaoYLEQrqGOL0gkMG5dUkfpt4="; postInstall = '' rm $out/bin/plugin* diff --git a/nixpkgs/pkgs/development/libraries/psol/generic.nix b/nixpkgs/pkgs/development/libraries/psol/generic.nix index aa2522a5dad1..8f312fe9dbc8 100644 --- a/nixpkgs/pkgs/development/libraries/psol/generic.nix +++ b/nixpkgs/pkgs/development/libraries/psol/generic.nix @@ -9,6 +9,7 @@ description = "PageSpeed Optimization Libraries"; homepage = "https://developers.google.com/speed/pagespeed/psol"; license = lib.licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux. # TODO: Build PSOL from source to support more platforms. platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/ptex/default.nix b/nixpkgs/pkgs/development/libraries/ptex/default.nix index 561c9cf93c2c..a5827fe188c5 100644 --- a/nixpkgs/pkgs/development/libraries/ptex/default.nix +++ b/nixpkgs/pkgs/development/libraries/ptex/default.nix @@ -1,27 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, zlib, python2, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, cmake }: stdenv.mkDerivation rec { pname = "ptex"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "sha256-TuwgZJHvQUqBEFeZYvzpi+tmXB97SkOairYnuUahtSA="; + sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ="; }; outputs = [ "bin" "dev" "out" "lib" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python2 pkg-config ]; - - # Can be removed in the next release - # https://github.com/wdas/ptex/pull/42 - patchPhase = '' - echo v${version} >version - ''; + buildInputs = [ zlib ]; meta = with lib; { description = "Per-Face Texture Mapping for Production Rendering"; diff --git a/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/nixpkgs/pkgs/development/libraries/pugixml/default.nix index c976db882257..0db6d5f98af8 100644 --- a/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE="; }; - outputs = if shared then [ "out" "dev" ] else [ "out" ]; + outputs = [ "out" ] ++ lib.optionals shared [ "dev" ]; nativeBuildInputs = [ cmake validatePkgConfig ]; @@ -22,14 +22,6 @@ stdenv.mkDerivation rec { checkInputs = [ check ]; - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - preConfigure = '' # Enable long long support (required for filezilla) sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp diff --git a/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/nixpkgs/pkgs/development/libraries/pupnp/default.nix index 86606df5e41b..b3c76fba5dfb 100644 --- a/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.12"; + version = "1.14.13"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-ZJ74x5+4dDb5sJ1cPtlin6iunGyu8boNSpfLFB1mCME="; + sha256 = "sha256-3pvJDReyZilJ8pAHYw6d+6ammv4EliLgA+VOSBsvF20="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix index da327ae13fac..eeb73472253a 100644 --- a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix +++ b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.5.9"; + version = "1.6.0"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "1k1fdsinysgx5gp6q62jiwcyiklakmjv6wbi1s2659am96vz3zj8"; + sha256 = "sha256-IIvL704snJIJbigAgJZ3WWg5a/mX/8qzgFN+dBEClG8="; }; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/development/libraries/qca-qt5/2.3.2.nix b/nixpkgs/pkgs/development/libraries/qca-qt5/2.3.2.nix new file mode 100644 index 000000000000..098fbacc7ff5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qca-qt5/2.3.2.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: + +stdenv.mkDerivation rec { + pname = "qca-qt5"; + version = "2.3.2"; + + src = fetchurl { + url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "sha256-RpdgAjfEvDqXnofSzIBiTyewYoDmNfXZDsfdTSqfYG0="; + }; + + buildInputs = [ openssl qtbase ]; + nativeBuildInputs = [ cmake pkg-config ]; + + dontWrapQtApps = true; + + # tells CMake to use this CA bundle file if it is accessible + preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; + + # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) + cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; + + meta = with lib; { + description = "Qt 5 Cryptographic Architecture"; + homepage = "http://delta.affinix.com/qca"; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21Plus; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix index 9bd57e7ae97b..b85a3ad8c7a7 100644 --- a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.3.1"; + version = "2.3.4"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks="; + sha256 = "sha256-a2lYgafj/ZX3Oq7m6uq5b2rRflFenCs9SzJy14Yv9cQ="; }; - patches = [ - # Pull upstream fix for gcc-11 - (fetchurl { - url = "https://github.com/KDE/qca/commit/32275f1a74c161d2fed8c056b2dd9555687a22f2.patch"; - sha256 = "sha256-SUH2eyzP2vH/ZjYcX8ybwiqhoTm/QjuEpTKjb2iH1No="; - }) - ]; - buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -34,5 +26,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; platforms = with platforms; unix; + # until macOS SDK supports Qt 5.15, 2.3.2 is the highest version of qca-qt5 + # that works on darwin + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/qjson/default.nix b/nixpkgs/pkgs/development/libraries/qjson/default.nix index a6ee272a38b5..7ab0d8c1ae7e 100644 --- a/nixpkgs/pkgs/development/libraries/qjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/qjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { version = "0.9.0"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase ]; + dontWrapQtApps = true; meta = with lib; { description = "Lightweight data-interchange format"; homepage = "http://qjson.sourceforge.net/"; license = licenses.lgpl21; - inherit (qt4.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix b/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix index cd19705f1e93..856f2f88e832 100644 --- a/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix +++ b/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "qrcodegen"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nayuki"; repo = "QR-Code-generator"; rev = "v${version}"; - sha256 = "sha256-WH6O3YE/+NNznzl52TXZYL+6O25GmKSnaFqDDhRl4As="; + sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix index 2f119311c1f2..d3d821ba1db1 100644 --- a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix +++ b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix @@ -25,12 +25,14 @@ stdenv.mkDerivation rec { "LAPACK=-L${lapack}/lib -llapack" "BLAS=-L${blas}/lib -lblas" "PREFIX=${placeholder "out"}" - ${lib.optionalString blas.isILP64 - # If another application intends to use qrupdate compiled with blas with - # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): - # https://savannah.gnu.org/bugs/?50339 - "FFLAGS=-fdefault-integer-8" - } + "FFLAGS=${toString ([ + "-std=legacy" + ] ++ lib.optionals blas.isILP64 [ + # If another application intends to use qrupdate compiled with blas with + # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): + # https://savannah.gnu.org/bugs/?50339 + "-fdefault-integer-8" + ])}" ) ''; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index d89547261880..5d7b7202945f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -19,6 +19,7 @@ top-level attribute to `top-level/all-packages.nix`. , bison, cups ? null, harfbuzz, libGL, perl , gstreamer, gst-plugins-base, gtk3, dconf , darwin +, buildPackages # options , developerBuild ? false @@ -85,6 +86,14 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; + sha256 = "sha256-CJxN6sTvWdPVEwSkr0zpPrjyhUIi6tYSWb8ZyO0sY2o="; + excludes = [ + "src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc" + ]; + }) ./qtwebengine-no-build-skip.patch # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707 # https://bugreports.qt.io/browse/QTBUG-77037 @@ -138,7 +147,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; @@ -155,7 +164,7 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit debug developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; inherit (darwin) libobjc; }; @@ -228,7 +237,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev makeWrapper ] + deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 65ce74dac021..32630810b49c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -19,6 +19,7 @@ top-level attribute to `top-level/all-packages.nix`. , bison, cups ? null, harfbuzz, libGL, perl , gstreamer, gst-plugins-base, gtk3, dconf , darwin +, buildPackages # options , developerBuild ? false @@ -96,6 +97,12 @@ let stripLen = 1; extraPrefix = "src/3rdparty/"; }) + + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/4cef673b2dd01ce85ce7a841cf352104bbe79668/f/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch"; + sha256 = "sha256-2D0/FL4PBL4p6ccd6JoDAGqNtLs2aeE1OdM+PJItock="; + }) ] ++ lib.optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ (fetchpatch { @@ -120,7 +127,6 @@ let ./qtwebkit-darwin-no-qos-classes.patch ]; qttools = [ ./qttools.patch ]; - qtwayland = [ ./qtwayland-libdrm-build.patch ]; }; addPackages = self: with self; @@ -139,7 +145,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; @@ -156,7 +162,7 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit debug developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; inherit (darwin) libobjc; }; @@ -172,6 +178,7 @@ let qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; + qtlottie = callPackage ../modules/qtlottie.nix {}; qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; @@ -182,6 +189,7 @@ let qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; qtscript = callPackage ../modules/qtscript.nix {}; qtsensors = callPackage ../modules/qtsensors.nix {}; + qtserialbus = callPackage ../modules/qtserialbus.nix {}; qtserialport = callPackage ../modules/qtserialport.nix {}; qtspeech = callPackage ../modules/qtspeech.nix {}; qtsvg = callPackage ../modules/qtsvg.nix {}; @@ -215,7 +223,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns qtlottie ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); @@ -228,7 +236,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev makeWrapper ] + deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch deleted file mode 100644 index fb3d6327e45b..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 7217ea9cf297e664be876eb82b66a1b4f157ca80 -Author: Peter Seiderer <ps.report@gmx.net> -Date: Fri Apr 3 21:52:30 2020 +0200 - - fix libdrm related configure test failure - - Fixes: - - Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm' - Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm' - Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm' - - Task-number: QTBUG-83303 - Change-Id: I3970f4e3855fcfa760493631a14adb6a16950aa9 - Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> - Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> - Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> - (cherry picked from commit ca63fe81df8ac910f43539719566ed6745700c2b) - (cherry picked from commit 1344ca6b5a8fbc1b28727feea6d856af8bf3bc93) - -diff --git a/src/client/configure.json b/src/client/configure.json -index 06213968..27c73f89 100644 ---- a/src/client/configure.json -+++ b/src/client/configure.json -@@ -74,7 +74,8 @@ - "label": "Linux dma-buf Buffer Sharing", - "type": "compile", - "test": "dmabuf_server_buffer", -- "use": "egl drm" -+ "libs": "-ldrm", -+ "use": "egl" - }, - "vulkan-server-buffer": { - "label": "Vulkan Buffer Sharing", -diff --git a/src/compositor/configure.json b/src/compositor/configure.json -index 0dbb3364..73e4c1a8 100644 ---- a/src/compositor/configure.json -+++ b/src/compositor/configure.json -@@ -80,13 +80,15 @@ - "label": "Linux dma-buf Buffer Sharing", - "type": "compile", - "test": "dmabuf_server_buffer", -- "use": "egl drm" -+ "libs": "-ldrm", -+ "use": "egl" - }, - "dmabuf-client-buffer": { - "label": "Linux Client dma-buf Buffer Sharing", - "type": "compile", - "test": "dmabuf_client_buffer", -- "use": "egl drm" -+ "libs": "-ldrm", -+ "use": "egl" - }, - "vulkan-server-buffer": { - "label": "Vulkan Buffer Sharing", diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 5943a80a701e..e3f94ba8ffef 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -12,6 +12,7 @@ Check for any minor version changes. , bison, cups ? null, harfbuzz, libGL, perl , gstreamer, gst-plugins-base, gtk3, dconf , darwin +, buildPackages # options , developerBuild ? false @@ -42,6 +43,8 @@ let # Patch framework detection to support X.framework/X.tbd, # extending the current support for X.framework/X. ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch + + ./qtbase.patch.d/0014-aarch64-darwin.patch ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -101,7 +104,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; @@ -118,7 +121,7 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; inherit (darwin) libobjc; }; @@ -134,6 +137,7 @@ let qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; + qtlottie = callPackage ../modules/qtlottie.nix {}; qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; @@ -179,7 +183,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns qtlottie ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); @@ -192,7 +196,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev makeWrapper ] + deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index 3a2900abdd6b..faf0b643fdba 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -30,7 +30,54 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul index 92a9112bca..b80ec1e801 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -68,212 +68,6 @@ qt { +@@ -1,9 +1,5 @@ + load(default_post) + +-# Recompute SDK version in case the user set it explicitly +-sdk_version = $$QMAKE_MAC_SDK_VERSION +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- + contains(TEMPLATE, .*app) { + !macx-xcode:if(isEmpty(BUILDS)|build_pass) { + # Detect changes to the platform SDK +@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) { + QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) + } + +- # Detect incompatible SDK versions +- +- isEmpty(QT_MAC_SDK_VERSION_MIN): \ +- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION +- +- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ +- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ +- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") +- +- !isEmpty(QT_MAC_SDK_VERSION_MAX) { +- # For Qt developers only +- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ +- CONFIG += sdk_no_version_check +- +- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) +- +- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { +- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ +- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.") +- warning("This is an unsupported configuration. You may experience build issues," \ +- "and by using") +- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ +- "that Qt has not been prepared for.") +- +- warning("Please downgrade the SDK you use to build your app to version" \ +- "$$QT_MAC_SDK_VERSION_MAX, or configure") +- warning("with CONFIG+=sdk_no_version_check when running qmake" \ +- "to silence this warning.") +- } +- } + } + + !no_objective_c:CONFIG += objective_c +@@ -73,212 +39,6 @@ qt { } } @@ -311,10 +358,10 @@ index e3534561a5..3b01424e67 100644 diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk -@@ -1,25 +0,0 @@ +@@ -1,27 +0,0 @@ - -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null - CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) - ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) - # We don't want to complain about out of date SDK unless the target needs to be remade. @@ -327,12 +374,14 @@ diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk - else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) - $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) - else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) - else - $(info Unknown error resolving current platform SDK version.) - endif -- $(info This requires a fresh build. Please wipe the build directory completely,) -- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(info This requires a fresh build of your project. Please wipe the build directory) +- ifneq ($(EXPORT__QMAKE_STASH_),) +- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) +- endif - $(error ^) - endif - endif @@ -404,6 +453,14 @@ index 3a9c2778bb..0000000000 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} --- -2.25.4 - +diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf +deleted file mode 100644 +index df191eb13c..0000000000 +--- a/mkspecs/features/mac/toolchain.prf ++++ /dev/null +@@ -1,5 +0,0 @@ +-# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, +-# which the default path determination uses. +-sdk: load(sdk) +- +-load(toolchain) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch new file mode 100644 index 000000000000..8ef1b08a5b88 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch @@ -0,0 +1,287 @@ +From abc52460201bc5c7603505bb187138b0c59291aa Mon Sep 17 00:00:00 2001 +From: Mushroom <mushroom@watchingyour.tv> +Date: Sun, 20 Dec 2020 00:11:41 +0000 +Subject: [PATCH] [QtBase] Split macOS platforms by architecture + +Currently macOS only has one platform, which forces the default arch to +x86_64. This patch splits the platforms by architecture, and defaults to +the same as the host. + +This stops M1-based macs from compiling x64 binaries by default, +instead making them compile native binaries. + +[ChangeLog][QtBase][Platform Specific Changes][OS X] Split macOS +platforms so it doesn't default to the x64 architecture every time + +Change-Id: I34891b107bb24f68371df1c8f087eb0ad5b5dd95 +--- + configure | 9 +++- + .../clang-macx-desktop.conf} | 8 ++-- + mkspecs/common/macx.conf | 1 - + .../Info.plist.app | 0 + .../Info.plist.dSYM.in | 0 + .../Info.plist.disable_highdpi | 0 + .../Info.plist.lib | 0 + mkspecs/macx-clang-arm64/qmake.conf | 7 ++++ + .../qplatformdefs.h | 0 + mkspecs/macx-clang-x64/Info.plist.app | 24 +++++++++++ + mkspecs/macx-clang-x64/Info.plist.dSYM.in | 18 ++++++++ + .../macx-clang-x64/Info.plist.disable_highdpi | 8 ++++ + mkspecs/macx-clang-x64/Info.plist.lib | 20 +++++++++ + mkspecs/macx-clang-x64/qmake.conf | 7 ++++ + mkspecs/macx-clang-x64/qplatformdefs.h | 41 +++++++++++++++++++ + 15 files changed, 137 insertions(+), 6 deletions(-) + rename mkspecs/{macx-clang/qmake.conf => common/clang-macx-desktop.conf} (83%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.app (100%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.dSYM.in (100%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.disable_highdpi (100%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.lib (100%) + create mode 100644 mkspecs/macx-clang-arm64/qmake.conf + rename mkspecs/{macx-clang => macx-clang-arm64}/qplatformdefs.h (100%) + create mode 100644 mkspecs/macx-clang-x64/Info.plist.app + create mode 100644 mkspecs/macx-clang-x64/Info.plist.dSYM.in + create mode 100644 mkspecs/macx-clang-x64/Info.plist.disable_highdpi + create mode 100644 mkspecs/macx-clang-x64/Info.plist.lib + create mode 100644 mkspecs/macx-clang-x64/qmake.conf + create mode 100644 mkspecs/macx-clang-x64/qplatformdefs.h + +diff --git a/configure b/configure +index b6c9b462f24..a86f2ceaa5b 100755 +--- a/configure ++++ b/configure +@@ -556,7 +556,14 @@ PLATFORM_NOTES= + if [ -z "$PLATFORM" ]; then + case "$UNAME_SYSTEM:$UNAME_RELEASE" in + Darwin:*) +- PLATFORM=macx-clang ++ case "$UNAME_MACHINE" in ++ arm64) ++ PLATFORM=macx-clang-arm64 ++ ;; ++ *) ++ PLATFORM=macx-clang-x64 ++ ;; ++ esac + ;; + AIX:*) + #PLATFORM=aix-g++ +diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/common/clang-macx-desktop.conf +similarity index 83% +rename from mkspecs/macx-clang/qmake.conf +rename to mkspecs/common/clang-macx-desktop.conf +index 0cf1f31b60d..042319a2aa3 100644 +--- a/mkspecs/macx-clang/qmake.conf ++++ b/mkspecs/common/clang-macx-desktop.conf +@@ -24,9 +24,9 @@ QMAKE_LIBS_X11 = -lX11 -lXext -lm + QMAKE_LIBDIR_X11 = /opt/X11/lib + QMAKE_INCDIR_X11 = /opt/X11/include + +-include(../common/macx.conf) +-include(../common/gcc-base-mac.conf) +-include(../common/clang.conf) +-include(../common/clang-mac.conf) ++include(macx.conf) ++include(gcc-base-mac.conf) ++include(clang.conf) ++include(clang-mac.conf) + + load(qt_config) +diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf +index d16b77acb8e..4ba0a8eaa36 100644 +--- a/mkspecs/common/macx.conf ++++ b/mkspecs/common/macx.conf +@@ -6,7 +6,6 @@ QMAKE_PLATFORM += macos osx macx + QMAKE_MAC_SDK = macosx + + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 +-QMAKE_APPLE_DEVICE_ARCHS = x86_64 + + # Should be 10.15, but as long as the CI builds with + # older SDKs we have to keep this. +diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.app +rename to mkspecs/macx-clang-arm64/Info.plist.app +diff --git a/mkspecs/macx-clang/Info.plist.dSYM.in b/mkspecs/macx-clang-arm64/Info.plist.dSYM.in +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.dSYM.in +rename to mkspecs/macx-clang-arm64/Info.plist.dSYM.in +diff --git a/mkspecs/macx-clang/Info.plist.disable_highdpi b/mkspecs/macx-clang-arm64/Info.plist.disable_highdpi +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.disable_highdpi +rename to mkspecs/macx-clang-arm64/Info.plist.disable_highdpi +diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang-arm64/Info.plist.lib +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.lib +rename to mkspecs/macx-clang-arm64/Info.plist.lib +diff --git a/mkspecs/macx-clang-arm64/qmake.conf b/mkspecs/macx-clang-arm64/qmake.conf +new file mode 100644 +index 00000000000..0cc2361e696 +--- /dev/null ++++ b/mkspecs/macx-clang-arm64/qmake.conf +@@ -0,0 +1,7 @@ ++# ++# qmake configuration for Clang on OS X (arm64) ++# ++ ++QMAKE_APPLE_DEVICE_ARCHS=arm64 ++ ++include(../common/clang-macx-desktop.conf) +diff --git a/mkspecs/macx-clang/qplatformdefs.h b/mkspecs/macx-clang-arm64/qplatformdefs.h +similarity index 100% +rename from mkspecs/macx-clang/qplatformdefs.h +rename to mkspecs/macx-clang-arm64/qplatformdefs.h +diff --git a/mkspecs/macx-clang-x64/Info.plist.app b/mkspecs/macx-clang-x64/Info.plist.app +new file mode 100644 +index 00000000000..fa592af0897 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.app +@@ -0,0 +1,24 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> ++<plist version="1.0"> ++<dict> ++ <key>CFBundleExecutable</key> ++ <string>${EXECUTABLE_NAME}</string> ++ <key>CFBundleIconFile</key> ++ <string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string> ++ <key>CFBundleIdentifier</key> ++ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> ++ <key>CFBundlePackageType</key> ++ <string>APPL</string> ++ <key>CFBundleSignature</key> ++ <string>${QMAKE_PKGINFO_TYPEINFO}</string> ++ <key>LSMinimumSystemVersion</key> ++ <string>${MACOSX_DEPLOYMENT_TARGET}</string> ++ <key>NOTE</key> ++ <string>This file was generated by Qt/QMake.</string> ++ <key>NSPrincipalClass</key> ++ <string>NSApplication</string> ++ <key>NSSupportsAutomaticGraphicsSwitching</key> ++ <true/> ++</dict> ++</plist> +diff --git a/mkspecs/macx-clang-x64/Info.plist.dSYM.in b/mkspecs/macx-clang-x64/Info.plist.dSYM.in +new file mode 100644 +index 00000000000..a8c8d0d4fb5 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.dSYM.in +@@ -0,0 +1,18 @@ ++<?xml version=\"1.0\" encoding=\"UTF-8\"?> ++<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> ++<plist version=\"1.0\"> ++ <dict> ++ <key>CFBundleIdentifier</key> ++ <string>com.apple.xcode.dsym.$${BUNDLEIDENTIFIER}</string> ++ <key>CFBundlePackageType</key> ++ <string>dSYM</string> ++ <key>CFBundleSignature</key> ++ <string>????</string> ++!!IF !isEmpty(VERSION) ++ <key>CFBundleShortVersionString</key> ++ <string>$${VER_MAJ}.$${VER_MIN}</string> ++ <key>CFBundleVersion</key> ++ <string>$${VER_MAJ}.$${VER_MIN}.$${VER_PAT}</string> ++!!ENDIF ++ </dict> ++</plist> +diff --git a/mkspecs/macx-clang-x64/Info.plist.disable_highdpi b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi +new file mode 100644 +index 00000000000..a9b89888ad4 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi +@@ -0,0 +1,8 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> ++<plist version="1.0"> ++<dict> ++ <key>NSHighResolutionCapable</key> ++ <string>NO</string> ++</dict> ++</plist> +diff --git a/mkspecs/macx-clang-x64/Info.plist.lib b/mkspecs/macx-clang-x64/Info.plist.lib +new file mode 100644 +index 00000000000..34752ec40d9 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.lib +@@ -0,0 +1,20 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> ++<plist version="1.0"> ++<dict> ++ <key>CFBundleExecutable</key> ++ <string>${EXECUTABLE_NAME}</string> ++ <key>CFBundleIdentifier</key> ++ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> ++ <key>CFBundlePackageType</key> ++ <string>FMWK</string> ++ <key>CFBundleShortVersionString</key> ++ <string>${QMAKE_SHORT_VERSION}</string> ++ <key>CFBundleSignature</key> ++ <string>${QMAKE_PKGINFO_TYPEINFO}</string> ++ <key>CFBundleVersion</key> ++ <string>${QMAKE_FULL_VERSION}</string> ++ <key>NOTE</key> ++ <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> ++</dict> ++</plist> +diff --git a/mkspecs/macx-clang-x64/qmake.conf b/mkspecs/macx-clang-x64/qmake.conf +new file mode 100644 +index 00000000000..1ac373b53b4 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/qmake.conf +@@ -0,0 +1,7 @@ ++# ++# qmake configuration for Clang on OS X (arm64) ++# ++ ++QMAKE_APPLE_DEVICE_ARCHS=x86_64 ++ ++include(../common/clang-macx-desktop.conf) +diff --git a/mkspecs/macx-clang-x64/qplatformdefs.h b/mkspecs/macx-clang-x64/qplatformdefs.h +new file mode 100644 +index 00000000000..063491dd900 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/qplatformdefs.h +@@ -0,0 +1,41 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the qmake spec of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "../common/mac/qplatformdefs.h" ++ diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch index 7b568a91943f..ee9b80ca6ed4 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch @@ -175,14 +175,16 @@ index 978d73f7d9..463e3c5579 100644 QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint(); qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint; -@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin +@@ -294,12 +294,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin if (!target) return; - QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag(); - Q_ASSERT(nativeDrag); - nativeDrag->exitDragLoop(); -- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); +- // for internal drag'n'drop, don't override the action the drop event accepted +- if (!nativeDrag->currentDrag()) +- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); + QCocoaIntegration::instance()->drag(); // Qt starts drag-and-drop on a mouse button press event. Cococa in diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 8bf6386c4c60..37685b07d344 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,118 +1,118 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "dba14d48611b9e9d59576172658779ab4a39b416", - "sha256": "1w2m1rm6mhj9qbanak36rqvc30x495zvj7mh2syy1yd29by0g5i8" + "rev": "3cc801c4ae41ff3f155258c4bf7e21bb5b3f6a3d", + "sha256": "0ia17cn59100n4qkxc1bdn36knqpdqy1dx06la4qlhvm6hzb7wpj" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb", - "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6" + "rev": "a4211b21b09a1b98020522bc058e0ee2d6ed2e1d", + "sha256": "1gdnqhx75iwja50nhvdb8fxbdcpw18pc6xpd105kj4j62f73j1hq" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "8cce1098c59534352aa0f343ea73861f603ac04a", - "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6" + "rev": "45ce7b075b5dd19744b9446aa9e8ceb1d099d8b9", + "sha256": "15b7258mjdxbqpgr9bjhysagznnx97l2948c15xjpb77sc8l0wlh" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "d16bf02a11953dcac01dca73e6f3778f293adefe", - "sha256": "0rpyd5r60707lzfmfi3y501c7is1gzhh30bframsy8bwglck2hjj" + "rev": "aa0c6db334cf6f0887f42cbd82e4af258126bdc5", + "sha256": "0gxlqkag06fd7jbk7kjcjxxa3wxm27fa9vdd4hzq5gkq5y1hslaw" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "130463160b4923069eb98da49edaf7d93180f4f8", - "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw" + "rev": "9a569795f0c3f41ec093e4aa5842a463e2755edb", + "sha256": "12w48q59xcr0l1s941pnsp5s8xk5knis9c1cry6kvybiq51hl77n" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26", - "sha256": "1lpiq3svlnj8f8apd12if11sng7k0l8y6vhr317srzz4dd77cfry" + "rev": "42c25efeaa409f711af1bd9a8144b445741ee114", + "sha256": "0bj28j5ksr95bj9vmqcahvx3a5bc8kd9kkd6q8nsg7ak0bm0cm2p" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92", - "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj" + "rev": "a32c95d27224c6c9e41d6080ea54bc937c5d1455", + "sha256": "105cdvz8y48lhyn1s5w8ckcd0vk2gq7aqnmndiq45k1c8nikn2ry" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "1d49a5b678957adde7e2db23a485a3f48157bc8f", - "sha256": "1wdpgh23mdn0nny9c837iyg9kszc3m4cdmaanf8glymkzn0rkd8w" + "rev": "c47f3d7b227c9bc86ca1702ae3291a62c2116cfa", + "sha256": "0izk3zxbf1h1k88qvq8p6yaza9pkm19w4f491mbazs87qwfh3dni" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e", - "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1" + "rev": "a2a7f0f219ccedf1ecb2bc06760ef5439262aacd", + "sha256": "1s2jbwq83zfqg7d0mq4v60nvpg4zfa47xqgh7sglgk1s922jyj76" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81", - "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46" + "rev": "5107ddf28177112cdbf505f92bb4191a91e6521a", + "sha256": "1fyyyljhl8h4rgik3i8gi2xg5r05xd2vf4qgn4ybf3yafjsra9am" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e", - "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8" + "rev": "c25898224cd957491d10dbe48f2f0be66f2955de", + "sha256": "1cr3hykl79yr7x06hjfx9g6nq2wmb3q5hszby83hbzpf166h8zjf" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f", - "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr" + "rev": "0ee52083683c9fcd996118ef62d9e60b5431a520", + "sha256": "0ainvxp2sw13dx44j8waa89bni8ylxkykr6mwncsspi7da9dqxq2" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f", - "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52" + "rev": "73db91329ae48f685fa3fdae1c3c63b0976dc751", + "sha256": "0l8amd9fsn8agxgvxmij59i12504bmzbvyc1rz6nqhcpib4z5w7l" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4", - "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r" + "rev": "4b3d1e824fdde2c835041464a9f85feaed0b313d", + "sha256": "02g7znswwki86723d3p23n0hwdi6brch9whx526l92sfx308z380" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "e72896968697e2a8af16a312e1560948e4c40f30", - "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms" + "rev": "166cb4d6166cab60a66a074c848f6ed725e6755c", + "sha256": "09f34v5x4z3y58z6b4hriqclrf9mjncxyl4h9ph0cicam66575ms" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545", - "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94" + "rev": "16d9ea642bf7b9592a6c53321cc7ee9d9a3ed03f", + "sha256": "1xi2shsg0apk7rk7ccrbnjsg9j6p8svgs1pbml48ci57i36dgzfv" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a", - "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2" + "rev": "9e698881cb07ebf04319f5cfa7b065c8bc2c1afb", + "sha256": "0207z0mv6nfgw7vhh43sx7r8z4cmvilh31x1x24d7nxj9rggnm1b" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e", - "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp" + "rev": "87021fd1e50f0aa3589a2412cfa665a6d27cc740", + "sha256": "184mpjc0vnrmxl7z0x2c1xj2adrdx12l5swpzh51q1wb45j1lvna" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3", - "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s" + "rev": "1a8736a5834492aa8b7fc2dbc59a1eb4420a7330", + "sha256": "1byn9g46jd4krij0h1x7lfn7ac5v4rican0lppngm065is4c6c7p" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420", - "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc" + "rev": "4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b", + "sha256": "1qkamv5p97p0lp7968cdjz4ah8mfqmrq23dikqvkwnirl3bffd83" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "d8d6b14b9907adbc6ce307d52be34aaa761a58fa", - "sha256": "15c7nrvvn7qc3l7kdbl5wdpazqwv8zvg1aij2jvcrhbymn0zl3mc" + "rev": "59cc1cc5b3719713598a1f426d82a9d895b5dccb", + "sha256": "0i1k520080h0q85hifs5axnn4dysmvwhrsm0kxq28qgdpqjzkli6" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07", - "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid" + "rev": "2da3c0efd5016bdba26b80789773238c2886fdf6", + "sha256": "0lmyw4cxgj5kcisd2pbcpl1zynj2rfa3nsfl1n2mcz6ca650ibys" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735", - "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146" + "rev": "89407ff20e4f76314887e2f3625f5126910031ac", + "sha256": "1qimf60hz1962l5wpdh33y6xz3h8zcnf5yj5b1i0gfyzg0c2ki5n" }, "qtscript": { "url": "https://invent.kde.org/qt/qt/qtscript.git", @@ -121,87 +121,87 @@ }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "7a15000f42c7a3171719727cd056f82a78244ed7", - "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq" + "rev": "bb5d10f926c51aa462a56ffb331afd4f9607855c", + "sha256": "0wkwkzfv5hxkhrpmy0knlxf9c7qkals5s9c0bw71k9dz8n24d7j8" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1", - "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8" + "rev": "bce4b6231229e953c3961f3d9858e58555a55d56", + "sha256": "15b2scai53d10c8bv6kv4k9lc3z9bixr4364yw2pkm71mwir90ga" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32", - "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5" + "rev": "b6e22f07fb529736c9362d81de7f5c632bd1f439", + "sha256": "039kd0yk1am9s1yr39p7gwirjl3126arqf9r01xn5kcs4viizh1k" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4", - "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx" + "rev": "112fcd80658a52e6a2822ec79a7d724d0ad003cf", + "sha256": "1px0mm301401ha0qx5blhmcmbb17bd71q1smcdlxnl8a704n4nry" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b", - "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5" + "rev": "e76b23ad707077647cdb4282cf35a71776efa0f0", + "sha256": "0lnvbcx5rflx50wpbhxy7f15ax7cs4l7h44i8y9bb04njqswh0pa" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "728012f7762ecd5762d493f8796907c6456f31e7", - "sha256": "1ldizgybl4fp95xlzf103hqmsqdmr3jbx048jyxcb5gjd3pbwh7p" + "rev": "68de925ddc20dfb8900be4fa47fa5a5916836cc8", + "sha256": "0b0d70w2ycxac81dqd1yhswcn37055ra3jfqn5srk8wsbdhpjl1c" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "33693a928986006d79c1ee743733cde5966ac402", - "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n" + "rev": "672ba9d902be3634a9fef80be65227aece9e0aed", + "sha256": "05rzr6hlipzcm0vs9k721y25hzhv916hv48gr0pbrfzljyvp2yhx" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638", - "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7" + "rev": "0e92fc4f19928387c341533ef3d259efaa752c0f", + "sha256": "0vwkf72gpn42g54lhcbgaxbx9awpzi4a0602yhssad0v3a6zrl11" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "98d1fd864cbb6c7c012c4139118808af110fb8f0", - "sha256": "07xjmhca7z5bva03zk73d948qz0a3wnn4kvyy6j4cnp3w5giz5kc" + "rev": "766c1b7acbdc9ff4e35f6eb341fd446b1c20b811", + "sha256": "0bdg98h5z0lwl61860iam6ixcvgis996qj8as739wn9y6k2sv904" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "214f7ab9d3384a4123f14d9f6cd0205cf0aaa794", - "sha256": "1qd64w5c16gmpgi936dfjc0pn1a1rbs752k8lfqv2xwysx7qkqwi" + "rev": "64fa557eb30fc1219bec50a45107ea1a983411ed", + "sha256": "14p20mv2dwc3i0qhssl7sqa0bnk14mg0kaq7ai65fqkx5b8qn5xr" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "fa8b07105b5e274daaa8adcc129fa4aa0447f9f7", - "sha256": "0mggqa8kixknbm1p5i5lkrmkj1na3b2xflj011dkjbj8wb78i42n" + "rev": "da9b7b0e059447dceb828bc02d40e30d26b012f2", + "sha256": "0kyzzz17d7s9ln6j4ply6hl3y8wky5wslpabbmwsy2952g1y3l99" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b", - "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515" + "rev": "8feafc4b8e9af78175e2814523ef4f11e445fc93", + "sha256": "0ck9091bhgvhnwilfjrk9pjlf184bmhia9b92av0sg0m7yrg5wqd" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "b13b56904b76e96ea52d0efe56395acc94b17d96", - "sha256": "047asrq7c44v7cn2d7c5zba47qzpsb6nidba77i2xn7gqlfv6z3b" + "rev": "e5be9ba432929049da8f4788400c170bf71672da", + "sha256": "1jq11rhd0k880gabh839gs474psfc0j20sy65l1l7w1cffwi1zk2" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f", - "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f" + "rev": "429096eb954672d3727a3e8cc83832bc79cf7967", + "sha256": "0c0q3dcxz00y8wml141xk3lx91mzg4mg5qlka2k1j49cn1az6lx3" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7", - "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx" + "rev": "b41efc2b32a19da9fe369e243dcf3a2a31f7cde6", + "sha256": "1prsv3z51sbq9q8v1xj4v312hai6ampdcfnik28rdh7c9mpnq99m" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "3898f5484fd4864b047729bfeda9a1222f32364f", - "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra" + "rev": "0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e", + "sha256": "13fzpipgvlxs9qw128hpnaxr8j4xi8v2fmyy39y1ghf66sfln1zn" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c", - "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq" + "rev": "a8edba5ad50d669aead4ddb769f171cba892d676", + "sha256": "1342b7qljjqpiq3xjwy0vblq8wqcqyp9s3751ja40n7ishhxd2yj" } } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 7cba1ae63f96..5ca033816181 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.3"; + version = "5.15.5"; overrides = { qtscript.version = "5.15.4"; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 5e2bb41c40f1..2dd9edcf5d23 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -4,14 +4,13 @@ , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3 , which # darwin support -, libiconv, libobjc, xcbuild, AGL, AppKit, ApplicationServices, Carbon, Cocoa, CoreAudio, CoreBluetooth +, libiconv, libobjc, xcbuild, AGL, AppKit, ApplicationServices, AVFoundation, Carbon, Cocoa, CoreAudio, CoreBluetooth , CoreLocation, CoreServices, DiskArbitration, Foundation, OpenGL, MetalKit, IOKit -, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite -, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng -, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev -, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm -, zlib, at-spi2-core +, dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite +, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb +, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil +, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core # optional dependencies , cups ? null, libmysqlclient ? null, postgresql ? null @@ -53,7 +52,7 @@ stdenv.mkDerivation { ] ++ ( if stdenv.isDarwin then [ # TODO: move to buildInputs, this should not be propagated. - AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL libobjc libiconv MetalKit IOKit ] else [ @@ -62,6 +61,8 @@ stdenv.mkDerivation { # Text rendering fontconfig freetype + libdrm + # X11 libs libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm @@ -115,6 +116,9 @@ stdenv.mkDerivation { sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in + + # https://bugs.gentoo.org/803470 + sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' patchShebangs ./bin '' + ( @@ -151,6 +155,9 @@ stdenv.mkDerivation { ''} NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" + + # paralellize compilation of qtmake, which happens within ./configure + export MAKEFLAGS+=" -j$NIX_BUILD_CORES" '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' ./bin/syncqt.pl -version $version ''; @@ -188,7 +195,10 @@ stdenv.mkDerivation { # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" ] - ++ lib.optionals withGtk3 [ + ++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [ + # .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate' + "-DQ_OS_MAC" + ] ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' ] @@ -261,7 +271,7 @@ stdenv.mkDerivation { "-I" "${harfbuzz.dev}/include" "-system-pcre" "-openssl-linked" - "-L" "${openssl.out}/lib" + "-L" "${lib.getLib openssl}/lib" "-I" "${openssl.dev}/include" "-system-sqlite" ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql'' @@ -274,7 +284,6 @@ stdenv.mkDerivation { ] ++ lib.optional (compareVersion "5.15.0" < 0) "-v" ++ ( if stdenv.isDarwin then [ - "-platform macx-clang" "-no-fontconfig" "-qt-freetype" "-qt-libpng" @@ -367,7 +376,7 @@ stdenv.mkDerivation { # error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc' # note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64 # it seems the qmake/cmake passes x86_64 as preferred architecture somewhere - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.isDarwin && stdenv.isAarch64 && (compareVersion "5.15.3" < 0); }; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix new file mode 100644 index 000000000000..d94c289953d0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qtlottie"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index baf5c30e73c4..41a7eb6776c3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -15,8 +15,9 @@ qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] - ++ lib.optional (stdenv.isLinux) alsa-lib + buildInputs = [ gstreamer gst-plugins-base ] + # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio + ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix index d2748ba8d4c5..a1ecb48f0d9d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -1,7 +1,9 @@ -{ qtModule }: +{ qtModule, speechd, pkg-config }: qtModule { pname = "qtspeech"; qtInputs = [ ]; + buildInputs = [ speechd ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch new file mode 100644 index 000000000000..24d081aa602b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch @@ -0,0 +1,36 @@ +Ensure that the correct `app_id` for Wayland is set. The upstream implementation +uses `QFileInfo::baseName()`[1] which strips everything away after the first dot. +This means that `.foo-wrapped` has an empty `app_id` because `baseName` returns +an empty string in this case. + +The patch basically checks whether the program has the form `.foo-wrapped` (i.e. got +wrapped by `makeWrapper`) and if that's the case, `foo` will be the correct `app_id`. + +[1] https://doc.qt.io/qt-5/qfileinfo.html#baseName + +diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp +index ba881cb..b3fd031 100644 +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -167,7 +167,20 @@ void QWaylandWindow::initWindow() + Qt::SkipEmptyParts); + + if (domainName.isEmpty()) { +- mShellSurface->setAppId(fi.baseName()); ++ auto baseName = fi.baseName(); ++ if (baseName.isEmpty()) { ++ auto fileName = fi.fileName(); ++ if (fileName.endsWith("-wrapped") && fileName.startsWith(".")) { ++ do { ++ auto len = fileName.length(); ++ fileName = fileName.right(len - 1); ++ fileName = fileName.left(len - 9); ++ } while (fileName.endsWith("-wrapped") && fileName.startsWith(".")); ++ mShellSurface->setAppId(fileName); ++ } ++ } else { ++ mShellSurface->setAppId(baseName); ++ } + } else { + QString appId; + for (int i = 0; i < domainName.count(); ++i) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 1bd1adedaf04..851e4ad6966b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -6,4 +6,10 @@ qtModule { buildInputs = [ wayland ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; + patches = [ + # NixOS-specific, ensure that app_id is correctly determined for + # wrapped executables from `wrapQtAppsHook` (see comment in patch for further + # context). Beware: shared among different Qt5 versions. + ./qtwayland-app_id.patch + ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 01d0c5932828..ece389b98ea3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,7 +1,7 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which +, bison, flex, git, gperf, ninja, pkg-config, python2, which , nodejs, qtbase, perl , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst @@ -12,7 +12,6 @@ , libcap , pciutils , systemd -, pipewire_0_2 , enableProprietaryCodecs ? true , gn , cctools, libobjc, libunwind, sandbox, xnu @@ -23,13 +22,15 @@ , lib, stdenv, fetchpatch , version ? null , qtCompatVersion +, pipewireSupport ? stdenv.isLinux +, pipewire_0_2 }: qtModule { pname = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs + bison flex git gperf ninja pkg-config python2 which gn nodejs ] ++ lib.optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -137,7 +138,7 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ lib.optional (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" + ++ lib.optional (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ @@ -171,7 +172,7 @@ qtModule { xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile - ] ++ lib.optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ + ] ++ lib.optionals (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) [ # Pipewire pipewire_0_2 ] @@ -239,7 +240,22 @@ qtModule { meta = with lib; { description = "A web engine based on the Chromium web browser"; maintainers = with maintainers; [ matthewbauer ]; - platforms = platforms.unix; + + # qtwebengine-5.15.8: "QtWebEngine can only be built for x86, + # x86-64, ARM, Aarch64, and MIPSel architectures." + platforms = + lib.trivial.pipe lib.systems.doubles.all [ + (map (double: lib.systems.elaborate { system = double; })) + (lib.lists.filter (parsedPlatform: with parsedPlatform; + isUnix && + (isx86_32 || + isx86_64 || + isAarch32 || + isAarch64 || + (isMips && isLittleEndian)))) + (map (plat: plat.system)) + ]; + # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; # we are still stuck with MacOS SDK 10.12 on x86_64-darwin diff --git a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 3323e3fb4cc8..b74d5e086802 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -14,7 +14,7 @@ in mkDerivation (args // { inherit pname version src; - patches = args.patches or patches.${pname} or []; + patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); diff --git a/nixpkgs/pkgs/development/libraries/qt-6/cmake.patch b/nixpkgs/pkgs/development/libraries/qt-6/cmake.patch new file mode 100644 index 000000000000..1fb2ea26c35d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/cmake.patch @@ -0,0 +1,129 @@ +commit 4f497c358e0386b65df1c1d636aadf72f8647134 +Author: Nick Cao <nickcao@nichi.co> +Date: Tue Apr 19 13:49:59 2022 +0800 + + patch cmake file generation for nixpkgs packaging + + As of qt 6.3.0, installing components into different prefixes is not + supported. To workaround that, we move files to their designated in the + postInstall hook. However the generated cmake files still have + references to the original prefix, and would cause issues when using + said components as the dependency of other packages. The purpose of this + patch is to closely match the output layout of qt, and rewrite the + generated cmake files to point to the corrected pathes. + +diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx +index 8b0f64e23b..03291e2ee2 100644 +--- a/Source/cmExportFileGenerator.cxx ++++ b/Source/cmExportFileGenerator.cxx +@@ -6,6 +6,7 @@ + #include <cstring> + #include <sstream> + #include <utility> ++#include <cstdlib> + + #include <cm/memory> + +@@ -325,9 +326,23 @@ static void prefixItems(std::string& exportDirs) + for (std::string const& e : entries) { + exportDirs += sep; + sep = ";"; +- if (!cmSystemTools::FileIsFullPath(e) && +- e.find("${_IMPORT_PREFIX}") == std::string::npos) { +- exportDirs += "${_IMPORT_PREFIX}/"; ++ if (!cmSystemTools::FileIsFullPath(e)) { ++ if (std::getenv("dev")) { ++ if (cmHasLiteralPrefix(e, "include") || cmHasLiteralPrefix(e, "./include")) { ++ exportDirs += std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(e, "bin") || cmHasLiteralPrefix(e, "./bin")) { ++ exportDirs += std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(e, "mkspecs") || cmHasLiteralPrefix(e, "./mkspecs")) { ++ exportDirs += std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(e, "libexec") || cmHasLiteralPrefix(e, "./libexec")) { ++ exportDirs += std::getenv("dev"); ++ } else { ++ exportDirs += std::getenv("out"); ++ } ++ } else { ++ exportDirs += std::getenv("out"); ++ } ++ exportDirs += "/"; + } + exportDirs += e; + } +diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx +index 4a3c565bce..5afa9e5e50 100644 +--- a/Source/cmExportInstallFileGenerator.cxx ++++ b/Source/cmExportInstallFileGenerator.cxx +@@ -5,6 +5,7 @@ + #include <memory> + #include <sstream> + #include <utility> ++#include <cstdlib> + + #include "cmExportSet.h" + #include "cmGeneratedFileStream.h" +@@ -263,7 +264,7 @@ void cmExportInstallFileGenerator::LoadConfigFiles(std::ostream& os) + + void cmExportInstallFileGenerator::ReplaceInstallPrefix(std::string& input) + { +- cmGeneratorExpression::ReplaceInstallPrefix(input, "${_IMPORT_PREFIX}"); ++ cmGeneratorExpression::ReplaceInstallPrefix(input, std::getenv("out")); + } + + bool cmExportInstallFileGenerator::GenerateImportFileConfig( +@@ -381,9 +382,24 @@ void cmExportInstallFileGenerator::SetImportLocationProperty( + // Construct the installed location of the target. + std::string dest = itgen->GetDestination(config); + std::string value; ++ + if (!cmSystemTools::FileIsFullPath(dest)) { +- // The target is installed relative to the installation prefix. +- value = "${_IMPORT_PREFIX}/"; ++ if (std::getenv("dev")) { ++ if (cmHasLiteralPrefix(dest, "include") || cmHasLiteralPrefix(dest, "./include")) { ++ value = std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(dest, "bin") || cmHasLiteralPrefix(dest, "./bin")) { ++ value = std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(dest, "mkspecs") || cmHasLiteralPrefix(dest, "./mkspecs")) { ++ value = std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(dest, "libexec") || cmHasLiteralPrefix(dest, "./libexec")) { ++ value = std::getenv("dev"); ++ } else { ++ value = std::getenv("out"); ++ } ++ } else { ++ value = std::getenv("out"); ++ } ++ value += "/"; + } + value += dest; + value += "/"; +diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx +index 840f5112d6..7bb4ab41aa 100644 +--- a/Source/cmGeneratorExpression.cxx ++++ b/Source/cmGeneratorExpression.cxx +@@ -197,7 +197,22 @@ static void prefixItems(const std::string& content, std::string& result, + sep = ";"; + if (!cmSystemTools::FileIsFullPath(e) && + cmGeneratorExpression::Find(e) != 0) { +- result += prefix; ++ if (std::getenv("dev")) { ++ if (cmHasLiteralPrefix(e, "include") || cmHasLiteralPrefix(e, "./include")) { ++ result += std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(e, "bin") || cmHasLiteralPrefix(e, "./bin")) { ++ result += std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(e, "mkspecs") || cmHasLiteralPrefix(e, "./mkspecs")) { ++ result += std::getenv("dev"); ++ } else if (cmHasLiteralPrefix(e, "libexec") || cmHasLiteralPrefix(e, "./libexec")) { ++ result += std::getenv("dev"); ++ } else { ++ result += std::getenv("out"); ++ } ++ } else { ++ result += std::getenv("out"); ++ } ++ result += "/"; + } + result += e; + } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix new file mode 100644 index 000000000000..8c12cc2fb671 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -0,0 +1,94 @@ +{ newScope +, lib +, stdenv +, fetchurl +, fetchgit +, fetchpatch +, fetchFromGitHub +, makeSetupHook +, makeWrapper +, bison +, cups +, harfbuzz +, libGL +, perl +, cmake +, ninja +, writeText +, gstreamer +, gst-plugins-base +, gtk3 +, dconf +, buildPackages + + # options +, developerBuild ? false +, debug ? false +}: + +let + srcs = import ./srcs.nix { + inherit fetchurl; + mirror = "mirror://qt"; + }; + + qtModule = + import ./qtModule.nix + { inherit stdenv lib perl cmake ninja writeText; } + { inherit self srcs; }; + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtModule srcs; }; + in + { + + inherit callPackage qtModule srcs; + + qtbase = callPackage ./modules/qtbase.nix { + withGtk3 = true; + inherit (srcs.qtbase) src version; + inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; + }; + + qt3d = callPackage ./modules/qt3d.nix { }; + qt5compat = callPackage ./modules/qt5compat.nix { }; + qtcharts = callPackage ./modules/qtcharts.nix { }; + qtconnectivity = callPackage ./modules/qtconnectivity.nix { }; + qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; + qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; + qtdoc = callPackage ./modules/qtdoc.nix { }; + qtimageformats = callPackage ./modules/qtimageformats.nix { }; + qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; + qtlottie = callPackage ./modules/qtlottie.nix { }; + qtmultimedia = callPackage ./modules/qtmultimedia.nix { + inherit gstreamer gst-plugins-base; + }; + qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; + qtpositioning = callPackage ./modules/qtpositioning.nix { }; + qtsensors = callPackage ./modules/qtsensors.nix { }; + qtserialbus = callPackage ./modules/qtserialbus.nix { }; + qtserialport = callPackage ./modules/qtserialport.nix { }; + qtshadertools = callPackage ./modules/qtshadertools.nix { }; + qtquick3d = callPackage ./modules/qtquick3d.nix { }; + qtquicktimeline = callPackage ./modules/qtquicktimeline.nix { }; + qtremoteobjects = callPackage ./modules/qtremoteobjects.nix { }; + qtsvg = callPackage ./modules/qtsvg.nix { }; + qtscxml = callPackage ./modules/qtscxml.nix { }; + qttools = callPackage ./modules/qttools.nix { }; + qttranslations = callPackage ./modules/qttranslations.nix { }; + qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { }; + qtwayland = callPackage ./modules/qtwayland.nix { }; + qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; + qtwebengine = callPackage ./modules/qtwebengine.nix { }; + qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; + qtwebview = callPackage ./modules/qtwebview.nix { }; + + wrapQtAppsHook = makeSetupHook { + deps = [ buildPackages.makeWrapper ]; + } ./hooks/wrap-qt-apps-hook.sh; + }; + + self = lib.makeScope newScope addPackages; +in +self diff --git a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh new file mode 100644 index 000000000000..70c9cedb0987 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh new file mode 100644 index 000000000000..0ae969e8f8fc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -0,0 +1,43 @@ +if [[ -n "${__nix_qtbase-}" ]]; then + # Throw an error if a different version of Qt was already set up. + if [[ "$__nix_qtbase" != "@dev@" ]]; then + echo >&2 "Error: detected mismatched Qt dependencies:" + echo >&2 " @dev@" + echo >&2 " $__nix_qtbase" + exit 1 + fi +else # Only set up Qt once. +__nix_qtbase="@dev@" + +qtPluginPrefix=@qtPluginPrefix@ +qtQmlPrefix=@qtQmlPrefix@ + +# Disable debug symbols if qtbase was built without debugging. +# This stops -dev paths from leaking into other outputs. +if [ -z "@debug@" ]; then + NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" +fi + +# Integration with CMake: +# Set the CMake build type corresponding to how qtbase was built. +if [ -n "@debug@" ]; then + cmakeBuildType="Debug" +else + cmakeBuildType="Release" +fi + +qtPreHook() { + # Check that wrapQtAppsHook is used, or it is explicitly disabled. + if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then + echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + exit 1 + fi +} +prePhases+=" qtPreHook" + +addQtModulePrefix () { + addToSearchPath QT_ADDITIONAL_PACKAGES_PREFIX_PATH $1 +} +addEnvHooks "$hostOffset" addQtModulePrefix + +fi diff --git a/nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh new file mode 100644 index 000000000000..b669da3d058c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh @@ -0,0 +1,110 @@ +if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then +__nix_wrapQtAppsHook=1 # Don't run this hook more than once. + +# Inherit arguments given in mkDerivation +qtWrapperArgs=( ${qtWrapperArgs-} ) + +qtHostPathSeen=() + +qtUnseenHostPath() { + for pkg in "${qtHostPathSeen[@]}" + do + if [ "${pkg:?}" == "$1" ] + then + return 1 + fi + done + + qtHostPathSeen+=("$1") + return 0 +} + +qtHostPathHook() { + qtUnseenHostPath "$1" || return 0 + + if ! [ -v qtPluginPrefix ] + then + echo "wrapQtAppsHook qtHostPathHook: qtPluginPrefix is unset. hint: add qt6.qtbase to buildInputs" + fi + + local pluginDir="$1/${qtPluginPrefix:?}" + if [ -d "$pluginDir" ] + then + qtWrapperArgs+=(--prefix QT_PLUGIN_PATH : "$pluginDir") + fi + + local qmlDir="$1/${qtQmlPrefix:?}" + if [ -d "$qmlDir" ] + then + qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir") + fi +} +addEnvHooks "$targetOffset" qtHostPathHook + +makeQtWrapper() { + local original="$1" + local wrapper="$2" + shift 2 + makeWrapper "$original" "$wrapper" "${qtWrapperArgs[@]}" "$@" +} + +wrapQtApp() { + local program="$1" + shift 1 + wrapProgram "$program" "${qtWrapperArgs[@]}" "$@" +} + +qtOwnPathsHook() { + local xdgDataDir="${!outputBin}/share" + if [ -d "$xdgDataDir" ] + then + qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "$xdgDataDir") + fi + + local xdgConfigDir="${!outputBin}/etc/xdg" + if [ -d "$xdgConfigDir" ] + then + qtWrapperArgs+=(--prefix XDG_CONFIG_DIRS : "$xdgConfigDir") + fi + + qtHostPathHook "${!outputBin}" +} + +preFixupPhases+=" qtOwnPathsHook" + +# Note: $qtWrapperArgs still gets defined even if ${dontWrapQtApps-} is set. +wrapQtAppsHook() { + # skip this hook when requested + [ -z "${dontWrapQtApps-}" ] || return 0 + + # guard against running multiple times (e.g. due to propagation) + [ -z "$wrapQtAppsHookHasRun" ] || return 0 + wrapQtAppsHookHasRun=1 + + local targetDirs=( "$prefix/bin" "$prefix/sbin" "$prefix/libexec" "$prefix/Applications" "$prefix/"*.app ) + echo "wrapping Qt applications in ${targetDirs[@]}" + + for targetDir in "${targetDirs[@]}" + do + [ -d "$targetDir" ] || continue + + find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file + do + if [ -f "$file" ] + then + echo "wrapping $file" + wrapQtApp "$file" + elif [ -h "$file" ] + then + target="$(readlink -e "$file")" + echo "wrapping $file -> $target" + rm "$file" + makeQtWrapper "$target" "$file" + fi + done + done +} + +fixupOutputHooks+=(wrapQtAppsHook) + +fi diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qt3d.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt3d.nix new file mode 100644 index 000000000000..2f3a45f67d85 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt3d.nix @@ -0,0 +1,12 @@ +{ qtModule +, qtbase +, qtdeclarative +, qtmultimedia +, assimp +}: + +qtModule { + pname = "qt3d"; + qtInputs = [ qtbase qtdeclarative qtmultimedia ]; + propagatedBuildInputs = [ assimp ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qt5compat.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt5compat.nix new file mode 100644 index 000000000000..cba0651a2c46 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt5compat.nix @@ -0,0 +1,13 @@ +{ qtModule +, qtbase +, qtdeclarative +, libiconv +, icu +, openssl +}: + +qtModule { + pname = "qt5compat"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ libiconv icu openssl openssl ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix new file mode 100644 index 000000000000..bf210633fc4f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -0,0 +1,222 @@ +{ stdenv +, lib +, src +, patches ? [ ] +, version +, coreutils +, bison +, flex +, gdb +, gperf +, lndir +, perl +, pkg-config +, python3 +, which +, cmake +, ninja +, ccache +, xmlstarlet +, libproxy +, xlibsWrapper +, xorg +, zstd +, double-conversion +, util-linux +, systemd +, libb2 +, md4c +, mtdev +, lksctp-tools +, libselinux +, libsepol +, vulkan-headers +, vulkan-loader +, valgrind +, libthai +, libdrm +, libdatrie +, lttng-ust +, libepoxy +, libiconv +, dbus +, fontconfig +, freetype +, glib +, harfbuzz +, icu +, libX11 +, libXcomposite +, libXcursor +, libXext +, libXi +, libXrender +, libinput +, libjpeg +, libpng +, libxcb +, libxkbcommon +, libxml2 +, libxslt +, openssl +, pcre +, pcre2 +, sqlite +, udev +, xcbutil +, xcbutilimage +, xcbutilkeysyms +, xcbutilrenderutil +, xcbutilwm +, zlib +, at-spi2-core +, unixODBC +, unixODBCDrivers + # optional dependencies +, cups +, libmysqlclient +, postgresql +, withGtk3 ? false +, dconf +, gtk3 + # options +, libGLSupported ? true +, libGL +, debug ? false +, developerBuild ? false +}: + +let + debugSymbols = debug || developerBuild; +in +stdenv.mkDerivation rec { + pname = "qtbase"; + + inherit src version; + + debug = debugSymbols; + + propagatedBuildInputs = [ + libxml2 + libxslt + openssl + sqlite + zlib + unixODBC + # Text rendering + harfbuzz + icu + # Image formats + libjpeg + libpng + pcre2 + pcre + libproxy + xlibsWrapper + zstd + double-conversion + util-linux + systemd + libb2 + md4c + mtdev + lksctp-tools + libselinux + libsepol + lttng-ust + vulkan-headers + vulkan-loader + libthai + libdrm + libdatrie + valgrind + dbus + glib + udev + # Text rendering + fontconfig + freetype + # X11 libs + libX11 + libXcomposite + libXext + libXi + libXrender + libxcb + libxkbcommon + xcbutil + xcbutilimage + xcbutilkeysyms + xcbutilrenderutil + xcbutilwm + xorg.libXdmcp + xorg.libXtst + xorg.xcbutilcursor + libepoxy + ] ++ (with unixODBCDrivers; [ + psql + sqlite + mariadb + ]) ++ lib.optional libGLSupported libGL; + + buildInputs = [ + python3 + at-spi2-core + libinput + ] + ++ lib.optional withGtk3 gtk3 + ++ lib.optional developerBuild gdb + ++ lib.optional (cups != null) cups + ++ lib.optional (libmysqlclient != null) libmysqlclient + ++ lib.optional (postgresql != null) postgresql; + + nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ]; + + propagatedNativeBuildInputs = [ lndir ]; + + enableParallelBuilding = true; + + inherit patches; + + # https://bugreports.qt.io/browse/QTBUG-97568 + postPatch = '' + substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls + ''; + + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/build/lib:$PWD/build/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ''; + + qtPluginPrefix = "lib/qt-6/plugins"; + qtQmlPrefix = "lib/qt-6/qml"; + + cmakeFlags = [ + "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}" + "-DINSTALL_QMLDIR=${qtQmlPrefix}" + "-DQT_FEATURE_journald=ON" + "-DQT_FEATURE_sctp=ON" + "-DQT_FEATURE_libproxy=ON" + "-DQT_FEATURE_system_sqlite=ON" + "-DQT_FEATURE_vulkan=ON" + "-DQT_FEATURE_openssl_linked=ON" + ]; + + outputs = [ "out" "dev" ]; + + postInstall = '' + mkdir -p $dev + mv $out/mkspecs $out/bin $out/libexec $dev/ + ''; + + dontStrip = debugSymbols; + + setupHook = ../hooks/qtbase-setup-hook.sh; + + meta = with lib; { + homepage = "https://www.qt.io/"; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ milahu nickcao ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtcharts.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtcharts.nix new file mode 100644 index 000000000000..917697c38623 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtcharts.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qtcharts"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix new file mode 100644 index 000000000000..33fbd7231548 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -0,0 +1,15 @@ +{ qtModule +, lib +, stdenv +, qtbase +, qtdeclarative +, bluez +, pkg-config +}: + +qtModule { + pname = "qtconnectivity"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ bluez ]; + nativeBuildInputs = [ pkg-config ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix new file mode 100644 index 000000000000..1d0f9711e588 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qtdatavis3d"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix new file mode 100644 index 000000000000..3f691894ff86 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -0,0 +1,19 @@ +{ qtModule +, qtbase +, qtshadertools +, openssl +, python3 +}: + +qtModule { + pname = "qtdeclarative"; + qtInputs = [ qtbase qtshadertools ]; + propagatedBuildInputs = [ openssl python3 ]; + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ''; + postInstall = '' + substituteInPlace "$out/lib/cmake/Qt6Qml/Qt6QmlMacros.cmake" \ + --replace ''\'''${QT6_INSTALL_PREFIX}' "$out" + ''; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix new file mode 100644 index 000000000000..cde9af30ab93 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtdeclarative +}: + +qtModule { + pname = "qtdoc"; + qtInputs = [ qtdeclarative ]; + outputs = [ "out" ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtimageformats.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtimageformats.nix new file mode 100644 index 000000000000..b28adbc7295b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtimageformats.nix @@ -0,0 +1,13 @@ +{ qtModule +, qtbase +, libwebp +, jasper +, libmng +, libtiff +}: + +qtModule { + pname = "qtimageformats"; + qtInputs = [ qtbase ]; + buildInputs = [ libwebp jasper libmng libtiff ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix new file mode 100644 index 000000000000..b2e6e450d5f7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix @@ -0,0 +1,8 @@ +{ qtModule +, qtbase +}: + +qtModule { + pname = "qtlanguageserver"; + qtInputs = [ qtbase ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlottie.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlottie.nix new file mode 100644 index 000000000000..d94c289953d0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlottie.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qtlottie"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix new file mode 100644 index 000000000000..5e6dace906dc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -0,0 +1,24 @@ +{ qtModule +, lib +, stdenv +, qtbase +, qtdeclarative +, qtshadertools +, qtsvg +, pkg-config +, alsa-lib +, gstreamer +, gst-plugins-base +, libpulseaudio +, wayland +, elfutils +, libunwind +, orc +}: + +qtModule { + pname = "qtmultimedia"; + qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gstreamer gst-plugins-base libpulseaudio elfutils libunwind alsa-lib wayland orc ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix new file mode 100644 index 000000000000..148ed890fc9e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix @@ -0,0 +1,6 @@ +{ qtModule, qtbase }: + +qtModule { + pname = "qtnetworkauth"; + qtInputs = [ qtbase ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtpositioning.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtpositioning.nix new file mode 100644 index 000000000000..99b06bbf2536 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtpositioning.nix @@ -0,0 +1,14 @@ +{ qtModule +, qtbase +, qtdeclarative +, qtserialport +, pkg-config +, openssl +}: + +qtModule { + pname = "qtpositioning"; + qtInputs = [ qtbase qtdeclarative qtserialport ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3d.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3d.nix new file mode 100644 index 000000000000..d19a8e725a16 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3d.nix @@ -0,0 +1,11 @@ +{ qtModule +, qtbase +, qtdeclarative +, openssl +}: + +qtModule { + pname = "qtquick3d"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ openssl ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix new file mode 100644 index 000000000000..7458515dba26 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qtquicktimeline"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix new file mode 100644 index 000000000000..888ec33b461a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qtremoteobjects"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtscxml.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtscxml.nix new file mode 100644 index 000000000000..c49064c5e579 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtscxml.nix @@ -0,0 +1,6 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + pname = "qtscxml"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsensors.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsensors.nix new file mode 100644 index 000000000000..73ddc394cc46 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsensors.nix @@ -0,0 +1,10 @@ +{ qtModule +, qtbase +, qtdeclarative +, qtsvg +}: + +qtModule { + pname = "qtsensors"; + qtInputs = [ qtbase qtdeclarative qtsvg ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix new file mode 100644 index 000000000000..4fd6d7cb83c3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix @@ -0,0 +1,6 @@ +{ qtModule, qtbase, qtserialport }: + +qtModule { + pname = "qtserialbus"; + qtInputs = [ qtbase qtserialport ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialport.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialport.nix new file mode 100644 index 000000000000..96b7a25bb3b4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialport.nix @@ -0,0 +1,14 @@ +{ qtModule +, stdenv +, lib +, qtbase +, udev +, pkg-config +}: + +qtModule { + pname = "qtserialport"; + qtInputs = [ qtbase ]; + nativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ udev ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix new file mode 100644 index 000000000000..47102896f7e6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix @@ -0,0 +1,8 @@ +{ qtModule +, qtbase +}: + +qtModule { + pname = "qtshadertools"; + qtInputs = [ qtbase ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix new file mode 100644 index 000000000000..9031f8805ac9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix @@ -0,0 +1,15 @@ +{ qtModule +, qtbase +, libwebp +, jasper +, libmng +, zlib +, pkg-config +}: + +qtModule { + pname = "qtsvg"; + qtInputs = [ qtbase ]; + buildInputs = [ libwebp jasper libmng zlib ]; + nativeBuildInputs = [ pkg-config ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix new file mode 100644 index 000000000000..b1cf5dd2c146 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -0,0 +1,11 @@ +{ qtModule +, stdenv +, lib +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qttools"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix new file mode 100644 index 000000000000..4795cd9e1bfe --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix @@ -0,0 +1,8 @@ +{ qtModule +, qttools +}: + +qtModule { + pname = "qttranslations"; + qtInputs = [ qttools ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix new file mode 100644 index 000000000000..bb868dc61829 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix @@ -0,0 +1,15 @@ +{ qtModule +, qtbase +, qtdeclarative +, qtsvg +, hunspell +, pkg-config +}: + +qtModule { + pname = "qtvirtualkeyboard"; + qtInputs = [ qtbase qtdeclarative qtsvg ]; + propagatedBuildInputs = [ hunspell ]; + nativeBuildInputs = [ pkg-config ]; + outputs = [ "out" ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix new file mode 100644 index 000000000000..3ac23d28a798 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -0,0 +1,16 @@ +{ qtModule +, qtbase +, qtquick3d +, qtdeclarative +, wayland +, pkg-config +, xlibsWrapper +, libdrm +}: + +qtModule { + pname = "qtwayland"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ wayland xlibsWrapper libdrm ]; + nativeBuildInputs = [ pkg-config ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix new file mode 100644 index 000000000000..49b959c5dea7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix @@ -0,0 +1,12 @@ +{ qtModule +, qtbase +, qtdeclarative +, qtwebsockets +, openssl +}: + +qtModule { + pname = "qtwebchannel"; + qtInputs = [ qtbase qtdeclarative qtwebsockets ]; + buildInputs = [ openssl ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix new file mode 100644 index 000000000000..20cfab55d032 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -0,0 +1,237 @@ +{ qtModule +, qtdeclarative +, qtwebchannel +, qtpositioning +, qtwebsockets +, buildPackages +, bison +, coreutils +, flex +, git +, gperf +, ninja +, pkg-config +, python3 +, which +, nodejs +, qtbase +, perl +, xorg +, libXcursor +, libXScrnSaver +, libXrandr +, libXtst +, libxshmfence +, libXi +, fontconfig +, freetype +, harfbuzz +, icu +, dbus +, libdrm +, zlib +, minizip +, libjpeg +, libpng +, libtiff +, libwebp +, libopus +, jsoncpp +, protobuf +, libvpx +, srtp +, snappy +, nss +, libevent +, openssl +, alsa-lib +, pulseaudio +, libcap +, pciutils +, systemd +, pipewire +, gn +, cups +, openbsm +, runCommand +, writeScriptBin +, ffmpeg +, lib +, stdenv +, glib +, libxml2 +, libxslt +, lcms2 +, re2 +, libkrb5 +, xkeyboard_config +, enableProprietaryCodecs ? true +}: + +qtModule rec { + pname = "qtwebengine"; + qtInputs = [ qtdeclarative qtwebchannel qtwebsockets qtpositioning ]; + nativeBuildInputs = [ + bison + coreutils + flex + git + gperf + ninja + pkg-config + (python3.withPackages (ps: with ps; [ html5lib ])) + which + gn + nodejs + ]; + doCheck = true; + outputs = [ "out" "dev" ]; + + dontUseGnConfigure = true; + + # ninja builds some components with -Wno-format, + # which cannot be set at the same time as -Wformat-security + hardeningDisable = [ "format" ]; + + postPatch = '' + # Patch Chromium build tools + ( + cd src/3rdparty/chromium; + + # Manually fix unsupported shebangs + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true + substituteInPlace third_party/webgpu-cts/src/tools/deno \ + --replace "/usr/bin/env -S deno" "/usr/bin/deno" || true + patchShebangs . + ) + + substituteInPlace cmake/Functions.cmake \ + --replace "/bin/bash" "${buildPackages.bash}/bin/bash" + + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + + substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \ + --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + + # Patch library paths in sources + substituteInPlace src/core/web_engine_library_info.cpp \ + --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \ + --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \ + --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\"" + ''; + + cmakeFlags = [ + "-DQT_FEATURE_qtpdf_build=ON" + "-DQT_FEATURE_qtpdf_widgets_build=ON" + "-DQT_FEATURE_qtpdf_quick_build=ON" + "-DQT_FEATURE_pdf_v8=ON" + "-DQT_FEATURE_pdf_xfa=ON" + "-DQT_FEATURE_pdf_xfa_bmp=ON" + "-DQT_FEATURE_pdf_xfa_gif=ON" + "-DQT_FEATURE_pdf_xfa_png=ON" + "-DQT_FEATURE_pdf_xfa_tiff=ON" + "-DQT_FEATURE_webengine_system_icu=ON" + "-DQT_FEATURE_webengine_system_libevent=ON" + "-DQT_FEATURE_webengine_system_libxml=ON" + "-DQT_FEATURE_webengine_system_ffmpeg=ON" + # android only. https://bugreports.qt.io/browse/QTBUG-100293 + # "-DQT_FEATURE_webengine_native_spellchecker=ON" + "-DQT_FEATURE_webengine_sanitizer=ON" + "-DQT_FEATURE_webengine_webrtc_pipewire=ON" + "-DQT_FEATURE_webengine_kerberos=ON" + ] ++ lib.optional enableProprietaryCodecs "-DQT_FEATURE_webengine_proprietary_codecs=ON"; + + propagatedBuildInputs = [ + # Image formats + libjpeg + libpng + libtiff + libwebp + + # Video formats + srtp + libvpx + + # Audio formats + libopus + + # Text rendering + harfbuzz + icu + + openssl + glib + libxml2 + libxslt + lcms2 + re2 + + libevent + ffmpeg + + dbus + zlib + minizip + snappy + nss + protobuf + jsoncpp + + # Audio formats + alsa-lib + pulseaudio + + # Text rendering + fontconfig + freetype + + libcap + pciutils + + # X11 libs + xorg.xrandr + libXScrnSaver + libXcursor + libXrandr + xorg.libpciaccess + libXtst + xorg.libXcomposite + xorg.libXdamage + libdrm + xorg.libxkbfile + libxshmfence + libXi + xorg.libXext + + # Pipewire + pipewire + + libkrb5 + ]; + + buildInputs = [ + cups + ]; + + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # This is required at runtime + mkdir $out/libexec + mv $dev/libexec/QtWebEngineProcess $out/libexec + ''; + + meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); + description = "A web engine based on the Chromium web browser"; + platforms = platforms.linux; + # This build takes a long time; particularly on slow architectures + # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz + timeout = 24 * 3600; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix new file mode 100644 index 000000000000..f81cd64596eb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix @@ -0,0 +1,11 @@ +{ qtModule +, qtbase +, qtdeclarative +, openssl +}: + +qtModule { + pname = "qtwebsockets"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ openssl ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebview.nix new file mode 100644 index 000000000000..ba784f73ad45 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -0,0 +1,11 @@ +{ lib +, stdenv +, qtModule +, qtdeclarative +, qtwebengine +}: + +qtModule { + pname = "qtwebview"; + qtInputs = [ qtdeclarative qtwebengine ]; +} diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix new file mode 100644 index 000000000000..04349ed68ad2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, perl, cmake, ninja, writeText }: + +{ self, srcs, patches ? [ ] }: + +args: + +let + inherit (args) pname; + version = args.version or srcs.${pname}.version; + src = args.src or srcs.${pname}.src; +in +stdenv.mkDerivation (args // { + inherit pname version src; + patches = args.patches or patches.${pname} or [ ]; + + buildInputs = args.buildInputs or [ ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ + perl + cmake + ninja + ]; + propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]); + + outputs = args.outputs or [ "out" "dev" ]; + + dontWrapQtApps = args.dontWrapQtApps or true; + postInstall = '' + if [ ! -z "$dev" ]; then + mkdir "$dev" + for dir in bin libexec mkspecs + do + moveToOutput "$dir" "$dev" + done + fi + ${args.postInstall or ""} + ''; + + meta = with lib; { + homepage = "https://www.qt.io/"; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ milahu nickcao ]; + platforms = platforms.linux; + } // (args.meta or { }); +}) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix new file mode 100644 index 000000000000..07bb7fd494f7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -0,0 +1,262 @@ +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 +{ fetchurl, mirror }: + +{ + qt3d = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qt3d-everywhere-src-6.3.1.tar.xz"; + sha256 = "1zpdafqm82hd2bijw20hi1ng81xwihsn9mm7n5ns4gr5zdnvc6cr"; + name = "qt3d-everywhere-src-6.3.1.tar.xz"; + }; + }; + qt5compat = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qt5compat-everywhere-src-6.3.1.tar.xz"; + sha256 = "1zbcaswpl79ixcxzj85qzjq73962s4c7316pibwfrskqswmwcgm4"; + name = "qt5compat-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtactiveqt = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtactiveqt-everywhere-src-6.3.1.tar.xz"; + sha256 = "0axygqjqny6vjwmc5swn80xrcs97bcjwgxsg81f35srxpn9lxdb4"; + name = "qtactiveqt-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtbase = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz"; + sha256 = "00sfya41ihqb0zwg6wf1kiy02iymj6mk584hhk2c4s94khfl4r0a"; + name = "qtbase-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtcharts = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtcharts-everywhere-src-6.3.1.tar.xz"; + sha256 = "1xvwsabyfln3sih9764xknl2s3w4w069k210kgbh94bj50iwqc7k"; + name = "qtcharts-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtconnectivity = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtconnectivity-everywhere-src-6.3.1.tar.xz"; + sha256 = "1c4mnrl7fa8j8fmv5zbqak48nylhxpib7vmsbmmbqqcw19qy8p5j"; + name = "qtconnectivity-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtdatavis3d = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdatavis3d-everywhere-src-6.3.1.tar.xz"; + sha256 = "1wm8iigpml84zfkw3mb2kll0imszc2y19hkcfwq1wbr9w24xda43"; + name = "qtdatavis3d-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtdeclarative = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdeclarative-everywhere-src-6.3.1.tar.xz"; + sha256 = "1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3"; + name = "qtdeclarative-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtdoc = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdoc-everywhere-src-6.3.1.tar.xz"; + sha256 = "1qvhv2b9c6mz7r3sdx0l81a2jr9qri17y1y8k3d6qh488fxqrk32"; + name = "qtdoc-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtimageformats = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtimageformats-everywhere-src-6.3.1.tar.xz"; + sha256 = "0br1vqgx0hcc2nx32xviic94mvj6fbagrnzskdr7zdmvvyw140xd"; + name = "qtimageformats-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtlanguageserver = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtlanguageserver-everywhere-src-6.3.1.tar.xz"; + sha256 = "1g2azb4mdzh5zp7xc57g8l2a8wfi44wfjm6js88q4mmchyj4f4br"; + name = "qtlanguageserver-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtlottie = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtlottie-everywhere-src-6.3.1.tar.xz"; + sha256 = "1x8wmc6gwmxk92zjcsrbhrbqbfvnk7302ggghld5wk8jk5lsf2vl"; + name = "qtlottie-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtmultimedia = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtmultimedia-everywhere-src-6.3.1.tar.xz"; + sha256 = "0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy"; + name = "qtmultimedia-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtnetworkauth = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtnetworkauth-everywhere-src-6.3.1.tar.xz"; + sha256 = "0apvsb2ip1m3kw8vi9spvf6f6q72ys8vr40rpyysi7shsjwm83yn"; + name = "qtnetworkauth-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtpositioning = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtpositioning-everywhere-src-6.3.1.tar.xz"; + sha256 = "0v78wamvdw02kf9rq7m5v24q2g6jmgq4ch0fnfa014p1r978wy06"; + name = "qtpositioning-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtquick3d = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtquick3d-everywhere-src-6.3.1.tar.xz"; + sha256 = "0mhj0r6081bjkq3fsr1vh43zn587v9m20mdpnc979h5q8zp6d9rg"; + name = "qtquick3d-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtquicktimeline = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtquicktimeline-everywhere-src-6.3.1.tar.xz"; + sha256 = "1gpb51d8r707sr0dnvbz65d4zwisfdw40s10kximaxwfrvq3r8aq"; + name = "qtquicktimeline-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtremoteobjects = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtremoteobjects-everywhere-src-6.3.1.tar.xz"; + sha256 = "19jcxxxj3q8vnf9cbgrp3q1pvgwsln8n16nk1gg822f6265h6vga"; + name = "qtremoteobjects-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtscxml = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtscxml-everywhere-src-6.3.1.tar.xz"; + sha256 = "06c6dwwx3z26k9ff6nqagg70lws4l1c6drz1yi4z1lb3c56ibg01"; + name = "qtscxml-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtsensors = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtsensors-everywhere-src-6.3.1.tar.xz"; + sha256 = "1k301lgbiw3fiyryfr18k0dq89ls4xgs4n2pffs456msxmchn92b"; + name = "qtsensors-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtserialbus = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtserialbus-everywhere-src-6.3.1.tar.xz"; + sha256 = "1lkqv3r66fiddxbg0fv9w6l83adz3y8zq6i4pmd0hnxs0ivkz580"; + name = "qtserialbus-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtserialport = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtserialport-everywhere-src-6.3.1.tar.xz"; + sha256 = "0vk17cjj9jpdkgd8qwb1x0lijg0p2jxdzx4d67hd57brcl7didjf"; + name = "qtserialport-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtshadertools = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtshadertools-everywhere-src-6.3.1.tar.xz"; + sha256 = "0nj35s2z5n438q7nqf6bnj3slwz2am3169ck1ixwqa0mjrv73dsr"; + name = "qtshadertools-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtsvg = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtsvg-everywhere-src-6.3.1.tar.xz"; + sha256 = "1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv"; + name = "qtsvg-everywhere-src-6.3.1.tar.xz"; + }; + }; + qttools = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qttools-everywhere-src-6.3.1.tar.xz"; + sha256 = "1h96w4bzkbd80vr7lh6hnypdlmbzc1y52c2zrqzvkgm3587pa4n4"; + name = "qttools-everywhere-src-6.3.1.tar.xz"; + }; + }; + qttranslations = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qttranslations-everywhere-src-6.3.1.tar.xz"; + sha256 = "15yvvxw1vngnjlly6cady05ljamg01qiaqn2vh0xkph855gdbgfp"; + name = "qttranslations-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtvirtualkeyboard-everywhere-src-6.3.1.tar.xz"; + sha256 = "1f62q0gkz21nraaspy1nrg2ygjih5qgq37qns06snnfq0jr8kq2z"; + name = "qtvirtualkeyboard-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtwayland = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwayland-everywhere-src-6.3.1.tar.xz"; + sha256 = "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"; + name = "qtwayland-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtwebchannel = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebchannel-everywhere-src-6.3.1.tar.xz"; + sha256 = "0s16zx3qn3byldvhmsnwijm8rmizk8vpqj7fnwhjg6c67z10m8ma"; + name = "qtwebchannel-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtwebengine = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebengine-everywhere-src-6.3.1.tar.xz"; + sha256 = "0ivfsqd5c0cxsnssj6z37901cf6a47w50zaqgjiysvcm3ar36ymd"; + name = "qtwebengine-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtwebsockets = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebsockets-everywhere-src-6.3.1.tar.xz"; + sha256 = "06hj0pkdzjicmbiinjp1dk1ziz8cb3fgcwy7a0dxxjvzr680v64z"; + name = "qtwebsockets-everywhere-src-6.3.1.tar.xz"; + }; + }; + qtwebview = { + version = "6.3.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebview-everywhere-src-6.3.1.tar.xz"; + sha256 = "0f4hx3rqwg5wqnw37nrhcvi2fxshgfx72xmdc416j4gxhra1i6xl"; + name = "qtwebview-everywhere-src-6.3.1.tar.xz"; + }; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix new file mode 100644 index 000000000000..b82d5b160c31 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchFromGitHub +, cpp-utilities +, qtutilities +, qttools +, qtbase +, cmake +, perl +}: + +let + fork_awesome_release = fetchFromGitHub { + owner = "ForkAwesome"; + repo = "Fork-Awesome"; + rev = "1.2.0"; + sha256 = "sha256-zG6/0dWjU7/y/oDZuSEv+54Mchng64LVyV8bluskYzc="; + }; +in stdenv.mkDerivation rec { + pname = "qtforkawesome"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-J3F+ikz6gQqV+JsOX8EpMOWoTmI6UK5KndFALUo4oiU="; + }; + + buildInputs = [ + qtbase + cpp-utilities + qtutilities + ]; + nativeBuildInputs = [ + cmake + qttools + perl + perl.pkgs.YAML + ]; + cmakeFlags = [ + # Current freetype used by NixOS users doesn't support the `.woff2` font + # format, so we use ttf. See + # https://github.com/NixOS/nixpkgs/pull/174875#discussion_r883423881 + "-DFORK_AWESOME_FONT_FILE=${fork_awesome_release}/fonts/forkawesome-webfont.ttf" + "-DFORK_AWESOME_ICON_DEFINITIONS=${fork_awesome_release}/src/icons/icons.yml" + ]; + + dontWrapQtApps = true; + + meta = with lib; { + homepage = "https://github.com/Martchus/qtforkawesome"; + description = "Library that bundles ForkAwesome for use within Qt applications"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/development/libraries/qtmpris/default.nix b/nixpkgs/pkgs/development/libraries/qtmpris/default.nix new file mode 100644 index 000000000000..ef595efa731d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qtmpris/default.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +}: + +mkDerivation rec { + pname = "qtmpris"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "sailfishos"; + repo = "qtmpris"; + rev = version; + hash = "sha256-kuM8hUdsa7N+eLDbwYw3ay+PWxg35zcTBOvGow1NlzI="; + }; + + postPatch = '' + substituteInPlace src/src.pro \ + --replace '$$[QT_INSTALL_LIBS]' "$out/lib" \ + --replace '$$[QT_INSTALL_HEADERS]' "$out/include" \ + --replace '$$[QMAKE_MKSPECS]' "$out/mkspecs" + ''; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + ]; + + meta = { + description = "Qt and QML MPRIS interface and adaptor"; + homepage = "https://github.com/sailfishos/qtmpris"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix deleted file mode 100644 index ad1f73cc9e88..000000000000 --- a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, qt4 }: - -stdenv.mkDerivation rec { - pname = "qtscriptgenerator"; - version = "0.1.0"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/qtscriptgenerator/qtscriptgenerator-src-${version}.tar.gz"; - sha256 = "0h8zjh38n2wfz7jld0jz6a09y66dbsd2jhm4f2024qfgcmxcabj6"; - }; - buildInputs = [ qt4 ]; - - patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ]; - - postPatch = '' - # remove phonon stuff which causes errors (thanks to Gentoo bug reports) - sed -i "/typesystem_phonon.xml/d" generator/generator.qrc - sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro - ''; - - configurePhase = '' - ( cd generator; qmake ) - ( cd qtbindings; qmake ) - ''; - - buildPhase = '' - makeFlags="SHELL=$SHELL ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" - make $makeFlags -C generator - - # Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38 - ( cd generator; QTDIR=${qt4} ./generator ) - make $makeFlags -C qtbindings - ''; - - installPhase = '' - mkdir -p $out/lib/qt4/plugins/script - cp -av plugins/script/* $out/lib/qt4/plugins/script - ''; - - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; - - meta = { - description = "QtScript bindings generator"; - homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/"; - inherit (qt4.meta) platforms; - license = lib.licenses.lgpl21; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch deleted file mode 100644 index 8fe643e2c98f..000000000000 --- a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch +++ /dev/null @@ -1,23 +0,0 @@ -Origin: http://src.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD -diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml ---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 -+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 -@@ -2233,7 +2233,6 @@ - - - </object-type> -- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> - <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> - <modify-function signature="reason()const"> - <remove/> -diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml ---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 -+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 -@@ -2555,7 +2555,6 @@ - - - </object-type> -- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> - <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> - <modify-function signature="reason()const"> - <remove/> diff --git a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch b/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch deleted file mode 100644 index c0a710efb157..000000000000 --- a/nixpkgs/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h ---- qtscriptgenerator-src-0.1.0/generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100 -+++ qtscriptgenerator-src-0.1.0/generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100 -@@ -30,6 +30,7 @@ - #include <cctype> - - #include <fcntl.h> -+#include <cstdio> - - #ifdef HAVE_MMAP - # include <sys/mman.h> diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 5a747fd91063..b80e93622d94 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem , libX11, libXext, qttools, wrapQtAppsHook +, gitUpdater }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.1"; + version = "1.0.4"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0k3j74klvd386ijsd4j09ccxlhga54z4pgnh36s9cv3rs7ab39qm"; + sha256 = "chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk="; }; nativeBuildInputs = [ @@ -23,18 +24,33 @@ stdenv.mkDerivation rec { sourceRoot = "source/Kvantum"; + patches = [ + (fetchpatch { + # add xdg dirs support + url = "https://github.com/tsujan/Kvantum/commit/01989083f9ee75a013c2654e760efd0a1dea4a68.patch"; + hash = "sha256-HPx+p4Iek/Me78olty1fA0dUNceK7bwOlTYIcQu8ycc="; + stripLen = 1; + }) + ]; + postPatch = '' # Fix plugin dir substituteInPlace style/style.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; + passthru.updateScript = gitUpdater { + inherit pname version; + attrPath = "libsForQt5.${pname}"; + rev-prefix = "V"; + }; + meta = with lib; { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl3Plus; platforms = platforms.linux; broken = lib.versionOlder qtbase.version "5.14"; - maintainers = [ maintainers.bugworm ]; + maintainers = [ maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 6027e5b03854..cce0afc55e1b 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.5.3"; + version = "6.7.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P1vAmH1cF5qQxpa4AOIOyK8ogLZgyXt8jaxaHwE9qck="; + sha256 = "sha256-RjVmrdUHDBelwagWD5Mx+S3tdFO7I0+8RmFR7hwoe8o="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/nixpkgs/pkgs/development/libraries/quazip/default.nix b/nixpkgs/pkgs/development/libraries/quazip/default.nix index e670d6bd916d..610f408e4419 100644 --- a/nixpkgs/pkgs/development/libraries/quazip/default.nix +++ b/nixpkgs/pkgs/development/libraries/quazip/default.nix @@ -1,17 +1,18 @@ -{ fetchFromGitHub, lib, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: +{ fetchFromGitHub, lib, stdenv, zlib, qtbase, qt5compat ? null, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fsEMmbatTB1s8JnUYE18/vj2FZ2b40zHoOlL2OVplLc="; + sha256 = "sha256-CtjjHJgUEmGg066D/wey3wyq8boX1sJiP7fUNmpbT1o="; }; buildInputs = [ zlib qtbase ]; + propagatedBuildInputs = [ qt5compat ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/nixpkgs/pkgs/development/libraries/quickder/default.nix b/nixpkgs/pkgs/development/libraries/quickder/default.nix index 80eb64a577c1..68da796aa0a5 100644 --- a/nixpkgs/pkgs/development/libraries/quickder/default.nix +++ b/nixpkgs/pkgs/development/libraries/quickder/default.nix @@ -1,50 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, hexio -, cmake, bash, arpa2cm, git, asn2quickder }: +{ lib +, stdenv +, fetchFromGitLab +, python3 +, cmake +, doxygen +, graphviz +, quickmem +, arpa2common +, arpa2cm +, ensureNewerSourcesForZipFilesHook +}: stdenv.mkDerivation rec { pname = "quickder"; - version = "1.3.0"; + version = "1.7.1"; - src = fetchFromGitHub { - sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr"; - rev = "version-${version}"; - owner = "vanrein"; + src = fetchFromGitLab { + owner = "arpa2"; repo = "quick-der"; + rev = "v${version}"; + sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + doxygen + graphviz + ensureNewerSourcesForZipFilesHook + ]; - buildInputs = with python3Packages; [ + buildInputs = [ arpa2cm - asn1ate - hexio - pyparsing - python - six - asn1ate - asn2quickder + arpa2common + (python3.withPackages (ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ])) + quickmem ]; + postPatch = '' - substituteInPlace ./CMakeLists.txt \ - --replace "get_version_from_git" "set (Quick-DER_VERSION 1.2) #" - substituteInPlace ./CMakeLists.txt \ - --replace \$\{ARPA2CM_TOOLCHAIN_DIR} "$out/share/ARPA2CM/toolchain/" - patchShebangs python/scripts/ + substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' ''; - cmakeFlags = [ - "-DNO_TESTING=ON" - "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/" - ]; - - preConfigure = '' - export PREFIX=$out - ''; + doCheck = true; meta = with lib; { description = "Quick (and Easy) DER, a Library for parsing ASN.1"; - homepage = "https://github.com/vanrein/quick-der"; + homepage = "https://gitlab.com/arpa2/quick-der/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/nixpkgs/pkgs/development/libraries/quickmem/default.nix b/nixpkgs/pkgs/development/libraries/quickmem/default.nix new file mode 100644 index 000000000000..60ea330dc014 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/quickmem/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, doxygen +, graphviz +, arpa2common +, arpa2cm +}: + +stdenv.mkDerivation rec { + pname = "quickmem"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "Quick-MEM"; + rev = "v${version}"; + sha256 = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + ]; + + buildInputs = [ + arpa2cm + arpa2common + ]; + + doCheck = true; + + meta = with lib; { + description = "Memory pooling for ARPA2 projects"; + homepage = "https://gitlab.com/arpa2/Quick-MEM/"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leungbk ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/quictls/default.nix b/nixpkgs/pkgs/development/libraries/quictls/default.nix index 3d5741ccba55..22981bfef7af 100644 --- a/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -7,22 +7,18 @@ # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform +, removeReferencesTo }: -assert ( - lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) - "withPerl should not be disabled unless cross compiling" -); - stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.1+quick_unstable-2021-12.14"; + version = "3.0.5+quick_unstable-2022-07.05"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "ab8b87bdb436b11bf2a10a2a57a897722224f828"; - sha256 = "sha256-835oZgoM1CTS+JLxPO3oGSTnhLmJXGT1cFaJhCJK++8="; + rev = "75e940831d0570d6b020cfebf128ae500f424867"; + sha256 = "sha256-1HBGKafcCbM0RZWLvyl3vpSfGBsAcGDgjz1Nm/qclWM="; }; patches = [ @@ -56,7 +52,7 @@ stdenv.mkDerivation rec { !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. @@ -73,6 +69,12 @@ stdenv.mkDerivation rec { x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; + mips64el-linux = + if stdenv.hostPlatform.isMips64n64 + then "./Configure linux64-mips64" + else if stdenv.hostPlatform.isMips64n32 + then "./Configure linux-mips64" + else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" @@ -110,7 +112,11 @@ stdenv.mkDerivation rec { # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. - ++ lib.optional static "no-shared"; + ++ lib.optional static "no-shared" + # This introduces a reference to the CTLOG_FILE which is undesired when + # trying to build binaries statically. + ++ lib.optional static "no-ct" + ; makeFlags = [ "MANDIR=$(man)/share/man" @@ -123,13 +129,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString (!static) '' + postInstall = (if static then '' + # OPENSSLDIR has a reference to self + ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a + '' else '' # If we're building dynamic libraries, then don't install static # libraries. if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then rm "$out/lib/"*.a fi - '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + '') + lib.optionalString (!stdenv.hostPlatform.isWindows) # Fix bin/c_rehash's perl interpreter line # # - openssl 1_0_2: embeds a reference to buildPackages.perl @@ -161,7 +170,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://quictls.github.io/openssl/"; + homepage = "https://quictls.github.io"; description = "TLS/SSL and crypto library with QUIC APIs"; license = licenses.openssl; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/qwt/default.nix b/nixpkgs/pkgs/development/libraries/qwt/default.nix index 46cfc426efa4..e74f8300bf72 100644 --- a/nixpkgs/pkgs/development/libraries/qwt/default.nix +++ b/nixpkgs/pkgs/development/libraries/qwt/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "qwt"; version = "6.2.0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; diff --git a/nixpkgs/pkgs/development/libraries/qxt/default.nix b/nixpkgs/pkgs/development/libraries/qxt/default.nix deleted file mode 100644 index 9d035ce9d89a..000000000000 --- a/nixpkgs/pkgs/development/libraries/qxt/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, which, coreutils, fetchzip, qt4 }: - -stdenv.mkDerivation rec { - pname = "qxt"; - version = "0.6.2"; - - src = fetchzip { - url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz"; - sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz"; - }; - - buildInputs = [ qt4 which ]; - - patchPhase = '' - patchShebangs configure - substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd" - ''; - - prefixKey = "-prefix "; - - meta = { - homepage = "http://libqxt.org"; - description = "An extension library for Qt"; - longDescription = '' - An extension library for Qt providing a suite of cross-platform utility - classes to add functionality not readily available in the Qt toolkit by Qt - Development Frameworks, Nokia. - ''; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ forkk ]; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix index 7cd3a086cdb8..92aee32c38d1 100644 --- a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; homepage = "https://www.rabbitmq.com/java-client.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = with licenses; [ mpl11 gpl2 ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index 4614c1498146..72da2a34e752 100644 --- a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Ignore broken test, likely not causing huge breakage + # (https://github.com/canonical/raft/issues/292) + postPatch = '' + substituteInPlace test/integration/test_uv_tcp_connect.c --replace \ + "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, 0, NULL)" \ + "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, MUNIT_TEST_OPTION_TODO, NULL)" + ''; + preConfigure = '' substituteInPlace configure --replace /usr/bin/ " " ''; diff --git a/nixpkgs/pkgs/development/libraries/randomx/default.nix b/nixpkgs/pkgs/development/libraries/randomx/default.nix index 68e81866e1e6..b5da1ad6e198 100644 --- a/nixpkgs/pkgs/development/libraries/randomx/default.nix +++ b/nixpkgs/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.9"; + version = "1.1.10"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "188fh4l8wda1y9vxa9asbk8nw35gyapw7gyn4w2p2qspdjhi5mnq"; + sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix index 4df98c3026e5..a8a87dfd1172 100644 --- a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C++ framework for property based testing inspired by QuickCheck"; inherit (src.meta) homepage; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ ]; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix new file mode 100644 index 000000000000..3e3ab72d2720 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, catch2_3 +}: + +stdenv.mkDerivation rec { + pname = "rapidfuzz-cpp"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "rapidfuzz-cpp"; + rev = "v${version}"; + hash = "sha256-ogj8eFkiDtjFcBb3Yip909gKBIeALsoH3LnRIjQmLMA="; + }; + + patches = [ + ./dont-fetch-project-options.patch + ]; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = lib.optionals doCheck [ + "-DRAPIDFUZZ_BUILD_TESTING=ON" + ]; + + checkInputs = [ + catch2_3 + ]; + + doCheck = true; + + meta = { + description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; + homepage = "https://github.com/maxbachmann/rapidfuzz-cpp"; + changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch new file mode 100644 index 000000000000..ab88c530d400 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch @@ -0,0 +1,58 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 5ba4464..ad72319 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -12,39 +12,10 @@ else() + FetchContent_MakeAvailable(Catch2) + endif() + +-# include aminya & jason turner's C++ best practices recommended cmake project utilities +-include(FetchContent) +-FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip) +-FetchContent_MakeAvailable(_project_options) +-include(${_project_options_SOURCE_DIR}/Index.cmake) +- +-project_options( +- # ENABLE_CACHE +- # ENABLE_CONAN +- WARNINGS_AS_ERRORS +- # ENABLE_CPPCHECK +- # ENABLE_CLANG_TIDY +- # ENABLE_INCLUDE_WHAT_YOU_USE +- # ENABLE_COVERAGE +- # ENABLE_PCH +- # PCH_HEADERS <Eigen/Dense> <fmt/core.h> <vector> <utility> <string> <string_view> +- # ENABLE_DOXYGEN +- # ENABLE_IPO +- # ENABLE_USER_LINKER +- # ENABLE_BUILD_WITH_TIME_TRACE +- # ENABLE_UNITY +- # ENABLE_SANITIZER_ADDRESS +- # ENABLE_SANITIZER_LEAK +- # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR +- # ENABLE_SANITIZER_THREAD +- # ENABLE_SANITIZER_MEMORY +- # CLANG_WARNINGS "-Weverything" +-) +- + function(rapidfuzz_add_test test) + add_executable(test_${test} tests-${test}.cpp) + target_link_libraries(test_${test} ${PROJECT_NAME}) +- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) ++ target_link_libraries(test_${test} Catch2::Catch2WithMain) + add_test(NAME ${test} COMMAND test_${test}) + endfunction() + +diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt +index 2a70054..7a43c88 100644 +--- a/test/distance/CMakeLists.txt ++++ b/test/distance/CMakeLists.txt +@@ -1,7 +1,7 @@ + function(rapidfuzz_add_test test) + add_executable(test_${test} tests-${test}.cpp) + target_link_libraries(test_${test} ${PROJECT_NAME}) +- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) ++ target_link_libraries(test_${test} Catch2::Catch2WithMain) + add_test(NAME ${test} COMMAND test_${test}) + endfunction() + diff --git a/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix index 1211892890ad..ac2d7e0b5f55 100644 --- a/nixpkgs/pkgs/development/libraries/rapidjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, cmake +, gtest +}: stdenv.mkDerivation rec { pname = "rapidjson"; @@ -16,20 +23,44 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch"; sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82"; }) + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch"; + hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; + }) ]; + postPatch = '' + find -name CMakeLists.txt | xargs \ + sed -i -e "s/-Werror//g" -e "s/-march=native//g" + ''; + nativeBuildInputs = [ pkg-config cmake ]; - preConfigure = '' - substituteInPlace CMakeLists.txt --replace "-Werror" "" - substituteInPlace example/CMakeLists.txt --replace "-Werror" "" + cmakeFlags = [ + "-DGTEST_SOURCE_DIR=${gtest.dev}/include" + ] ++ lib.optionals (!doCheck) [ + "-DRAPIDJSON_BUILD_TESTS=OFF" + ]; + + checkInputs = [ + gtest + ]; + + checkPhase = '' + runHook preCheck + + ctest -E '.*valgrind.*' + + runHook postCheck ''; + doCheck = !stdenv.hostPlatform.isStatic; + meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; homepage = "http://rapidjson.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 829b298107f9..2a00d9676100 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which }: stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.8.2"; + version = "1.9.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-YagvXeusHThUo5/1mMs+r+Nr03vAagdnFMkwX3hJsq4="; + sha256 = "sha256-G6rTvb2Z2O1Df5/6upEB9Eh049sx+LWhhDKvsZdDqsc="; }; - nativeBuildInputs = [ pkg-config python3 ]; + nativeBuildInputs = [ pkg-config python3 which ]; buildInputs = [ zlib zstd openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index 2cdad981fbd9..2e163a79d596 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -1,14 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script }: +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script + +# for passthru.tests +, bazel +, chromium +, grpc +, haskellPackages +, mercurial +, ninja +, python3 +}: stdenv.mkDerivation rec { pname = "re2"; - version = "2022-02-01"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - sha256 = "sha256-3RspCfJD2jV7GYuzeBUcxkZsdHyL14kaz8lSoIrH7b8="; + sha256 = "sha256-UontAjOXpnPcOgoFHjf+1WSbCR7h58/U7nn4meT200Y="; }; preConfigure = '' @@ -20,25 +33,30 @@ stdenv.mkDerivation rec { buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; enableParallelBuilding = true; - # Broken when shared/static are tested in parallel: - # cp: cannot create regular file 'obj/testinstall.cc': File exists - # make: *** [Makefile:334: static-testinstall] Error 1 - # Will be fixed by https://code-review.googlesource.com/c/re2/+/59830 - enableParallelChecking = false; preCheck = "patchShebangs runtests"; doCheck = true; - checkTarget = "test"; + checkTarget = if stdenv.hostPlatform.isStatic then "static-test" else "test"; installTargets = lib.optionals stdenv.hostPlatform.isStatic [ "static-install" ]; doInstallCheck = true; - installCheckTarget = "testinstall"; + installCheckTarget = if stdenv.hostPlatform.isStatic then "static-testinstall" else "testinstall"; passthru = { updateScript = nix-update-script { attrPath = pname; }; + tests = { + inherit + chromium + grpc + mercurial; + inherit (python3.pkgs) + fb-re2 + google-re2; + haskellPackages-re2 = haskellPackages.re2; + }; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix b/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix index d39d1a713219..7825983a455b 100644 --- a/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix +++ b/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU }: +{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU, catch }: stdenv.mkDerivation rec { pname = "recastai"; @@ -13,11 +13,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-QP3lMMFR6fiKQTksAkRL6X9yaoVz2xt4QSIP9g6piww="; }; + postPatch = '' + cp ${catch}/include/catch/catch.hpp Tests/catch.hpp + ''; + + doCheck = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ libGL SDL2 libGLU ]; meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://github.com/recastnavigation/recastnavigation"; description = "Navigation-mesh Toolset for Games"; license = licenses.zlib; diff --git a/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix b/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix new file mode 100644 index 000000000000..7d3d7d486714 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, cmake, hiredis +, enableShared ? !stdenv.hostPlatform.isStatic +, enableStatic ? stdenv.hostPlatform.isStatic +}: + +# You must build at one type of library +assert enableShared || enableStatic; + +stdenv.mkDerivation rec { + pname = "redis-plus-plus"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "sewenew"; + repo = "redis-plus-plus"; + rev = version; + sha256 = "sha256-5tjadh3Ku7lrJn4tbi8TjTH6N0+QB2ER9xuO51cK/LU="; + }; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ hiredis ]; + + cmakeFlags = [ + "-DREDIS_PLUS_PLUS_BUILD_TEST=OFF" + ] ++ lib.optional (!enableShared) [ + "-DREDIS_PLUS_PLUS_BUILD_SHARED=OFF" + ] ++ lib.optional (!enableStatic) [ + "-DREDIS_PLUS_PLUS_BUILD_STATIC=OFF" + ]; + + meta = with lib; { + homepage = "https://github.com/sewenew/redis-plus-plus"; + description = "Redis client written in C++"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wheelsandmetal ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/restinio/default.nix b/nixpkgs/pkgs/development/libraries/restinio/default.nix index 1954bb45f3df..632ec0696eec 100644 --- a/nixpkgs/pkgs/development/libraries/restinio/default.nix +++ b/nixpkgs/pkgs/development/libraries/restinio/default.nix @@ -2,16 +2,18 @@ let pname = "restinio"; - version = "0.6.14"; + version = "0.6.16"; in fetchzip { name = "${pname}-${version}"; - url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}-full.tar.bz2"; - sha256 = "sha256-v/t3Lo1D6rHMx3GywPpEhOnHrT7JVC8n++YxpMTRfDM="; + url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-tl9HUsT9mCupuwp6T4dbPdYOQy3vYyctuwFQPfR8m0Y="; + stripRoot = false; postFetch = '' - mkdir -p $out/include/restinio - tar -xjf $downloadedFile --strip-components=3 -C $out/include/restinio --wildcards "*/dev/restinio" + mkdir -p $out/include + mv $out/restinio-*/dev/restinio $out/include + rm -r $out/restinio-* ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/rlottie/default.nix b/nixpkgs/pkgs/development/libraries/rlottie/default.nix index f1d3ffd02124..6f641bd6a600 100644 --- a/nixpkgs/pkgs/development/libraries/rlottie/default.nix +++ b/nixpkgs/pkgs/development/libraries/rlottie/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +}: stdenv.mkDerivation rec { pname = "rlottie"; @@ -11,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"; }; + patches = [ + # Fixed build with GCC 11 + (fetchpatch { + url = "https://github.com/Samsung/rlottie/commit/2d7b1fa2b005bba3d4b45e8ebfa632060e8a157a.patch"; + hash = "sha256-2JPsj0WiBMMu0N3NUYDrHumvPN2YS8nPq5Zwagx6UWE="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/rnnoise/default.nix b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix index ad587f0f5839..af4fcf30153c 100644 --- a/nixpkgs/pkgs/development/libraries/rnnoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation (rec { ''; meta = with lib; { - homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; description = "Recurrent neural network for audio noise reduction"; + homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; + mainProgram = "rnnoise_demo"; platforms = platforms.all; }; }) diff --git a/nixpkgs/pkgs/development/libraries/robin-map/default.nix b/nixpkgs/pkgs/development/libraries/robin-map/default.nix index 4ab48c484426..229714723cdf 100644 --- a/nixpkgs/pkgs/development/libraries/robin-map/default.nix +++ b/nixpkgs/pkgs/development/libraries/robin-map/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h59khOUg7vzw64EAMT/uzTKHzx2M9q+pc2BhfGQiY3Q="; + sha256 = "sha256-4OW7PHow+O7R4t5+6iPV3E+1+6XPhqxrL1LQZitmCzQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/nixpkgs/pkgs/development/libraries/rocclr/default.nix index b55c2ef81527..57c4970d5fd7 100644 --- a/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -1,20 +1,31 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , writeScript , rocm-comgr }: stdenv.mkDerivation rec { pname = "rocclr"; - version = "5.0.2"; + version = "5.2.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-x6XwYxgiCoy6Q7gIevSTEWgUQ0aEjPFhKSqMqQahHig="; + hash = "sha256-bNIc1JF8f88xC18BheKZCZYjWb4gUZOMWlt/5198iGE="; }; + patches = [ + # Enable support for gfx8 again + # See the upstream issue: https://github.com/RadeonOpenCompute/ROCm/issues/1659 + # And the arch patch: https://github.com/rocm-arch/rocm-arch/pull/742 + (fetchpatch { + url = "https://raw.githubusercontent.com/John-Gee/rocm-arch/d6812d308fee3caf2b6bb01b4d19fe03a6a0e3bd/rocm-opencl-runtime/enable-gfx800.patch"; + hash = "sha256-59jFDIIsTTZcNns9RyMVWPRUggn/bSlAGrky4quu8B4="; + }) + ]; + prePatch = '' substituteInPlace device/comgrctx.cpp \ --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 3f50c0665fa8..efb4c22326d5 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.29.3"; + version = "7.4.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O0nIPRKj0ZOEjynh7h9kM6V965hQKs+4GgIbN+Os0I4="; + sha256 = "sha256-m1ZHyHYFDGTYpP4uAg4T75sLKoLwhEDJstWg7EXHNc8="; }; nativeBuildInputs = [ cmake ninja ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableJemalloc jemalloc; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move" - + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field"; + + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field -faligned-allocation"; cmakeFlags = [ "-DPORTABLE=1" diff --git a/nixpkgs/pkgs/development/libraries/rocm-comgr/cmake.patch b/nixpkgs/pkgs/development/libraries/rocm-comgr/cmake.patch new file mode 100644 index 000000000000..0c599e2403c5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rocm-comgr/cmake.patch @@ -0,0 +1,224 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eac270a..27610ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,10 +53,6 @@ set(SOURCES + + if(COMGR_BUILD_SHARED_LIBS) + add_library(amd_comgr SHARED ${SOURCES}) +- # Windows doesn't have a strip utility, so CMAKE_STRIP won't be set. +- if((CMAKE_BUILD_TYPE STREQUAL "Release") AND NOT ("${CMAKE_STRIP}" STREQUAL "")) +- add_custom_command(TARGET amd_comgr POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE:amd_comgr>) +- endif() + else() + add_library(amd_comgr STATIC ${SOURCES}) + endif() +@@ -141,8 +137,8 @@ if (UNIX) + list(APPEND AMD_COMGR_PUBLIC_LINKER_OPTIONS -pthread) + if (NOT APPLE AND COMGR_BUILD_SHARED_LIBS) + configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/src/exportmap.in +- ${CMAKE_CURRENT_BINARY_DIR}/src/exportmap @ONLY) ++ src/exportmap.in ++ src/exportmap @ONLY) + list(APPEND AMD_COMGR_PRIVATE_LINKER_OPTIONS + "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/src/exportmap") + # When building a shared library with -fsanitize=address we can't be +@@ -154,6 +150,9 @@ if (UNIX) + -Wl,--no-undefined) + endif() + endif() ++ ++ # Strip in release build ++ set_target_properties(amd_comgr PROPERTIES LINK_FLAGS_RELEASE -s) + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS + "/wd4244" #[[Suppress 'argument' : conversion from 'type1' to 'type2', possible loss of data]] +@@ -169,10 +168,6 @@ endif() + # the shared header. + list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS AMD_COMGR_EXPORT) + +-configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/include/amd_comgr.h.in +- ${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h @ONLY) +- + include(bc2h) + include(opencl_pch) + include(DeviceLibs) +@@ -203,8 +198,11 @@ target_compile_definitions(amd_comgr + PRIVATE "${AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS}") + target_include_directories(amd_comgr + PUBLIC +- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> +- $<INSTALL_INTERFACE:include>) ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>) ++ ++configure_file( ++ include/amd_comgr.h.in ++ include/amd_comgr.h @ONLY) + + set(AMD_COMGR_CONFIG_NAME amd_comgr-config.cmake) + set(AMD_COMGR_TARGETS_NAME amd_comgr-targets.cmake) +@@ -220,29 +218,30 @@ if (NOT COMGR_BUILD_SHARED_LIBS) + endif() + + set(AMD_COMGR_TARGETS_PATH +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") +-set(AMD_COMGR_VERSION_PATH +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") +-export(TARGETS amd_comgr +- FILE "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") ++ "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") + configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" +- "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" ++ ${AMD_COMGR_CONFIG_NAME} + @ONLY) +-write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" + VERSION "${amd_comgr_VERSION}" + COMPATIBILITY SameMajorVersion) + + install(TARGETS amd_comgr + EXPORT amd_comgr_export +- COMPONENT amd-comgr +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ COMPONENT amd-comgr) ++install(EXPORT amd_comgr_export ++ DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" ++ FILE "${AMD_COMGR_TARGETS_NAME}") + + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h" + COMPONENT amd-comgr + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}" ++ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" ++ COMPONENT amd-comgr ++ DESTINATION ${AMD_COMGR_PACKAGE_PREFIX}) + + install(FILES + "README.md" +@@ -251,37 +250,6 @@ install(FILES + COMPONENT amd-comgr + DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr) + +-# Generate the install-tree package. +-set(AMD_COMGR_PREFIX_CODE " +-# Derive absolute install prefix from config file path. +-get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +-string(REGEX REPLACE "/" ";" count "${AMD_COMGR_PACKAGE_PREFIX}") +-foreach(p ${count}) +- set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} +-get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") +-endforeach() +- +-if (NOT COMGR_BUILD_SHARED_LIBS) +- string(APPEND AMD_COMGR_PREFIX_CODE "\ninclude(CMakeFindDependencyMacro)\n") +- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(Clang REQUIRED)\n") +- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") +-endif() +- +-set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") +-configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" +- @ONLY) +-install(FILES +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" +- RENAME "${AMD_COMGR_CONFIG_NAME}") +-install(EXPORT amd_comgr_export +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" +- FILE "${AMD_COMGR_TARGETS_NAME}") +-install(FILES +- "${AMD_COMGR_VERSION_PATH}" +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") +- + set(CLANG_LIBS + clangFrontendTool) + +diff --git a/cmake/bc2h.cmake b/cmake/bc2h.cmake +index 146fe2b..9134985 100644 +--- a/cmake/bc2h.cmake ++++ b/cmake/bc2h.cmake +@@ -1,40 +1,41 @@ +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c +-"#include <stdio.h>\n" +-"int main(int argc, char **argv){\n" +-" FILE *ifp, *ofp;\n" +-" int c, i, l;\n" +-" if (argc != 4) return 1;\n" +-" ifp = fopen(argv[1], \"rb\");\n" +-" if (!ifp) return 1;\n" +-" i = fseek(ifp, 0, SEEK_END);\n" +-" if (i < 0) return 1;\n" +-" l = ftell(ifp);\n" +-" if (l < 0) return 1;\n" +-" i = fseek(ifp, 0, SEEK_SET);\n" +-" if (i < 0) return 1;\n" +-" ofp = fopen(argv[2], \"wb+\");\n" +-" if (!ofp) return 1;\n" +-" fprintf(ofp, \"#define %s_size %d\\n\\n\"\n" +-" \"#if defined __GNUC__\\n\"\n" +-" \"__attribute__((aligned (4096)))\\n\"\n" +-" \"#elif defined _MSC_VER\\n\"\n" +-" \"__declspec(align(4096))\\n\"\n" +-" \"#endif\\n\"\n" +-" \"static const unsigned char %s[%s_size+1] = {\",\n" +-" argv[3], l,\n" +-" argv[3], argv[3]);\n" +-" i = 0;\n" +-" while ((c = getc(ifp)) != EOF) {\n" +-" if (0 == (i&7)) fprintf(ofp, \"\\n \");\n" +-" fprintf(ofp, \" 0x%02x,\", c);\n" +-" ++i;\n" +-" }\n" +-" fprintf(ofp, \" 0x00\\n};\\n\\n\");\n" +-" fclose(ifp);\n" +-" fclose(ofp);\n" +-" return 0;\n" +-"}\n" +-) ++file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c ++ CONTENT ++"#include <stdio.h> ++int main(int argc, char **argv){ ++ FILE *ifp, *ofp; ++ int c, i, l; ++ if (argc != 4) return 1; ++ ifp = fopen(argv[1], \"rb\"); ++ if (!ifp) return 1; ++ i = fseek(ifp, 0, SEEK_END); ++ if (i < 0) return 1; ++ l = ftell(ifp); ++ if (l < 0) return 1; ++ i = fseek(ifp, 0, SEEK_SET); ++ if (i < 0) return 1; ++ ofp = fopen(argv[2], \"wb+\"); ++ if (!ofp) return 1; ++ fprintf(ofp, \"#define %s_size %d\\n\\n\" ++ \"#if defined __GNUC__\\n\" ++ \"__attribute__((aligned (4096)))\\n\" ++ \"#elif defined _MSC_VER\\n\" ++ \"__declspec(align(4096))\\n\" ++ \"#endif\\n\" ++ \"static const unsigned char %s[%s_size+1] = {\", ++ argv[3], l, ++ argv[3], argv[3]); ++ i = 0; ++ while ((c = getc(ifp)) != EOF) { ++ if (0 == (i&7)) fprintf(ofp, \"\\n \"); ++ fprintf(ofp, \" 0x%02x,\", c); ++ ++i; ++ } ++ fprintf(ofp, \" 0x00\\n};\\n\\n\"); ++ fclose(ifp); ++ fclose(ofp); ++ return 0; ++} ++") + + add_executable(bc2h ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c) + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") diff --git a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix index 141c1b01d6f6..db9e012e4eec 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,32 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, lld, llvm }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }: stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "5.0.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-EIBH7TXelo6mr+/vJ+iT+VLUVoQqWmNsgeN3Nwwr+tM="; + hash = "sha256-5C5bRdrt3xZAlRgtiIRTMAuwsFvVM4Win96P5+Pf5ZM="; }; sourceRoot = "source/lib/comgr"; nativeBuildInputs = [ cmake ]; - buildInputs = [ clang rocm-device-libs lld llvm ]; + buildInputs = [ clang rocm-device-libs llvm ]; cmakeFlags = [ - "-DCLANG=${clang}/bin/clang" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_C_COMPILER=${clang}/bin/clang" "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm" - "-DLLD_INCLUDE_DIRS=${lld.src}/include" + "-DLLD_INCLUDE_DIRS=${llvm}/include" "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\"" ]; + patches = [ ./cmake.patch ]; + passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts diff --git a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index 773f98ee54a9..08690f3fa450 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -3,28 +3,26 @@ , writeScript , cmake , clang -, clang-unwrapped -, lld , llvm }: stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "5.0.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ="; + hash = "sha256-TBCSznHyiaiOcBR9irybCnOgfqPiNNn4679PCQwrLhA="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ clang lld llvm ]; + buildInputs = [ clang llvm ]; cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${clang-unwrapped}/lib/cmake/clang" + "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${llvm}/lib/cmake/clang" "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'" "-DCLANG=${clang}/bin/clang" ]; diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 9c19638d3f40..699f00449cc7 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -6,11 +6,9 @@ , cmake , rocm-cmake , clang -, clang-unwrapped , glew , libglvnd , libX11 -, lld , llvm , mesa , numactl @@ -24,24 +22,22 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "5.0.2"; + version = "5.2.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0="; + hash = "sha256-Mk7Wssz34Uxtb9PRIEGrTn/tXtqxLMrq0damA/p/DsY="; }; nativeBuildInputs = [ cmake rocm-cmake ]; buildInputs = [ clang - clang-unwrapped glew libglvnd libX11 - lld llvm mesa numactl @@ -55,6 +51,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DAMD_OPENCL_PATH=${src}" "-DROCCLR_PATH=${rocclr}" + "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl" ]; dontStrip = true; diff --git a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index aff0475c4a53..36d178ea0433 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , writeScript , addOpenGLRunpath -, clang-unwrapped , cmake , xxd , elfutils @@ -14,20 +13,20 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "5.0.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-KOzVZNHtpwEOn7lZ36c4BGrImrq8dkUWRiHqGm+UTDk="; + hash = "sha256-TY0YPgNzxBLXAj7fncLQ01cSJyydveOLHrimCmLS32o="; }; sourceRoot = "source/src"; nativeBuildInputs = [ cmake xxd ]; - buildInputs = [ clang-unwrapped elfutils llvm numactl ]; + buildInputs = [ elfutils llvm numactl ]; cmakeFlags = [ "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode" diff --git a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index 9ceb1360cda0..583d9b59900e 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "5.0.2"; + version = "5.2.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-hhDLy92jS/akp1Ozun45OEjVbVcjufkRIfC8bqqFjp4="; + hash = "sha256-iXhlEofPAQNxeZzDgdF1DdflIKfSI7rHGTqOybHnnHM="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/rtrlib/default.nix b/nixpkgs/pkgs/development/libraries/rtrlib/default.nix new file mode 100644 index 000000000000..bb0aec308ae8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rtrlib/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, stdenv, cmake, libssh, openssl }: + +stdenv.mkDerivation rec { + pname = "rtrlib"; + version = "0.8.0"; + + src = fetchFromGitHub { + repo = pname; + owner = "rtrlib"; + rev = "v${version}"; + sha256 = "sha256-ISb4ojcDvXY/88GbFMrA5V5+SGE6CmE5D+pokDTwotQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libssh openssl ]; + + meta = with lib; { + description = "An open-source C implementation of the RPKI/Router Protocol client"; + homepage = "https://github.com/rtrlib/rtrlib"; + license = licenses.mit; + maintainers = with maintainers; [ Anillc ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/rttr/default.nix b/nixpkgs/pkgs/development/libraries/rttr/default.nix index b0f4f2a567a2..10a16dd3f6b4 100644 --- a/nixpkgs/pkgs/development/libraries/rttr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rttr/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "C++ Reflection Library"; homepage = "https://www.rttr.org"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/rubberband/default.nix b/nixpkgs/pkgs/development/libraries/rubberband/default.nix index 1e70d6e0dbed..5cb5da3224fe 100644 --- a/nixpkgs/pkgs/development/libraries/rubberband/default.nix +++ b/nixpkgs/pkgs/development/libraries/rubberband/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw -, vamp-plugin-sdk, ladspaH }: +, vamp-plugin-sdk, ladspaH, meson, ninja }: stdenv.mkDerivation rec { pname = "rubberband"; - version = "1.9.0"; + version = "2.0.2"; src = fetchurl { url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026"; + sha256 = "sha256-uerAJ+eXeJrplhHJ6urxw6RMyAT5yKBEGg0dJvPWvfk="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; makeFlags = [ "AR:=$(AR)" ]; diff --git a/nixpkgs/pkgs/development/libraries/rure/Cargo.lock b/nixpkgs/pkgs/development/libraries/rure/Cargo.lock index ce760ae23315..833c08b7322f 100644 --- a/nixpkgs/pkgs/development/libraries/rure/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/rure/Cargo.lock @@ -13,21 +13,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.113" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9" +checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index c22ff6c37309..3d3193f7e108 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.6"; + version = "1.3.12"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU="; + sha256 = "1n1bak4s67cfizh8j5wpf05kfdcjvwqaca4rq9qys25z52bbpn9f"; }; nativeBuildInputs = [ cmake ]; @@ -23,8 +23,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror + ] ++ lib.optionals stdenv.hostPlatform.isMips64 [ + # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609 + "-DS2N_NO_PQ=ON" ]; propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 3be249531bbe..e7e8dd04b071 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = [ "--with-bzip2=${bzip2.out}" ]; + configureFlags = [ "--with-bzip2=${bzip2.out}" "--enable-reentrant" ]; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index 60f5e51ae957..d0cf27bef5bd 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-U3Q0WUEDRn0zfBIdHXFp5Zcaf+M6HrSFnpeu5aAkjks="; + sha256 = "sha256-mj9rnPn85Fbc7Y8qRndqPVANzBrk3al+vDJagLTDJ04="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index 754f408ca266..ff1cb5026fdf 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-Ay7bszR4D5KKFiVLXfweJcc8jgUSZljnZVblEx7xh8o="; + sha256 = "sha256-HYNkpgkiRtA1ZsiFkmYk3MT3fKgs2d2neSExVXBbsPc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 6adf52514710..2b2cade6fbba 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.7"; + version = "7.9"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pwjmtOkOLNZCdDRxW1kbucPUAFyZcl7ElLjgvtLeU1U="; + sha256 = "sha256-vv+MHw6GAAeIE8Ay0a/NnLMFwx9WdWdDSCQjPVgqulg="; }; nativeBuildInputs = [ flex ]; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix index d1eb096e08e6..102cae24adb9 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/bpp-core/bpp-core-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix index 8ff6ad433fb5..c11b49aa57eb 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core bpp-seq ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix index af5d1d00d4d9..4b9a62eb762b 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core bpp-seq ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix index ef3f3d5756e9..7981fb28ac09 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/nixpkgs/pkgs/development/libraries/science/biology/ciftilib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/ciftilib/default.nix new file mode 100644 index 000000000000..797607ed8f54 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/biology/ciftilib/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, libxmlxx +, pkg-config +, zlib +}: + +stdenv.mkDerivation rec { + pname = "ciftilib"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "Washington-University"; + repo = "CiftiLib"; + rev = "v${version}"; + hash = "sha256-xc2dpMse4SozYEV/w3rXCrh1LKpTThq5nHB2y5uAD0A="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost libxmlxx zlib ]; + + cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/Washington-University/CiftiLib"; + description = "Library for reading and writing CIFTI files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.linux; + license = licenses.bsd2; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix index 15465c501b43..84762414fef9 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix @@ -24,10 +24,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; # usual dynamic linker issues - preCheck = " - export LD_LIBRARY_PATH=$(pwd)/bin - "; - meta = with lib; { homepage = "https://elastix.lumc.nl"; description = "Image registration toolkit based on ITK"; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index d93b4fb2a5a7..2e3f9dec3194 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -14,9 +14,25 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 xz curl ]; - configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended + configureFlags = if ! stdenv.hostPlatform.isStatic + then [ "--enable-libcurl" ] # optional but strongly recommended + else [ "--disable-libcurl" "--disable-plugins" ]; - installFlags = [ "prefix=$(out)" ]; + + # In the case of static builds, we need to replace the build and install phases + buildPhase = lib.optional stdenv.hostPlatform.isStatic '' + make AR=$AR lib-static + make LDFLAGS=-static bgzip htsfile tabix + ''; + + installPhase = lib.optional stdenv.hostPlatform.isStatic '' + install -d $out/bin + install -d $out/lib + install -d $out/include/htslib + install -D libhts.a $out/lib + install -m644 htslib/*h $out/include/htslib + install -D bgzip htsfile tabix $out/bin + ''; preCheck = '' patchShebangs test/ diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix index 0856168092cb..0534c7b46b03 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/dftlibs/xcfun"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheepforce ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 88336f21ed27..2413a0a25cfe 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -36,11 +36,7 @@ stdenv.mkDerivation rec { "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" ]; - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib:${blas}/lib:${lapack}/lib - '' else '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib - '' + '' + preCheck = '' # Prevent tests from using all cores export OMP_NUM_THREADS=2 ''; @@ -49,6 +45,10 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/127608 + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + meta = { homepage = "https://github.com/opencollab/arpack-ng"; description = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index 847d8429c92f..5b78afc15ed4 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -17,13 +17,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "blis"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; rev = version; - sha256 = "sha256-D5T/itq9zyD5TkeJ4Ae1vS4yEWU51omyJoIkKQ2NLhY="; + sha256 = "sha256-1aHIdt5wCDrT1hBPnaUVThwjwDkJQ0G0+tao2iFXYpM="; }; inherit blas64; diff --git a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 870568c9ac95..142641398f56 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.10"; + version = "1.2.11"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "1qg6ssp87rb8p37kahxmm88fbxqg6r540cky5v7wq7l19n2b1bss"; + sha256 = "sha256-GkaeBggOCiIWNBZoIaCvAcqGDRc/whTOqPZbGpAxWIk="; }; # FIXME package boost-test and enable checks diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix deleted file mode 100644 index 202903b9aa18..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ stdenv, lib, config, fetchFromGitHub -, cmake -, glog, gflags, gtest -, protobuf, snappy -, python, future, six, python-protobuf, numpy, pydot -, eigen -, doxygen -, useCuda ? (config.cudaSupport or false), cudatoolkit ? null -, useCudnn ? (config.cudnnSupport or false), cudnn ? null -, useOpenmp ? false, openmp ? null -, useOpencv3 ? true, opencv3 ? null -, useLeveldb ? false, leveldb ? null -, useLmdb ? true, lmdb ? null -, useRocksdb ? false, rocksdb ? null -, useZeromq ? false, zeromq ? null -, useMpi ? false, mpi ? null -# TODO: distributed computations -#, useGloo ? false -#, useNccl ? false -#, useNnpack ? false -}: - -assert useCuda -> cudatoolkit != null; -assert useCudnn -> (useCuda && cudnn != null); -assert useOpencv3 -> opencv3 != null; -assert useLeveldb -> leveldb != null; -assert useLmdb -> lmdb != null; -assert useRocksdb -> rocksdb != null; -assert useZeromq -> zeromq != null; -assert useMpi -> mpi != null; - -let - # Third party modules that caffe2 holds as git submodules. - # Download them and create symlinks from caffe2/third_party. - installExtraSrc = extra: '' - rmdir "third_party/${extra.dst}" - ln -s "${extra.src}" "third_party/${extra.dst}" - ''; - - cub = { - src = fetchFromGitHub { - owner = "NVlabs"; - repo = "cub"; - rev = "v1.7.4"; - sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; - }; - dst = "cub"; - }; - - pybind11 = { - src = fetchFromGitHub { - owner = "pybind"; - repo = "pybind11"; - rev = "86e2ad4f77442c3350f9a2476650da6bee253c52"; - sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz"; - }; - dst = "pybind11"; - }; - - ccVersion = lib.getVersion stdenv.cc; -in - -stdenv.mkDerivation rec { - pname = "caffe2"; - version = "0.8.1"; - src = fetchFromGitHub { - owner = "caffe2"; - repo = "caffe2"; - rev = "v${version}"; - sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8"; - }; - - nativeBuildInputs = [ cmake doxygen gtest ]; - outputs = [ "bin" "out" ]; - propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle - - buildInputs = [ glog gflags protobuf snappy eigen ] - ++ lib.optional useCuda cudatoolkit - ++ lib.optional useCudnn cudnn - ++ lib.optional useOpenmp openmp - ++ lib.optional useOpencv3 opencv3 - ++ lib.optional useLeveldb leveldb - ++ lib.optional useLmdb lmdb - ++ lib.optional useRocksdb rocksdb - ++ lib.optional useZeromq zeromq - ; - propagatedBuildInputs = [ numpy future six python-protobuf pydot ]; - - patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [ - ./fix_compilation_on_gcc7.patch - ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ]; - - cmakeFlags = [ "-DBUILD_TEST=OFF" - "-DBUILD_PYTHON=ON" - ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}'' - ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}'' - ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}'' - ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}'' - ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}'' - ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}'' - ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}'' - ''-DUSE_ZMQ=${if useZeromq then "ON"else "OFF"}'' - "-DUSE_GLOO=OFF" - "-DUSE_NNPACK=OFF" - "-DUSE_NCCL=OFF" - "-DUSE_REDIS=OFF" - "-DUSE_FFMPEG=OFF" - ] - ++ lib.optional useCuda [ - "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}" - "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ]; - - preConfigure = '' - ${installExtraSrc cub} - ${installExtraSrc pybind11} - # XXX hack - export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE" - ''; - - postInstall = '' - moveToOutput "bin" "$bin" - mkdir -p $out/lib/${python.libPrefix} - ln -s $out/ $out/${python.sitePackages} - ''; - - doCheck = false; - - meta = { - homepage = "https://caffe2.ai/"; - description = "A new lightweight, modular, and scalable deep learning framework"; - longDescription = '' - Caffe2 aims to provide an easy and straightforward way for you to experiment - with deep learning and leverage community contributions of new models and - algorithms. You can bring your creations to scale using the power of GPUs in the - cloud or to the masses on mobile with Caffe2's cross-platform libraries. - ''; - platforms = with lib.platforms; linux; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ yuriaisaka ]; - # fails to compile with - # error: invalid conversion from 'const char*' to 'char*' - # TODO: Remove usage of python2, protobuf overwrite - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch b/nixpkgs/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch deleted file mode 100644 index f319f20233a2..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc -index dd4fded..5995e8a 100644 ---- a/caffe2/operators/recurrent_network_op.cc -+++ b/caffe2/operators/recurrent_network_op.cc -@@ -1,4 +1,4 @@ --#include "recurrent_network_op.h" -+#include "caffe2/operators/recurrent_network_op.h" - #include "caffe2/core/workspace.h" - - namespace caffe2 { -diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h -index 55328e5..ea898bc 100644 ---- a/caffe2/operators/recurrent_network_op.h -+++ b/caffe2/operators/recurrent_network_op.h -@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator<Context> { - USE_OPERATOR_CONTEXT_FUNCTIONS; - - bool RunOnDevice() override { -- const auto t = -- OperatorBase::Input<Tensor<CPUContext>>(0).template data<int32_t>()[0]; -+ const auto& t0 = OperatorBase::Input<Tensor<CPUContext>>(0); -+ const auto t = t0.template data<int32_t>()[0]; - auto& og = Input(1); - auto* g = Output(0); - -diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h -index f2c0a33..642343f 100644 ---- a/caffe2/queue/queue_ops.h -+++ b/caffe2/queue/queue_ops.h -@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator<Context> { - name(operator_def.output().Get(0)) {} - - bool RunOnDevice() override { -- const auto capacity = -- OperatorBase::template GetSingleArgument<int>("capacity", 1); -- const auto numBlobs = -- OperatorBase::template GetSingleArgument<int>("num_blobs", 1); -+ const auto capacity = GetSingleArgument("capacity", 1); -+ const auto numBlobs = GetSingleArgument("num_blobs", 1); - const auto enforceUniqueName = -- OperatorBase::template GetSingleArgument<int>( -- "enforce_unique_name", false); -+ GetSingleArgument("enforce_unique_name", false); - const auto fieldNames = - OperatorBase::template GetRepeatedArgument<std::string>("field_names"); - CAFFE_ENFORCE_EQ(this->OutputSize(), 1); diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch b/nixpkgs/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch deleted file mode 100644 index d908cb6ba80b..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h -index bd06681..00172b7 100644 ---- a/caffe2/perfkernels/cvtsh_ss_bugfix.h -+++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h -@@ -1,10 +1,36 @@ -+/** -+ * Copyright (c) 2016-present, Facebook, Inc. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ - #pragma once - --#if defined(__APPLE__) && (__clang_major__ < 8) -+// Apple clang was fixed in 8.1 -+#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1))) -+#define __APPLE_NEED_FIX 1 -+#endif -+ -+// Regular clang was fixed in 3.9 -+#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9) -+#define __CLANG_NEED_FIX 1 -+#endif -+ -+#if __APPLE_NEED_FIX || __CLANG_NEED_FIX - - #include <emmintrin.h> - --// This version of apple clang has a bug that _cvtsh_ss is not defined, see -+// This version of clang has a bug that _cvtsh_ss is not defined, see - // https://reviews.llvm.org/D16177 - static __inline float - __attribute__((__always_inline__, __nodebug__, __target__("f16c"))) -@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a) - return r[0]; - } - --#endif // defined(__APPLE__) && (__clang_major__ < 8) -+#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX -+ -+#undef __APPLE_NEED_FIX -+#undef __CLANG_NEED_FIX - - #ifdef _MSC_VER - diff --git a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix index 0d8bafffb44f..fd89ede1efb9 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://users.aalto.fi/~pat/cliquer.html"; - downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; longDescription = '' Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. @@ -31,8 +29,11 @@ stdenv.mkDerivation rec { It is designed with the aim of being efficient while still being flexible and easy to use. ''; + homepage = "https://users.aalto.fi/~pat/cliquer.html"; + downloadPage = src.meta.homepage; # autocliquer license = licenses.gpl2Plus; maintainers = teams.sage.members; + mainProgram = "cl"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix deleted file mode 100644 index d05cc3f90ec0..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -# The following version combinations are supported: -# * cuDNN 7.4.2, cudatoolkit 10.0 -# * cuDNN 7.6.5, cudatoolkit 10.0-10.1 -# * cuDNN 8.1.1, cudatoolkit 10.2-11.2 -# * cuDNN 8.3.2, cudatoolkit 10.2-11.5 -{ callPackage -, cudatoolkit_10 -, cudatoolkit_10_0 -, cudatoolkit_10_1 -, cudatoolkit_10_2 -, cudatoolkit_11 -, cudatoolkit_11_0 -, cudatoolkit_11_1 -, cudatoolkit_11_2 -, cudatoolkit_11_3 -, cudatoolkit_11_4 -, cudatoolkit_11_5 -, fetchurl -, lib -}: - -let - generic = args: callPackage (import ./generic.nix (removeAttrs args [ "cudatoolkit" ])) { - inherit (args) cudatoolkit; - }; - urlPrefix = "https://developer.download.nvidia.com/compute/redist/cudnn"; -in -rec { - # cuDNN 7.x - # Still used by libtensorflow-bin. It should be upgraded at some point. - cudnn_7_4_cudatoolkit_10_0 = generic rec { - version = "7.4.2"; - cudatoolkit = cudatoolkit_10_0; - # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn_742/cudnn-support-matrix/index.html#cudnn-cuda-hardware-versions__table-cudnn-cuda-hardware-versions. - minCudaVersion = "9.2.88"; - maxCudaVersion = "10.0.99999"; - mkSrc = _: fetchurl { - url = "${urlPrefix}/v${version}/cudnn-10.0-linux-x64-v7.4.2.24.tgz"; - hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; - }; - }; - # The only overlap between supported and packaged CUDA versions is 10.0. - - cudnn_7_6_cudatoolkit_10_0 = generic rec { - version = "7.6.5"; - cudatoolkit = cudatoolkit_10_0; - # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn_765/cudnn-support-matrix/index.html#cudnn-versions-763-765. - minCudaVersion = "9.2.148"; - maxCudaVersion = "10.1.243"; - mkSrc = cudatoolkit: fetchurl { - url = "${urlPrefix}/v${version}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz"; - hash = { - "10.0" = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; - "10.1" = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; - }."${cudatoolkit.majorVersion}"; - }; - }; - cudnn_7_6_cudatoolkit_10_1 = cudnn_7_6_cudatoolkit_10_0.override { cudatoolkit = cudatoolkit_10_1; }; - - # cuDNN 8.x - # cuDNN 8.1 is still used by tensorflow at the time of writing (2022-02-17). - # See https://github.com/NixOS/nixpkgs/pull/158218 for more info. - cudnn_8_1_cudatoolkit_10_2 = generic rec { - version = "8.1.1"; - cudatoolkit = cudatoolkit_10_2; - # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811. - minCudaVersion = "10.2.00000"; - maxCudaVersion = "11.2.99999"; - mkSrc = cudatoolkit: - let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.2"; in - fetchurl { - url = "${urlPrefix}/v${version}/cudnn-${v}-linux-x64-v8.1.1.33.tgz"; - hash = { - "10.2" = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; - "11.2" = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; - }."${v}"; - }; - }; - cudnn_8_1_cudatoolkit_11_0 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_0; }; - cudnn_8_1_cudatoolkit_11_1 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_1; }; - cudnn_8_1_cudatoolkit_11_2 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; }; - - cudnn_8_1_cudatoolkit_10 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_10; }; - cudnn_8_1_cudatoolkit_11 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11; }; - - # cuDNN 8.3 is necessary for the latest jaxlib, esp. jaxlib-bin. See - # https://github.com/google/jax/discussions/9455 for more info. - cudnn_8_3_cudatoolkit_10_2 = - generic - rec { - version = "8.3.2"; - cudatoolkit = cudatoolkit_10_2; - # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-832/support-matrix/index.html#cudnn-cuda-hardware-versions. - minCudaVersion = "10.2.00000"; - maxCudaVersion = "11.5.99999"; - mkSrc = cudatoolkit: - let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.5"; in - fetchurl { - # Starting at version 8.3.1 there's a new directory layout including - # a subdirectory `local_installers`. - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/local_installers/${v}/cudnn-linux-x86_64-8.3.2.44_cuda${v}-archive.tar.xz"; - hash = { - "10.2" = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; - "11.5" = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; - }."${v}"; - }; - } - ; - cudnn_8_3_cudatoolkit_11_0 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_0; }; - cudnn_8_3_cudatoolkit_11_1 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_1; }; - cudnn_8_3_cudatoolkit_11_2 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; }; - cudnn_8_3_cudatoolkit_11_3 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_3; }; - cudnn_8_3_cudatoolkit_11_4 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_4; }; - cudnn_8_3_cudatoolkit_11_5 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_5; }; - - cudnn_8_3_cudatoolkit_10 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_10; }; - cudnn_8_3_cudatoolkit_11 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11; }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix new file mode 100644 index 000000000000..265e09f436ab --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -0,0 +1,116 @@ +final: prev: let + + inherit (final) callPackage; + inherit (prev) cudatoolkit cudaVersion lib pkgs; + + ### CuDNN + + buildCuDnnPackage = args: + let + useCudatoolkitRunfile = lib.versionOlder cudaVersion "11.3.999"; + in + callPackage ./generic.nix { inherit useCudatoolkitRunfile; } args; + + toUnderscore = str: lib.replaceStrings ["."] ["_"] str; + + majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str)); + + cuDnnPackages = with lib; let + # Check whether a file is supported for our cuda version + isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; + # Return the first file that is supported. In practice there should only ever be one anyway. + supportedFile = files: findFirst isSupported null files; + # Supported versions with versions as keys and file as value + supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) cuDnnVersions); + # Compute versioned attribute name to be used in this package set + computeName = version: "cudnn_${toUnderscore version}"; + # Add all supported builds as attributes + allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildCuDnnPackage (removeAttrs file ["fileVersion"]))) supportedVersions; + # Set the default attributes, e.g. cudnn = cudnn_8_3_1; + defaultBuild = { "cudnn" = allBuilds.${computeName cuDnnDefaultVersion}; }; + in allBuilds // defaultBuild; + + cuDnnVersions = let + urlPrefix = "https://developer.download.nvidia.com/compute/redist/cudnn"; + in { + "7.4.2" = [ + rec { + fileVersion = "10.0"; + fullVersion = "7.4.2.24"; + sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf"; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-10.0-linux-x64-v${fullVersion}.tgz"; + supportedCudaVersions = [ "10.0" ]; + } + ]; + "7.6.5" = [ + rec { + fileVersion = "10.0"; + fullVersion = "7.6.5.32"; + hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; + supportedCudaVersions = [ "10.0" ]; + } + rec { + fileVersion = "10.1"; + fullVersion = "7.6.5.32"; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; + supportedCudaVersions = [ "10.1" ]; + } + rec { + fileVersion = "10.2"; + fullVersion = "7.6.5.32"; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; + supportedCudaVersions = [ "10.2" ]; + } + ]; + "8.1.1" = [ + rec { + fileVersion = "10.2"; + fullVersion = "8.1.1.33"; + hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.2"; + fullVersion = "8.1.1.33"; + hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + supportedCudaVersions = [ "11.2" ]; + } + ]; + "8.3.2" = [ + rec { + fileVersion = "10.2"; + fullVersion = "8.3.2.44"; + hash = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.5"; + fullVersion = "8.3.2.44"; + hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" ]; + } + ]; + }; + + # Default attributes + cuDnnDefaultVersion = { + "10.0" = "7.4.2"; + "10.1" = "7.6.5"; + "10.2" = "8.3.2"; + "11.0" = "8.3.2"; + "11.1" = "8.3.2"; + "11.2" = "8.3.2"; + "11.3" = "8.3.2"; + "11.4" = "8.3.2"; + "11.5" = "8.3.2"; + "11.6" = "8.3.2"; + }.${cudaVersion}; + +in cuDnnPackages diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index a5272e56ab6d..731b5588f887 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,14 +1,14 @@ -{ minCudaVersion -, maxCudaVersion -, mkSrc -, version -}: - { stdenv , lib -, cudatoolkit +, zlib +, useCudatoolkitRunfile ? false +, cudaVersion +, cudaMajorVersion +, cudatoolkit # if cuda>=11: only used for .cc +, libcublas ? null # cuda <11 doesn't ship redist packages +, autoPatchelfHook +, autoAddOpenGLRunpathHook , fetchurl -, addOpenGLRunpath , # The distributed version of CUDNN includes both dynamically liked .so files, # as well as statically linked .a files. However, CUDNN is quite large # (multiple gigabytes), so you can save some space in your nix store by @@ -19,34 +19,57 @@ removeStatic ? false }: -stdenv.mkDerivation { - name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; +{ fullVersion +, url +, hash ? null +, sha256 ? null +, supportedCudaVersions ? [ ] +}: + +assert (hash != null) || (sha256 != null); + +assert useCudatoolkitRunfile || (libcublas != null); +let + inherit (cudatoolkit) cc; + + majorMinorPatch = version: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); + version = majorMinorPatch fullVersion; + + cudatoolkit_root = + if useCudatoolkitRunfile + then cudatoolkit + else libcublas; +in +stdenv.mkDerivation { + pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; inherit version; - # It's often the case that the src depends on the version of cudatoolkit it's - # being linked against, so we pass in `cudatoolkit` as an argument to `mkSrc`. - src = mkSrc cudatoolkit; - nativeBuildInputs = [ addOpenGLRunpath ]; + src = fetchurl { + inherit url hash sha256; + }; - # Some cuDNN libraries depend on things in cudatoolkit, eg. - # libcudnn_ops_infer.so.8 tries to load libcublas.so.11. So we need to patch - # cudatoolkit into RPATH. See also https://github.com/NixOS/nixpkgs/blob/88a2ad974692a5c3638fcdc2c772e5770f3f7b21/pkgs/development/python-modules/jaxlib/bin.nix#L78-L98. + # Check and normalize Runpath against DT_NEEDED using autoPatchelf. + # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") + nativeBuildInputs = [ + autoPatchelfHook + autoAddOpenGLRunpathHook + ]; + + # Used by autoPatchelfHook + buildInputs = [ + cc.cc.lib # libstdc++ + zlib + cudatoolkit_root + ]; + + # We used to patch Runpath here, but now we use autoPatchelfHook # # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in # version 8.3.2 it seems to have been renamed to simply "lib/". installPhase = '' runHook preInstall - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc cudatoolkit.lib ]}:${cudatoolkit}/lib:\$ORIGIN/" $1 - } - - for sofile in {lib,lib64}/lib*.so; do - fixRunPath $sofile - done - mkdir -p $out cp -a include $out/include [ -d "lib/" ] && cp -a lib $out/lib @@ -58,20 +81,20 @@ stdenv.mkDerivation { runHook postInstall ''; - # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = '' - for lib in $out/lib/lib*.so; do - addOpenGLRunpath $lib - done + # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. + postFixup = lib.optionalString (lib.versionAtLeast fullVersion "8.0.5") '' + patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so ''; - propagatedBuildInputs = [ - cudatoolkit - ]; - passthru = { - inherit cudatoolkit; + inherit useCudatoolkitRunfile; + + cudatoolkit = lib.warn '' + cudnn.cudatoolkit passthru attribute is deprecated; + if your derivation uses cudnn directly, it should probably consume cudaPackages instead + '' + cudatoolkit; + majorVersion = lib.versions.major version; }; @@ -81,14 +104,11 @@ stdenv.mkDerivation { # official version constraints (as recorded in default.nix). In some cases # you _may_ be able to smudge version constraints, just know that you're # embarking into unknown and unsupported territory when doing so. - broken = let cudaVer = lib.getVersion cudatoolkit; in - !( - lib.versionAtLeast cudaVer minCudaVersion - && lib.versionAtLeast maxCudaVersion cudaVer - ); - + broken = !(elem cudaVersion supportedCudaVersions); description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + # TODO: consider marking unfreRedistributable when not using runfile license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter samuela ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix deleted file mode 100644 index 25633ca63e6b..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ callPackage -, cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 -}: - -rec { - cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec { - version = "1.2.2.5"; - libPath = "lib/10.1"; - cudatoolkit = cudatoolkit_10_1; - # 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2: - # ephemeral doc at https://developer.nvidia.com/cutensor/downloads - sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm"; - }; - - cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override { - version = "1.3.1.3"; - libPath = "lib/10.2"; - cudatoolkit = cudatoolkit_10_2; - # 1.3.1 is compatible with CUDA 11.0, 11.1, and 11.2: - # ephemeral doc at https://developer.nvidia.com/cutensor/downloads - sha256 = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8="; - }; - - cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2; - - cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override { - libPath = "lib/11"; - cudatoolkit = cudatoolkit_11_0; - }; - - cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_1; - }; - - cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_2; - }; - - cutensor_cudatoolkit_11_3 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_3; - }; - - cutensor_cudatoolkit_11_4 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_4; - }; - - cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_4; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix index 0b2bd31b2c30..e4cbf0ab7bf7 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -7,7 +7,7 @@ , addOpenGLRunpath , version -, sha256 +, hash }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; outputs = [ "out" "dev" ]; @@ -62,6 +62,7 @@ stdenv.mkDerivation { meta = with lib; { description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives"; homepage = "https://developer.nvidia.com/cutensor"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ obsidian-systems-maintenance ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix new file mode 100644 index 000000000000..f2d5e29f6a4a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -0,0 +1,123 @@ +{ lib +, config +, fetchFromGitHub +, stdenv +, cmake +, cudaPackages +, cudaSupport ? config.cudaSupport or false +, cudaCapabilities ? [ "60" "70" "80" "86" ] +, pythonSupport ? true +, pythonPackages +, blas +, swig +, addOpenGLRunpath +, optLevel ? let + optLevels = + lib.optional stdenv.hostPlatform.avx2Support "avx2" + ++ lib.optional stdenv.hostPlatform.sse4_1Support "sse4" + ++ [ "generic" ]; + in + # Choose the maximum available optimization level + builtins.head optLevels +, faiss # To run demos in the tests +, runCommand +}: + +let + pname = "faiss"; + version = "1.7.2"; + inherit (cudaPackages) cudatoolkit; +in +stdenv.mkDerivation { + inherit pname version; + + outputs = [ "out" "demos" ]; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Tklf5AaqJbOs9qtBZVcxXPLAp+K54EViZLSOvEhmswg="; + }; + + buildInputs = [ + blas + swig + ] ++ lib.optionals pythonSupport [ + pythonPackages.setuptools + pythonPackages.pip + pythonPackages.wheel + ]; + + propagatedBuildInputs = lib.optionals pythonSupport [ + pythonPackages.numpy + ]; + + nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ + cudatoolkit + addOpenGLRunpath + ] ++ lib.optional pythonSupport [ + pythonPackages.python + ]; + + passthru.extra-requires.all = [ + pythonPackages.numpy + ]; + + cmakeFlags = [ + "-DFAISS_ENABLE_GPU=${if cudaSupport then "ON" else "OFF"}" + "-DFAISS_ENABLE_PYTHON=${if pythonSupport then "ON" else "OFF"}" + "-DFAISS_OPT_LEVEL=${optLevel}" + ] ++ lib.optionals cudaSupport [ + "-DCMAKE_CUDA_ARCHITECTURES=${lib.concatStringsSep ";" cudaCapabilities}" + ]; + + + # pip wheel->pip install commands copied over from opencv4 + + buildPhase = '' + make -j faiss + make demo_ivfpq_indexing + '' + lib.optionalString pythonSupport '' + make -j swigfaiss + (cd faiss/python && + python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) + ''; + + installPhase = '' + make install + mkdir -p $demos/bin + cp ./demos/demo_ivfpq_indexing $demos/bin/ + '' + lib.optionalString pythonSupport '' + mkdir -p $out/${pythonPackages.python.sitePackages} + (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache) + ''; + + fixupPhase = lib.optionalString (pythonSupport && cudaSupport) '' + addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so + addOpenGLRunpath $demos/bin/* + ''; + + passthru = { + inherit cudaSupport cudaPackages pythonSupport; + + tests = { + runDemos = runCommand "${pname}-run-demos" + { buildInputs = [ faiss.demos ]; } + # There are more demos, we run just the one that documentation mentions + '' + demo_ivfpq_indexing && touch $out + ''; + } // lib.optionalAttrs pythonSupport { + pytest = pythonPackages.callPackage ./tests.nix { }; + }; + }; + + meta = with lib; { + description = "A library for efficient similarity search and clustering of dense vectors by Facebook Research"; + homepage = "https://github.com/facebookresearch/faiss"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix b/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix new file mode 100644 index 000000000000..fcf57a8bc9fd --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, faiss +, scipy +, pytestCheckHook +}: + +assert faiss.pythonSupport; + +buildPythonPackage { + pname = "faiss-pytest-suite"; + inherit (faiss) version; + + src = "${faiss.src}/tests"; + + dontBuild = true; + dontInstall = true; + + # Tests that need GPUs and would fail in the sandbox + disabledTestPaths = lib.optionals faiss.cudaSupport [ + "test_contrib.py" + ]; + + checkInputs = [ + faiss + pytestCheckHook + scipy + ] ++ + faiss.extra-requires.all; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix deleted file mode 100644 index 2690d544c2c8..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix +++ /dev/null @@ -1,272 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, boost -, cmake -, doxygen -, eigen -, mpi4py -, numpy -, pkg-config -, pybind11 -, pytest -, pythonPackages -, six -, sympy -, gtest -, hdf5 -, mpi -, ply -, python -, scotch -, setuptools -, sphinx -, suitesparse -, swig -, zlib -, blas -, lapack -, nixosTests -}: -let - version = "2019.1.0"; - - # TODO: test with newer pytest - pytest = pythonPackages.callPackage - ../../../../python2-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = pythonPackages.hypothesis.override { - doCheck = false; - }; - }; - - dijitso = pythonPackages.buildPythonPackage { - pname = "dijitso"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; - sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a"; - }; - propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; - preCheck = '' - export HOME=$PWD - ''; - checkPhase = '' - runHook preCheck - py.test test/ - runHook postCheck - ''; - meta = { - description = "Distributed just-in-time shared library building"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - - fiat = pythonPackages.buildPythonPackage { - pname = "fiat"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; - sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il"; - }; - propagatedBuildInputs = [ numpy six sympy ]; - checkInputs = [ pytest ]; - - preCheck = '' - # Workaround pytest 4.6.3 issue. - # See: https://bitbucket.org/fenics-project/fiat/pull-requests/59 - rm test/unit/test_quadrature.py - rm test/unit/test_reference_element.py - rm test/unit/test_fiat.py - ''; - checkPhase = '' - runHook preCheck - py.test test/unit/ - runHook postCheck - ''; - meta = { - description = "Automatic generation of finite element basis functions"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - - ufl = pythonPackages.buildPythonPackage { - pname = "ufl"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; - sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1"; - }; - propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; - checkPhase = '' - runHook preCheck - py.test test/ - runHook postCheck - ''; - meta = { - description = "A domain-specific language for finite element variational forms"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - - ffc = pythonPackages.buildPythonPackage { - pname = "ffc"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; - sha256 = "1zdg6pziss4va74pd7jjl8sc3ya2gmhpypccmyd8p7c66ji23y2g"; - }; - nativeBuildInputs = [ - pybind11 - ]; - propagatedBuildInputs = [ - dijitso - fiat - numpy - six - sympy - ufl - setuptools - ]; - checkInputs = [ pytest ]; - preCheck = '' - export HOME=$PWD - rm test/unit/ufc/finite_element/test_evaluate.py - ''; - checkPhase = '' - runHook preCheck - py.test test/unit/ - runHook postCheck - ''; - meta = { - description = "A compiler for finite element variational forms"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - dolfin = stdenv.mkDerivation { - pname = "dolfin"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; - sha256 = "0kbyi4x5f6j4zpasch0swh0ch81w2h92rqm1nfp3ydi4a93vky33"; - }; - patches = [ - (fetchpatch { - name = "fix-double-prefix.patch"; - url = "https://bitbucket.org/josef_kemetmueller/dolfin/commits/328e94acd426ebaf2243c072b806be3379fd4340/raw"; - sha256 = "1zj7k3y7vsx0hz3gwwlxhq6gdqamqpcw90d4ishwx5ps5ckcsb9r"; - }) - ]; - propagatedBuildInputs = [ - dijitso - fiat - numpy - six - ufl - ]; - nativeBuildInputs = [ - cmake - doxygen - pkg-config - ]; - buildInputs = [ - boost - dijitso - eigen - ffc - fiat - hdf5 - mpi - numpy - blas - lapack - ply - python - scotch - six - sphinx - suitesparse - swig - sympy - ufl - zlib - ]; - cmakeFlags = [ - "-DDOLFIN_CXX_FLAGS=-std=c++11" - "-DDOLFIN_AUTO_DETECT_MPI=ON" - "-DDOLFIN_ENABLE_CHOLMOD=ON" - "-DDOLFIN_ENABLE_DOCS=ON" - "-DDOLFIN_ENABLE_HDF5=ON" - "-DDOLFIN_ENABLE_MPI=ON" - "-DDOLFIN_ENABLE_SCOTCH=ON" - "-DDOLFIN_ENABLE_UMFPACK=ON" - "-DDOLFIN_ENABLE_ZLIB=ON" - "-DDOLFIN_SKIP_BUILD_TESTS=ON" # Otherwise SCOTCH is not found - # TODO: Enable the following features - "-DDOLFIN_ENABLE_PARMETIS=OFF" - "-DDOLFIN_ENABLE_PETSC=OFF" - "-DDOLFIN_ENABLE_SLEPC=OFF" - "-DDOLFIN_ENABLE_TRILINOS=OFF" - ]; - installCheckPhase = '' - source $out/share/dolfin/dolfin.conf - make runtests - ''; - meta = { - description = "The FEniCS Problem Solving Environment in Python and C++"; - homepage = "https://fenicsproject.org/"; - license = lib.licenses.lgpl3; - }; - }; - python-dolfin = pythonPackages.buildPythonPackage rec { - pname = "dolfin"; - inherit version; - disabled = pythonPackages.isPy27; - src = dolfin.src; - sourceRoot = "${pname}-${version}/python"; - nativeBuildInputs = [ - pybind11 - cmake - ]; - dontUseCmakeConfigure = true; - preConfigure = '' - export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH - substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" - substituteInPlace dolfin/jit/jit.py \ - --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ - --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' - ''; - buildInputs = [ - dolfin - boost - ]; - - propagatedBuildInputs = [ - dijitso - ffc - mpi4py - numpy - ufl - pythonPackages.pkgconfig - pythonPackages.pybind11 - ]; - doCheck = false; # Tries to orte_ess_init and call ssh to localhost - passthru.tests = { inherit (nixosTests) fenics; }; - meta = { - description = "Python bindings for the DOLFIN FEM compiler"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; -in python-dolfin diff --git a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix index c956eae4f710..c5426ed67fc7 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix @@ -30,10 +30,11 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; + homepage = "https://github.com/sagemath/FlintQS"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; + mainProgram = "QuadraticSieve"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index d7a0dcfe06a7..c3ff2aeebfb4 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" "-DBLAS_FOUND:BOOL=TRUE" "-DBLAS_LIBRARIES:STRING=${blas}/lib/libblas.so" "-DLAPACK_FOUND:BOOL=TRUE" @@ -38,8 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/itpp - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/itpp ./gtests/itpp_gtests ''; diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index 9f481961e5bf..05470f61dd3e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gfortran , cmake , shared ? true @@ -11,23 +10,15 @@ stdenv.mkDerivation rec { pname = "liblapack"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${version}"; - sha256 = "sha256-ewYUM+M7jDO5LLnB4joiKkqgXjEDmWbFZbgad8x98gc="; + sha256 = "07wwydw72gl4fhfqcyc8sbz7ynm0i23pggyfqn0r9a29g7qh8bqs"; }; - patches = [ - (fetchpatch { - name = "CVE-2021-4048.patch"; - url = "https://github.com/Reference-LAPACK/lapack/commit/0631b6beaed60ba118b0b027c0f8d35397bf5df0.patch"; - sha256 = "1bqjw3f6ak9iz97y7ckn0rrfcgrzbn9prgfasl489qpxgzp2kjh8"; - }) - ]; - nativeBuildInputs = [ gfortran cmake ]; # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10. diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix index 3c194648c2a3..26a1932bd192 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; meta = { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = "http://www.chokkan.org/software/liblbfgs/"; license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix index eaea649d4340..a7940cd1db8d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -6,10 +6,11 @@ , symlinkJoin , cudaSupport -, cudatoolkit -, cudnn +, cudaPackages ? {} }: let + inherit (cudaPackages) cudatoolkit cudnn; + cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; paths = [ cudatoolkit.out cudatoolkit.lib ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix index 063fead11650..ae5beb0f09e6 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lrs"; - version = "7.0"; + version = "7.2"; src = fetchurl { - url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz"; - sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9"; + url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-072.tar.gz"; + sha256 = "1w1jsnfgny8cihndr5gfm99pvwp48qsvxkqfsi2q87gd3m57aj7w"; }; buildInputs = [ gmp ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix index 38a633e58c71..2a46e22b60d2 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200115"; + version = "20200125"; pname = "m4rie"; src = fetchFromBitbucket { owner = "malb"; repo = "m4rie"; rev = "release-${version}"; - sha256 = "0s8if80x5d6mikbcfsbbxg347136spahp9f3x8i1hflbwl8xj9k8"; + sha256 = "sha256-bjAcxfXsC6+jPYC472CN78jm4UljJQlkWyvsqckCDh0="; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix index c5960dddf517..05d7d4fa1842 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: +{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudaPackages, libpthreadstubs, lapack, blas }: + +let + inherit (cudaPackages) cudatoolkit; +in assert let majorIs = lib.versions.major cudatoolkit.version; in majorIs == "9" || majorIs == "10" || majorIs == "11"; let - version = "2.5.4"; + version = "2.6.2"; # We define a specific set of CUDA compute capabilities here, # because CUDA 11 does not support compute capability 3.0. Also, @@ -41,7 +45,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - sha256 = "0rrvd21hczxlm8awc9z54fj7iqpjmsb518fy32s6ghz0g90znd3p"; + hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE="; name = "magma-${version}.tar.gz"; }; @@ -60,23 +64,6 @@ in stdenv.mkDerivation { enableParallelBuilding=true; buildFlags = [ "magma" "magma_sparse" ]; - # MAGMA's default CMake setup does not care about installation. So we copy files directly. - installPhase = '' - mkdir -p $out - mkdir -p $out/include - mkdir -p $out/lib - mkdir -p $out/lib/pkgconfig - cp -a ../include/*.h $out/include - #cp -a sparse-iter/include/*.h $out/include - cp -a lib/*.so $out/lib - cat ../lib/pkgconfig/magma.pc.in | \ - sed -e s:@INSTALL_PREFIX@:"$out": | \ - sed -e s:@CFLAGS@:"-I$out/include": | \ - sed -e s:@LIBS@:"-L$out/lib -lmagma -lmagma_sparse": | \ - sed -e s:@MAGMA_REQUIRED@:: \ - > $out/lib/pkgconfig/magma.pc - ''; - meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix index 41deec25d454..cd221e86b148 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn"; }; - cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ]; + cmakeFlags = [ + "-DGKLIB_PATH=../GKlib" + # remove once updated past https://github.com/KarypisLab/METIS/commit/521a2c360dc21ace5c4feb6dc0b7992433e3cb0f + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; nativeBuildInputs = [ unzip cmake ]; meta = { diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 1f60f4d95388..dc68abe38c36 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -189,6 +189,7 @@ in stdenvNoCC.mkDerivation ({ threading models. ''; homepage = "https://software.intel.com/en-us/mkl"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.issl; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ bhipple ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index 5036ad890799..41dddf2391ac 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; - version = "2.7.8-1"; + version = "2.12.10-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; rev = "v${version}"; - sha256 = "0xxiwaw239dc9g015fka3k1nvm5zyl00dzgxnwzkang61dys9wln"; + sha256 = "sha256-QqORzm0gD+QG+P8rId8bQn2oZsxL5YyxCIobUVs85wE="; }; outputs = [ "out" "dev" ]; @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + inherit cudatoolkit; + }; + meta = with lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix index c38b0d623bac..9396a9144423 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config , p4est-withMetis ? true, metis , p4est-sc }: @@ -31,9 +34,11 @@ stdenv.mkDerivation { postPatch = '' sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am ''; - preConfigure = '' + preAutoreconf = '' echo "2.8.0" > .tarball-version - ${if mpiSupport then "unset CC" else ""} + ''; + preConfigure = lib.optionalString mpiSupport '' + unset CC ''; configureFlags = p4est-sc.configureFlags diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index a06df2b1950d..e847d1decd24 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.16.5"; + version = "3.17.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-fehXDuuUBidS2CqDII/Cuvx3s/UVAjpMFNj/lEDmbKw="; + sha256 = "sha256-mcEnSGcio//ZWiaLTOsJdsvyF5JsaBqWMb1yRuq4yyo="; }; mpiSupport = !withp4est || p4est.mpiSupport; diff --git a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix index a257b84ca54b..3b072fecde34 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix @@ -1,18 +1,17 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook }: stdenv.mkDerivation rec { pname = "planarity"; - version = "3.0.0.5"; + version = "3.0.2.0"; src = fetchFromGitHub { owner = "graph-algorithms"; repo = "edge-addition-planarity-suite"; rev = "Version_${version}"; - sha256 = "01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8"; + sha256 = "sha256-cUAh2MXCSmtxFtV6iTHgSRgsq/26DjWwxhWJH1+367A="; }; nativeBuildInputs = [ @@ -21,14 +20,6 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ - # declare variables declared in headers as extern, not yet merged upstream - (fetchpatch { - url = "https://github.com/graph-algorithms/edge-addition-planarity-suite/pull/3.patch"; - sha256 = "1nqjc4clr326imz4jxqxcxv2hgh1sjgzll27k5cwkdin8lnmmil8"; - }) - ]; - meta = with lib; { homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; description = "A library for implementing graph algorithms"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/primecount/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primecount/default.nix deleted file mode 100644 index e1390ce6416e..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/primecount/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, primesieve }: - -stdenv.mkDerivation rec { - pname = "primecount"; - version = "7.2"; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ primesieve ]; - - src = fetchFromGitHub { - owner = "kimwalisch"; - repo = "primecount"; - rev = "v${version}"; - sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo="; - }; - - cmakeFlags = [ - "-DBUILD_STATIC_LIBS=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTS=ON" - "-DBUILD_PRIMECOUNT=ON" - "-DBUILD_LIBPRIMESIEVE=ON" - ]; - - meta = with lib; { - description = "Fast prime counting function implementations"; - homepage = "https://github.com/kimwalisch/primecount"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = teams.sage.members; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix deleted file mode 100644 index 0cf263218a3b..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "primesieve"; - version = "7.8"; - - nativeBuildInputs = [ cmake ]; - - src = fetchFromGitHub { - owner = "kimwalisch"; - repo = "primesieve"; - rev = "v${version}"; - sha256 = "sha256-M35CP/xEyC7mEh84kaGsgfsDI9fnanHraNPgTvpqimI="; - }; - - meta = with lib; { - description = "Fast C/C++ prime number generator"; - homepage = "https://primesieve.org/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index bafb52be7ffb..c0abcf6da659 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssh +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh , mpi, blas, lapack } : @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { passthru = { inherit (blas) isILP64; }; + # upstream patch, remove with next release + patches = [ (fetchpatch { + name = "gcc-10"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch"; + sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp"; + })]; + # Required to activate ILP64. # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 postPatch = lib.optionalString passthru.isILP64 '' @@ -31,8 +38,11 @@ stdenv.mkDerivation rec { checkInputs = [ openssh ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - doCheck = true; + # xslu and xsllt tests seem to time out on x86_64-darwin. + # this line is left so those who force installation on x86_64-darwin can still build + doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' cmakeFlagsArray+=( @@ -60,15 +70,15 @@ stdenv.mkDerivation rec { # Run single threaded export OMP_NUM_THREADS=1 - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib ''; meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ costrouc markuskowa ]; + platforms = platforms.unix; + maintainers = with maintainers; [ costrouc markuskowa gdinh ]; + # xslu and xsllt tests fail on x86 darwin + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index eea7c146ca33..0d5409c6817d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "6.2.5"; + version = "7.2.0"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-N4yFlTxV+lVz70PSHPuWEEFLp0dpsImXYDLUYEo2JQI="; + sha256 = "sha256-N3TBuKWQRisXE5DQ0c+N2cv0darQ8mz4g2oe7pKst9E="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix index b57d1191933b..1b769f44eeb1 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -1,13 +1,16 @@ { lib, stdenv , fetchurl , addOpenGLRunpath -, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn +, cudaSupport ? false, cudaPackages ? {} +, symlinkJoin }: with lib; let broken = !stdenv.isLinux && !stdenv.isDarwin; + inherit (cudaPackages) cudatoolkit cudnn; + tfType = if cudaSupport then "gpu" else "cpu"; system = @@ -65,6 +68,7 @@ in stdenv.mkDerivation rec { meta = { description = "C API for TensorFlow"; homepage = "https://www.tensorflow.org/install/lang_c"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix new file mode 100644 index 000000000000..8e9f64885bad --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -0,0 +1,63 @@ +final: prev: let + + inherit (final) callPackage; + inherit (prev) cudatoolkit cudaVersion lib pkgs; + + ### TensorRT + + buildTensorRTPackage = args: + callPackage ./generic.nix { } args; + + toUnderscore = str: lib.replaceStrings ["."] ["_"] str; + + majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str)); + + tensorRTPackages = with lib; let + # Check whether a file is supported for our cuda version + isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; + # Return the first file that is supported. In practice there should only ever be one anyway. + supportedFile = files: findFirst isSupported null files; + # Supported versions with versions as keys and file as value + supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) tensorRTVersions); + # Compute versioned attribute name to be used in this package set + computeName = version: "tensorrt_${toUnderscore version}"; + # Add all supported builds as attributes + allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildTensorRTPackage (removeAttrs file ["fileVersionCuda"]))) supportedVersions; + # Set the default attributes, e.g. tensorrt = tensorrt_8_4; + defaultBuild = { "tensorrt" = allBuilds.${computeName tensorRTDefaultVersion}; }; + in allBuilds // defaultBuild; + + tensorRTVersions = { + "8.4.0" = [ + rec { + fileVersionCuda = "11.6"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ]; + } + rec { + fileVersionCuda = "10.2"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-aCzH0ZI6BrJ0v+e5Bnm7b8mNltA7NNuIa8qRKzAQv+I="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "10.2" ]; + } + ]; + }; + + # Default attributes + tensorRTDefaultVersion = { + "10.2" = "8.4.0"; + "11.0" = "8.4.0"; + "11.1" = "8.4.0"; + "11.2" = "8.4.0"; + "11.3" = "8.4.0"; + "11.4" = "8.4.0"; + "11.5" = "8.4.0"; + "11.6" = "8.4.0"; + }.${cudaVersion}; + +in tensorRTPackages diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix new file mode 100644 index 000000000000..3447087051f1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix @@ -0,0 +1,90 @@ +{ lib +, stdenv +, requireFile +, autoPatchelfHook +, autoAddOpenGLRunpathHook +, cudaVersion +, cudatoolkit +, cudnn +}: + +{ fullVersion +, fileVersionCudnn +, tarball +, sha256 +, supportedCudaVersions ? [ ] +}: + +assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) + "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; + +stdenv.mkDerivation rec { + pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; + version = fullVersion; + src = requireFile rec { + name = tarball; + inherit sha256; + message = '' + To use the TensorRT derivation, you must join the NVIDIA Developer Program and + download the ${version} Linux x86_64 TAR package for CUDA ${cudaVersion} from + ${meta.homepage}. + + Once you have downloaded the file, add it to the store with the following + command, and try building this derivation again. + + $ nix-store --add-fixed sha256 ${name} + ''; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoPatchelfHook + autoAddOpenGLRunpathHook + ]; + + # Used by autoPatchelfHook + buildInputs = [ + cudatoolkit.cc.cc.lib # libstdc++ + cudatoolkit + cudnn + ]; + + sourceRoot = "TensorRT-${version}"; + + installPhase = '' + install --directory "$dev" "$out" + mv include "$dev" + mv targets/x86_64-linux-gnu/lib "$out" + install -D --target-directory="$out/bin" targets/x86_64-linux-gnu/bin/trtexec + ''; + + # Tell autoPatchelf about runtime dependencies. + # (postFixup phase is run before autoPatchelfHook.) + postFixup = + let + mostOfVersion = builtins.concatStringsSep "." + (lib.take 3 (lib.versions.splitVersion version)); + in + '' + echo 'Patching RPATH of libnvinfer libs' + patchelf --debug --add-needed libnvinfer.so \ + "$out/lib/libnvinfer.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_plugin.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" + ''; + + meta = with lib; { + # Check that the cudatoolkit version satisfies our min/max constraints (both + # inclusive). We mark the package as broken if it fails to satisfies the + # official version constraints (as recorded in default.nix). In some cases + # you _may_ be able to smudge version constraints, just know that you're + # embarking into unknown and unsupported territory when doing so. + broken = !(elem cudaVersion supportedCudaVersions); + description = "TensorRT: a high-performance deep learning interface"; + homepage = "https://developer.nvidia.com/tensorrt"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/wcpg/default.nix b/nixpkgs/pkgs/development/libraries/science/math/wcpg/default.nix new file mode 100644 index 000000000000..8f14b940f383 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/wcpg/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, blas +, gmp +, lapack +, libf2c +, mpfi +, mpfr +}: + +stdenv.mkDerivation rec { + pname = "wcpg"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "fixif"; + repo = pname; + rev = version; + sha256 = "sha256-uA/ENjf4urEO+lqebkp/k54199o2434FYgPSmYCG4UA="; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + blas + gmp + lapack + libf2c + mpfi + mpfr + ]; + + meta = with lib; { + description = "Worst-Case Peak-Gain library"; + homepage = "https://github.com/fixif/WCPG"; + license = licenses.cecill-b; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix index 38d5d91e0837..3ec97e4a288e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -3,12 +3,12 @@ , fetchFromGitLab , fetchpatch , gmp -, python2 +, python3 , tune ? false # tune to hardware, impure }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; pname = "zn_poly"; # sage has picked up the maintenance (bug fixes and building, not development) @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "sagemath"; repo = "zn_poly"; rev = version; - sha256 = "0ra5vy585bqq7g3317iw6fp44iqgqvds3j0l1va6mswimypq4vxb"; + hash = "sha256-QBItcrrpOGj22/ShTDdfZjm63bGW2xY4c71R1q8abPE="; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - python2 # needed by ./configure to create the makefile + python3 # needed by ./configure to create the makefile ]; # name of library file ("libzn_poly.so") @@ -44,16 +44,6 @@ stdenv.mkDerivation rec { "--disable-tuning" ]; - patches = [ - # fix format-security by not passing variables directly to printf - # https://gitlab.com/sagemath/zn_poly/merge_requests/1 - (fetchpatch { - name = "format-security.patch"; - url = "https://gitlab.com/timokau/zn_poly/commit/1950900a80ec898d342b8bcafa148c8027649766.patch"; - sha256 = "1gks9chvsfpc6sg5h3nqqfia4cgvph7jmj9dw67k7dk7kv9y0rk1"; - }) - ]; - # `make install` fails to install some header files and the lib file. installPhase = '' mkdir -p "$out/include/zn_poly" diff --git a/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix index 3f0d50fd32be..b9f7946f7161 100644 --- a/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" "strictoverflow"]; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "http://www.nsnam.org"; license = licenses.gpl3; description = "A discrete time event network simulator"; diff --git a/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix index adf8bdd54b72..5e02398d1b4e 100644 --- a/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line tool that compiles a TensorFlow Lite model into an Edge TPU compatible file."; homepage = "https://coral.ai/docs/edgetpu/compiler"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ cpcloud ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/development/libraries/scmccid/default.nix b/nixpkgs/pkgs/development/libraries/scmccid/default.nix index f6b9194a608c..daa861b31ea7 100644 --- a/nixpkgs/pkgs/development/libraries/scmccid/default.nix +++ b/nixpkgs/pkgs/development/libraries/scmccid/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html"; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix index d665a6d94a5a..e354b3141a78 100644 --- a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - sha256 = "sha256-AjaZ6YmMlnN0jAcUBkft01XHkrze0nSr3dUMechsLrQ="; + sha256 = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/sealcurses/default.nix b/nixpkgs/pkgs/development/libraries/sealcurses/default.nix new file mode 100644 index 000000000000..bde530dd9d75 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sealcurses/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitea, cmake, pkg-config, ncurses, the-foundation }: + +stdenv.mkDerivation rec { + pname = "sealcurses"; + version = "unstable-2022-05-18"; # No release yet + + src = fetchFromGitea { + domain = "git.skyjake.fi"; + owner = "skyjake"; + repo = pname; + rev = "417d77d790ede990b4c149f21c58fd13b8f273cc"; + hash = "sha256-yOrJYy9vBv5n8yK6u7tfMq56LBBw5rmhUjORINW8gxo="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ ncurses the-foundation ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + meta = with lib; { + description = "SDL Emulation and Adaptation Layer for Curses (ncursesw)"; + homepage = "https://git.skyjake.fi/skyjake/sealcurses"; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/seasocks/default.nix b/nixpkgs/pkgs/development/libraries/seasocks/default.nix index fd53db0dcf91..044948a012e3 100644 --- a/nixpkgs/pkgs/development/libraries/seasocks/default.nix +++ b/nixpkgs/pkgs/development/libraries/seasocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib, catch2 }: stdenv.mkDerivation rec { pname = "seasocks"; @@ -11,9 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1f9a3mx3yjmr5qry4rc1c7mrx3348iifxm7d8sj8yd41kqnzmfv4"; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp src/test/c/catch/catch2/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python3 ]; + doCheck = true; + meta = with lib; { homepage = "https://github.com/mattgodbolt/seasocks"; description = "Tiny embeddable C++ HTTP and WebSocket server"; diff --git a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix index 0f7450320d6a..cc4dd1268e60 100644 --- a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.96"; + version = "0.1.97"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jo8XlQJsnWpeeezDjNNhh6T473XMqe8fsApUr82Y3BU="; + sha256 = "sha256-T6qQtLmuPKVha0CwX4fBH7IQoAlwVj64X2qDecWd7s8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 1c29b85bebe7..eafc773ef206 100644 --- a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.15"; + version = "0.5.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-XHJa4erDxSFiy0u8S9ODQlMNDb1wrz+d1PzWeq5BZLY="; + sha256 = "sha256-whbzoKIYLwj4yoFaT3frghJd/WzfpolSAuZzQRtnP5E="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/serd/default.nix b/nixpkgs/pkgs/development/libraries/serd/default.nix index 82237ef14341..1a1f3475c353 100644 --- a/nixpkgs/pkgs/development/libraries/serd/default.nix +++ b/nixpkgs/pkgs/development/libraries/serd/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with lib; { - homepage = "http://drobilla.net/software/serd"; description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; + homepage = "http://drobilla.net/software/serd"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; + mainProgram = "serdi"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix index f3b80c0b548f..5dd997352f13 100644 --- a/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "--with-fastcgi" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/signond/default.nix b/nixpkgs/pkgs/development/libraries/signond/default.nix index 7e986ed2635e..ff5aeca626eb 100644 --- a/nixpkgs/pkgs/development/libraries/signond/default.nix +++ b/nixpkgs/pkgs/development/libraries/signond/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "signond"; - version = "8.60"; + version = "8.61"; src = fetchFromGitLab { owner = "accounts-sso"; repo = pname; rev = "VERSION_${version}"; - sha256 = "pFpeJ13ut5EoP37W33WrYL2LzkX/k7ZKJcRpPO5l8i4="; + sha256 = "sha256-d7JZmGpjIvSN9l1nvKbBZjF0OR5L5frPTGHF/pNEqHE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index ea1bb4936834..a29706aefc48 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -35,17 +35,14 @@ stdenv.mkDerivation rec { sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt ''; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src/ - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src/ - ''; - doCheck = true; meta = with lib; { description = "An advanced font engine"; + homepage = "https://graphite.sil.org/"; + license = licenses.lgpl21; maintainers = [ maintainers.raskin ]; + mainProgram = "gr2fonttest"; platforms = platforms.unix; - license = licenses.lgpl21; }; } diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 56b76ba8875f..d8934a1ebf53 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "1.0.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-WuqBR1/Iqly+Y8kJxTuZLTVkR3ltXdyr+/6J3zhBNkQ="; + sha256 = "sha256-PU6yTA2FXHcuSwr6oIU+cP7uYxkgggnj3FV2LbkS69w="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DSIMDJSON_JUST_LIBRARY=ON" - ] ++ lib.optional stdenv.hostPlatform.isStatic "-DSIMDJSON_BUILD_STATIC=ON"; + "-DSIMDJSON_DEVELOPER_MODE=OFF" + ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; meta = with lib; { homepage = "https://simdjson.org/"; diff --git a/nixpkgs/pkgs/development/libraries/simgear/default.nix b/nixpkgs/pkgs/development/libraries/simgear/default.nix index c24c336c7289..2d6f6ef8d292 100644 --- a/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.12"; + version = "2020.3.13"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-W7KZzFU5qZE6tOv9YSzH3yoNi8YET2yzmThMcl23140="; + sha256 = "sha256-3AmQb9qLGBD+LLIrX1Fx0gi6kBxbnTkLrW0fP9ZsUeg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix index c38257dadb04..71a3b7ffee72 100644 --- a/nixpkgs/pkgs/development/libraries/simpleitk/default.nix +++ b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "2.1.1"; + version = "2.1.1.2"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "0ShUo9UVkliROIIR5bJtqlzESByfq9SQ1+Hy/40vJ50="; + sha256 = "sha256-sokJXOz6p+0eTeps5Tt24pjB3u+L1s6mDlaWN7K9m3g="; }; nativeBuildInputs = [ cmake swig4 ]; diff --git a/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/nixpkgs/pkgs/development/libraries/skalibs/default.nix index ddf2ee5b467d..19c8ea98ec91 100644 --- a/nixpkgs/pkgs/development/libraries/skalibs/default.nix +++ b/nixpkgs/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.11.1.0"; - sha256 = "1fga2kmzcp2llqv5nzrmgm33p1jz7y9pnaghzbxf8ldnsns800a0"; + version = "2.12.0.1"; + sha256 = "sha256-PiKPcvGNiMF/bE4KZogdbTd5Qnt+foifMUK28m2jAoU="; description = "A set of general-purpose C programming libraries"; diff --git a/nixpkgs/pkgs/development/libraries/slang/default.nix b/nixpkgs/pkgs/development/libraries/slang/default.nix index a3db5ce0d3be..53d69a7e549d 100644 --- a/nixpkgs/pkgs/development/libraries/slang/default.nix +++ b/nixpkgs/pkgs/development/libraries/slang/default.nix @@ -44,6 +44,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses ]; + buildFlags = lib.optional stdenv.hostPlatform.isStatic "static"; + installTargets = lib.optional stdenv.hostPlatform.isStatic "install-static"; + + preBuild = '' + makeFlagsArray+=(AR_CR="${stdenv.cc.targetPrefix}ar cr") + ''; + # slang 2.3.2 does not support parallel building enableParallelBuilding = false; @@ -77,6 +84,7 @@ stdenv.mkDerivation rec { homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "slsh"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/smesh/default.nix b/nixpkgs/pkgs/development/libraries/smesh/default.nix index 8494799333be..0181977873a9 100644 --- a/nixpkgs/pkgs/development/libraries/smesh/default.nix +++ b/nixpkgs/pkgs/development/libraries/smesh/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + meta = with lib; { description = "Extension to OCE providing advanced meshing features"; homepage = "https://github.com/tpaviot/smesh"; diff --git a/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/nixpkgs/pkgs/development/libraries/smpeg/default.nix index b671f47bf8cc..8b54cb37a32c 100644 --- a/nixpkgs/pkgs/development/libraries/smpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/smpeg/default.nix @@ -1,27 +1,29 @@ -{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { - pname = "smpeg-svn"; - version = "390"; - - src = fetchsvn { - url = "svn://svn.icculus.org/smpeg/trunk"; - rev = version; - sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0"; + pname = "smpeg"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "icculus"; + repo = "smpeg"; + rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs="; }; patches = [ ./format.patch ./gcc6.patch ./libx11.patch + ./gtk.patch ]; enableParallelBuilding = true; - buildInputs = [ SDL gtk2 libGLU libGL ]; - nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; + buildInputs = [ SDL gtk2 libGLU libGL ]; + preConfigure = '' touch NEWS AUTHORS ChangeLog sh autogen.sh @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/smpeg-config \ --prefix PATH ":" "${pkg-config}/bin" \ - --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" + --prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig" ''; NIX_LDFLAGS = "-lX11"; diff --git a/nixpkgs/pkgs/development/libraries/smpeg/gtk.patch b/nixpkgs/pkgs/development/libraries/smpeg/gtk.patch new file mode 100644 index 000000000000..8f9f2f492ed1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/smpeg/gtk.patch @@ -0,0 +1,15 @@ +diff '--color=auto' -Naur smpeg-r390.orig/acinclude/gtk-2.0.m4 smpeg-r390/acinclude/gtk-2.0.m4 +--- smpeg-r390.orig/acinclude/gtk-2.0.m4 1970-01-01 08:00:01.000000000 +0800 ++++ smpeg-r390/acinclude/gtk-2.0.m4 2021-12-16 15:52:17.776001058 +0800 +@@ -24,10 +24,8 @@ + + no_gtk="" + +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- + if test x$PKG_CONFIG != xno ; then +- if pkg-config --atleast-pkgconfig-version 0.7 ; then ++ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then + : + else + echo "*** pkg-config too old; version 0.7 or better required." diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix index d57cc91f26e2..48281ba04ec1 100644 --- a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix +++ b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix @@ -2,7 +2,7 @@ , autoconf , automake , darwin -, fetchsvn +, fetchFromGitHub , makeWrapper , pkg-config , SDL2 @@ -10,18 +10,15 @@ stdenv.mkDerivation rec { pname = "smpeg2"; - version = "unstable-2017-10-18"; + version = "unstable-2022-05-26"; - src = fetchsvn { - url = "svn://svn.icculus.org/smpeg/trunk"; - rev = "413"; - sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77"; + src = fetchFromGitHub { + owner = "icculus"; + repo = "smpeg"; + rev = "c5793e5f3f2765fc09c24380d7e92136a0e33d3b"; + sha256 = "sha256-Z0u83K1GIXd0jUYo5ZyWUH2Zt7Hn8z+yr06DAtAEukw="; }; - patches = [ - ./hufftable-uint_max.patch - ]; - nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ]; buildInputs = [ SDL2 ] diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch b/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch deleted file mode 100644 index 165feb4428c2..000000000000 --- a/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/audio/hufftable.cpp -+++ b/audio/hufftable.cpp -@@ -9,6 +9,7 @@ - #include "config.h" - #endif - -+#include <climits> - #include "MPEGaudio.h" - - static const unsigned int -@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, - - const HUFFMANCODETABLE MPEGaudio::ht[HTN]= - { -- { 0, 0-1, 0-1, 0, 0, htd33}, -+ { 0, UINT_MAX, UINT_MAX, 0, 0, htd33}, - { 1, 2-1, 2-1, 0, 7,htd01}, - { 2, 3-1, 3-1, 0, 17,htd02}, - { 3, 3-1, 3-1, 0, 17,htd03}, -- { 4, 0-1, 0-1, 0, 0, htd33}, -+ { 4, UINT_MAX, UINT_MAX, 0, 0, htd33}, - { 5, 4-1, 4-1, 0, 31,htd05}, - { 6, 4-1, 4-1, 0, 31,htd06}, - { 7, 6-1, 6-1, 0, 71,htd07}, -@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN - {11, 8-1, 8-1, 0,127,htd11}, - {12, 8-1, 8-1, 0,127,htd12}, - {13,16-1,16-1, 0,511,htd13}, -- {14, 0-1, 0-1, 0, 0, htd33}, -+ {14, UINT_MAX, UINT_MAX, 0, 0, htd33}, - {15,16-1,16-1, 0,511,htd15}, - {16,16-1,16-1, 1,511,htd16}, - {17,16-1,16-1, 2,511,htd16}, diff --git a/nixpkgs/pkgs/development/libraries/snack/default.nix b/nixpkgs/pkgs/development/libraries/snack/default.nix deleted file mode 100644 index 1c876cf36360..000000000000 --- a/nixpkgs/pkgs/development/libraries/snack/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -# alsa-lib vorbis-tools python2 can be made optional - -{ lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: - -stdenv.mkDerivation rec { - pname = "snack"; - version = "2.2.10"; - - src = fetchurl { - url = "https://www.speech.kth.se/snack/dist/${pname}${version}.tar.gz"; - sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; - }; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ]; - - postUnpack = ''sourceRoot="$sourceRoot/unix"''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ]; - - hardeningDisable = [ "format" ]; - - postInstall = "aoeu"; - - installPhase = '' - mkdir -p $out - make install DESTDIR="$out" - ''; - - meta = { - description = "The Snack Sound Toolkit (Tcl)"; - homepage = "https://www.speech.kth.se/snack/"; - license = lib.licenses.gpl2; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix index 797db5b69b0c..7d70c500dfac 100644 --- a/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DSNAPPY_BUILD_TESTS=OFF" "-DSNAPPY_BUILD_BENCHMARKS=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/soci/bc-soci.nix b/nixpkgs/pkgs/development/libraries/soci/bc-soci.nix new file mode 100644 index 000000000000..d728d61a8f57 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/soci/bc-soci.nix @@ -0,0 +1,53 @@ +{ cmake +, fetchFromGitLab +, fetchpatch +, sqlite +, boost +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "bc-soci"; + version = "linphone-4.4.1"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + group = "BC"; + owner = "public/external"; + repo = "soci"; + rev = "bc8ce0c5628dd48eca6ef5ce0a0a2f52547d88b6"; + sha256 = "sha256-qo26aYp/G2C6UkGA1qkHQwTKD5go7TQ9JWxb9xtbe6M="; + }; + + patches = [ + (fetchpatch { + name = "fix-backend-search-path.patch"; + url = "https://github.com/SOCI/soci/commit/56c93afc467bdba8ffbe68739eea76059ea62f7a.patch"; + sha256 = "sha256-nC/39pn3Cv5e65GgIfF3l64/AbCsfZHPUPIWETZFZAY="; + }) + ]; + + cmakeFlags = [ + # Do not build static libraries + "-DSOCI_SHARED=YES" + "-DSOCI_STATIC=OFF" + + "-DSOCI_TESTS=NO" + "-DWITH_SQLITE3=YES" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + sqlite + boost + ]; + + meta = with lib; { + description = "Database access library for C++. Belledonne Communications' fork for Linphone."; + homepage = "https://gitlab.linphone.org/BC/public/external/soci"; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ thibaultlemaire ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/soci/default.nix b/nixpkgs/pkgs/development/libraries/soci/default.nix index b17fbe16655b..142081da0153 100644 --- a/nixpkgs/pkgs/development/libraries/soci/default.nix +++ b/nixpkgs/pkgs/development/libraries/soci/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; # Do not build static libraries - cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; + cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" "-DSOCI_TESTS=off" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix index 1f68f044cda5..19dfb62002e2 100644 --- a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "socket_wrapper"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-G42i+w7n3JkPvOc039I+frzDnq1GGGyQqUkMFdoebhM="; + sha256 = "sha256-dmYeXGXbe05WiT2ZDrH4aCmymDjj8SqrZyEc3d0Uf0Y="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/sokol/default.nix b/nixpkgs/pkgs/development/libraries/sokol/default.nix new file mode 100644 index 000000000000..daf1509e5852 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sokol/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "sokol"; + version = "unstable-2022-06-13"; + + src = fetchFromGitHub { + owner = "floooh"; + repo = "sokol"; + rev = "3c7016105f3b7463f0cfc74df8a55642e5448c11"; + sha256 = "sha256-dKHb6GTp5aJPuWWXI4ZYnhgdXs23gGWyPymGPGwxcLY="; + }; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include/sokol + cp *.h $out/include/sokol/ + cp -R util $out/include/sokol/util + + runHook postInstall + ''; + + meta = with lib; { + description = "Minimal cross-platform standalone C headers"; + homepage = "https://github.com/floooh/sokol"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ jonnybolton ]; + }; +} + diff --git a/nixpkgs/pkgs/development/libraries/sope/default.nix b/nixpkgs/pkgs/development/libraries/sope/default.nix index 39b2d7fd8fd5..83442035d7b4 100644 --- a/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.5.1"; + version = "5.7.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "sha256-w78YO5EQWtEiySOm9NpPbaMChbJppNBoZNOBs9fibbM="; + sha256 = "sha256-mS685NOB6IN3a5tE3yr+VUq55Ouc5af9aJ2wTfGsAlo="; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/development/libraries/soundtouch/default.nix b/nixpkgs/pkgs/development/libraries/soundtouch/default.nix index b29095f7e199..b03a7cc07228 100644 --- a/nixpkgs/pkgs/development/libraries/soundtouch/default.nix +++ b/nixpkgs/pkgs/development/libraries/soundtouch/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { description = "A program and library for changing the tempo, pitch and playback rate of audio"; homepage = "https://www.surina.net/soundtouch/"; license = licenses.lgpl21Plus; - platforms = platforms.all; maintainers = with maintainers; [ orivej ]; + mainProgram = "soundstretch"; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index e4884b85b4ae..23464990d869 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -10,9 +10,19 @@ , libuuid , numactl , openssl +, fetchurl }: -stdenv.mkDerivation rec { +let + # The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568 + dpdk' = dpdk.overrideAttrs (old: rec { + name = "dpdk-21.11"; + src = fetchurl { + url = "https://fast.dpdk.org/rel/${name}.tar.xz"; + sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E="; + }; + }); +in stdenv.mkDerivation rec { pname = "spdk"; version = "21.10"; @@ -40,7 +50,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - cunit dpdk libaio libbsd libuuid numactl openssl ncurses + cunit dpdk' libaio libbsd libuuid numactl openssl ncurses ]; postPatch = '' @@ -49,7 +59,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--with-dpdk=${dpdk}" ]; + configureFlags = [ "--with-dpdk=${dpdk'}" ]; NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index d4e0888ffd2f..9c61ef70624d 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }: +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 +, staticBuild ? stdenv.hostPlatform.isStatic +}: let generic = { version, sha256 }: @@ -18,8 +20,8 @@ let propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" + "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" + "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON" @@ -36,7 +38,6 @@ let ''; doCheck = true; - preCheck = "export LD_LIBRARY_PATH=$(pwd)\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"; meta = with lib; { description = "Very fast, header only, C++ logging library"; @@ -49,8 +50,8 @@ let in { spdlog_1 = generic { - version = "1.9.2"; - sha256 = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y="; + version = "1.10.0"; + sha256 = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws="; }; spdlog_0 = generic { diff --git a/nixpkgs/pkgs/development/libraries/spectra/default.nix b/nixpkgs/pkgs/development/libraries/spectra/default.nix new file mode 100644 index 000000000000..1fc3ccd75765 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/spectra/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, eigen +}: + +stdenv.mkDerivation rec { + pname = "spectra"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "yixuan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HaJmMo4jYmO/j53/nHrL3bvdQMAvp4Nuhhe8Yc7pL88="; + }; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ eigen ]; + + meta = with lib; { + homepage = "https://spectralib.org/"; + description = "A C++ library for large scale eigenvalue problems, built on top of Eigen"; + license = licenses.mpl20; + maintainers = with maintainers; [ vonfry ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/speech-tools/default.nix b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix index c69345193c77..e0ca78df79a4 100644 --- a/nixpkgs/pkgs/development/libraries/speech-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib ncurses ]; + # Workaround build failure on -fno-common toolchains: + # ld: libestools.a(editline.o):(.bss+0x28): multiple definition of + # `editline_history_file'; libestools.a(siodeditline.o):(.data.rel.local+0x8): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) diff --git a/nixpkgs/pkgs/development/libraries/spglib/default.nix b/nixpkgs/pkgs/development/libraries/spglib/default.nix index 6d973f36c02b..e1472b594a40 100644 --- a/nixpkgs/pkgs/development/libraries/spglib/default.nix +++ b/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -1,24 +1,27 @@ -{ stdenv, lib, fetchFromGitHub, cmake } : +{ stdenv, lib, fetchFromGitHub, cmake, openmp }: stdenv.mkDerivation rec { pname = "spglib"; - version = "1.16.3"; + version = "1.16.5"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { - owner = "atztogo"; + owner = "spglib"; repo = "spglib"; rev = "v${version}"; - sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk="; + sha256 = "sha256-BbqyL7WJ/jpOls1MmY7VNCN+OlF6u4uz/pZjMAqk87w="; }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + checkTarget = "check"; doCheck = true; meta = with lib; { description = "C library for finding and handling crystal symmetries"; - homepage = "https://atztogo.github.io/spglib/"; + homepage = "https://spglib.github.io/spglib/"; + changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog"; license = licenses.bsd3; maintainers = [ maintainers.markuskowa ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix b/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix deleted file mode 100644 index 43a70c50fed4..000000000000 --- a/nixpkgs/pkgs/development/libraries/sphinxbase/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchurl -, bison -, pkg-config -, python27 # >= 2.6 -, swig2 # 2.0 -, multipleOutputs ? false #Uses incomplete features of nix! -}: - -stdenv.mkDerivation (rec { - pname = "sphinxbase"; - version = "5prealpha"; - - src = fetchurl { - url = "mirror://sourceforge/cmusphinx/sphinxbase-${version}.tar.gz"; - sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ swig2 python27 bison ]; - - meta = { - description = "Support Library for Pocketsphinx"; - homepage = "http://cmusphinx.sourceforge.net"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ]; - }; - -} // (lib.optionalAttrs multipleOutputs { - outputs = [ "out" "lib" "headers" ]; - - postInstall = '' - mkdir -p $lib - cp -av $out/lib* $lib - - mkdir -p $headers - cp -av $out/include $headers - ''; -})) diff --git a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index db5db61c6e99..7a647084f9cd 100644 --- a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , acl , cyrus_sasl @@ -33,7 +34,7 @@ , vala , wayland-protocols , zlib -, withPolkit ? true +, withPolkit ? stdenv.isLinux }: # If this package is built with polkit support (withPolkit=true), @@ -59,13 +60,13 @@ stdenv.mkDerivation rec { pname = "spice-gtk"; - version = "0.40"; + version = "0.41"; outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz"; - sha256 = "sha256-I/X/f6gLdWR85zzaXq+LMi80Mtu7f286g5Y0YYrbztM="; + sha256 = "sha256-2Pi1y+qRhHAu64zCdqZ9cqzbbjbnxzNJ+4RF5byglp8="; }; postPatch = '' @@ -95,7 +96,8 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; buildInputs = [ @@ -104,8 +106,6 @@ stdenv.mkDerivation rec { gtk3 json-glib libcacard - libcap_ng - libdrm libjpeg_turbo libopus libusb1 @@ -115,9 +115,15 @@ stdenv.mkDerivation rec { pixman spice-protocol usbredir - wayland-protocols zlib - ] ++ lib.optionals withPolkit [ polkit acl ] ; + ] ++ lib.optionals withPolkit [ + polkit + acl + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng + libdrm + wayland-protocols + ]; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; @@ -126,6 +132,8 @@ stdenv.mkDerivation rec { "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" ] ++ lib.optionals (!withPolkit) [ "-Dpolkit=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dlibcap-ng=disabled" ]; meta = with lib; { @@ -140,6 +148,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; maintainers = [ maintainers.xeji ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index d9516538163b..379b6b7c1bb2 100644 --- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.2.198.0"; + version = "1.3.211.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - sha256 = "sha256-cdEiRSCoX0New8ecUh7UTDz/is2v29zhf6Il2N1j3mw="; + sha256 = "sha256-LkIrTFWYvZffLVJJW3152um5LTEsMJEDEsIhBAdhBlk="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sptk/default.nix b/nixpkgs/pkgs/development/libraries/sptk/default.nix new file mode 100644 index 000000000000..6b62b831cb98 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sptk/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "sptk"; + version = "4.0"; + + src = fetchFromGitHub { + owner = "sp-nitech"; + repo = "SPTK"; + rev = "v${version}"; + hash = "sha256-Be3Pbg+vt/P3FplZN7yBL+HVq/BmzaBcwKOBsbH7r9g="; + }; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = with lib; { + changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}"; + description = "Suite of speech signal processing tools"; + homepage = "https://github.com/sp-nitech/SPTK"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 5fdf6c11d77b..0c90d2a70602 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchurl, zlib, interactive ? false, readline, ncurses -, python3Packages +{ lib, stdenv, fetchurl, zlib, readline, ncurses + +# for tests +, python3Packages, sqldiff, sqlite-analyzer + +# uses readline & ncurses for a better interactive experience if set to true +, interactive ? false +# TODO: can be removed since 3.36 since it is the default now. , enableDeserialize ? false }: @@ -11,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.37.2"; + version = "3.39.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-QImo2bRnU3s/JG8he4TNduALHRqXH+WsoeMOIw5Gstg="; + sha256 = "sha256-hSvophg6F7pHzuC7/3QAt6pa/9KDvzvu/DT80IiiOd4="; }; outputs = [ "bin" "dev" "out" ]; @@ -85,6 +91,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (python3Packages) sqlalchemy; + inherit sqldiff sqlite-analyzer; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index d8d3735fe3d8..1d559dcb38bf 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -2,14 +2,14 @@ let archiveVersion = import ./archive-version.nix lib; - mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { + mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.37.2"; + version = "3.39.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-SGdwtNX4i1uw26VA3W7hdjBn11Od/uGKfGb+m7A9Ftk="; + sha256 = "sha256-6TPXcAD0Xz+8hgXwBQWGowE1Bajem0QDK9AO1y8VhvA="; }; nativeBuildInputs = [ unzip ]; @@ -20,7 +20,7 @@ let installPhase = "install -Dt $out/bin ${makeTarget}"; meta = with lib; { - inherit description homepage; + inherit description homepage mainProgram; downloadPage = "http://sqlite.org/download.html"; license = licenses.publicDomain; maintainers = with maintainers; [ johnazoidberg ]; @@ -34,11 +34,13 @@ in makeTarget = "sqldiff"; description = "A tool that displays the differences between SQLite databases"; homepage = "https://www.sqlite.org/sqldiff.html"; + mainProgram = "sqldiff"; }; sqlite-analyzer = mkTool { pname = "sqlite-analyzer"; makeTarget = "sqlite3_analyzer"; description = "A tool that shows statistics about SQLite databases"; homepage = "https://www.sqlite.org/sqlanalyze.html"; + mainProgram = "sqlite3_analyzer"; }; } diff --git a/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix b/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix index 60724aaa8046..ff2556d12479 100644 --- a/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cppcheck gtest ]; - buildInputs = [ sqlite ]; + checkInputs = [ cppcheck ]; + buildInputs = [ sqlite gtest ]; doCheck = true; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/stb/default.nix b/nixpkgs/pkgs/development/libraries/stb/default.nix index 22a97d890e56..fee0cb42164e 100644 --- a/nixpkgs/pkgs/development/libraries/stb/default.nix +++ b/nixpkgs/pkgs/development/libraries/stb/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "stb"; version = "unstable-2021-09-10"; @@ -11,11 +11,28 @@ stdenv.mkDerivation { sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr"; }; + nativeBuildInputs = [ copyPkgconfigItems ]; + + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "stb"; + version = "1"; + cflags = [ "-I${variables.includedir}/stb" ]; + variables = rec { + prefix = "${placeholder "out"}"; + includedir = "${prefix}/include"; + }; + inherit (meta) description; + }) + ]; + dontBuild = true; installPhase = '' + runHook preInstall mkdir -p $out/include/stb cp *.h $out/include/stb/ + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/stlport/default.nix b/nixpkgs/pkgs/development/libraries/stlport/default.nix deleted file mode 100644 index 75004b87ee72..000000000000 --- a/nixpkgs/pkgs/development/libraries/stlport/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "STLport"; - version = "5.2.1"; - - src = fetchurl { - url = "mirror://sourceforge/stlport/${pname}-${version}.tar.bz2"; - sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm"; - }; - - # fix hardcoded /usr/bin; not recognizing the standard --disable-static flag - configurePhase = '' - echo Preconf: build/Makefiles/gmake/*/sys.mak - for f in build/Makefiles/gmake/*/sys.mak; do - substituteInPlace "$f" --replace /usr/bin/ "" - done - ./configure --prefix=$out - ''; - - meta = { - description = "An implementation of the C++ Standard Library"; - homepage = "https://sourceforge.net/projects/stlport/"; - license = lib.licenses.free; # seems BSD-like - broken = true; # probably glibc-2.20 -related issue - }; -} diff --git a/nixpkgs/pkgs/development/libraries/stxxl/default.nix b/nixpkgs/pkgs/development/libraries/stxxl/default.nix index 391424ee2c93..499532092f02 100644 --- a/nixpkgs/pkgs/development/libraries/stxxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/stxxl/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; maintainers = with maintainers; [ ]; + mainProgram = "stxxl_tool"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix index 75c238a430c4..3093c5330a88 100644 --- a/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -12,16 +12,19 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "5.7.0"; + version = "6.3.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM="; + hash = "sha256-iaIr6oIP8lCqcjn2NKsH+jTv4dLc/eKcyNOvEUVboqc="; }; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ + cmake + gfortran + ]; buildInputs = [ python @@ -32,9 +35,8 @@ stdenv.mkDerivation rec { blas lapack ]) - # KLU support is based on Suitesparse. - # It is tested upstream according to the section 1.1.4 of - # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) + # KLU support is based on Suitesparse. It is tested upstream according to the + # section 1.1.4.2 of INSTALL_GUIDE.pdf found in the source tarball. ++ lib.optionals (kluSupport) [ suitesparse ]; @@ -59,12 +61,27 @@ stdenv.mkDerivation rec { )] ; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/127608 + # + # build error: + # + # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. + # ldr x0, [x0, ___stack_chk_guard];momd + # ^ + # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. + # ldr x0, [x0, ___stack_chk_guard];momd + # + # See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983 + + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + doCheck = true; checkTarget = "test"; meta = with lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = "https://computation.llnl.gov/projects/sundials"; + homepage = "https://computing.llnl.gov/projects/sundials"; platforms = platforms.all; maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix b/nixpkgs/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix new file mode 100644 index 000000000000..76cc0d3e30ef --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix @@ -0,0 +1,42 @@ +{ lib +, clangStdenv +, fetchFromGitHub +, cmake +, ninja +, libbsd +, libsystemtap +}: + +let + version = "5.5"; +in clangStdenv.mkDerivation { + pname = "swift-corelibs-libdispatch"; + inherit version; + + outputs = [ "out" "dev" "man" ]; + + src = fetchFromGitHub { + owner = "apple"; + repo = "swift-corelibs-libdispatch"; + rev = "swift-${version}-RELEASE"; + sha256 = "sha256-MbLgmS6qRSRT+2dGqbYTNb5MTM4Wz/grDXFk1kup+jk="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + libbsd + libsystemtap + ]; + + meta = { + description = "Grand Central Dispatch"; + homepage = "https://github.com/apple/swift-corelibs-libdispatch"; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.cmm ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/swiften/default.nix b/nixpkgs/pkgs/development/libraries/swiften/default.nix index ef30c5916eab..848fd57336ee 100644 --- a/nixpkgs/pkgs/development/libraries/swiften/default.nix +++ b/nixpkgs/pkgs/development/libraries/swiften/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, python2 , libidn , lua , miniupnpc @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python2 libidn lua miniupnpc diff --git a/nixpkgs/pkgs/development/libraries/sword/default.nix b/nixpkgs/pkgs/development/libraries/sword/default.nix index 35c1e6e15e29..8871a66fd8c9 100644 --- a/nixpkgs/pkgs/development/libraries/sword/default.nix +++ b/nixpkgs/pkgs/development/libraries/sword/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { texts in around 100 languages. ''; license = licenses.gpl2; - maintainers = with maintainers; [ piotr AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix index cbe5e13a7007..5cb2e2117863 100644 --- a/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -5,6 +5,7 @@ , flint , mpfr , libmpc +, catch }: stdenv.mkDerivation rec { @@ -18,6 +19,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-5KpxBusJCuwrfFWHbrRKlH6Ic7YivYqz2m+BCbNfZp0="; }; + postPatch = '' + cp ${catch}/include/catch/catch.hpp symengine/utilities/catch/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ gmp flint mpfr libmpc ]; diff --git a/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix index e2f611ed9d11..64746d84572a 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -1,22 +1,18 @@ { lib, stdenv , fetchurl -, Carbon ? null -, libjpeg ? null -, libpng ? null +, Carbon +, libjpeg +, libpng , withJpegSupport ? true # support jpeg output , withPngSupport ? true # support png output }: -assert withJpegSupport -> libjpeg != null; -assert withPngSupport -> libpng != null; -assert stdenv.isDarwin -> Carbon != null; - stdenv.mkDerivation rec { pname = "tachyon"; - version = "0.99.3"; + version = "0.99.5"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-rsxxm1NK2IPRl/5O2Ng2sC1VH84Zj1uJ6mN+HZHyN+E="; + sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Carbon diff --git a/nixpkgs/pkgs/development/libraries/talloc/default.nix b/nixpkgs/pkgs/development/libraries/talloc/default.nix index 07d830f00ce7..cb7af61a63ed 100644 --- a/nixpkgs/pkgs/development/libraries/talloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/talloc/default.nix @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - fixDarwinDylibNames python3 wafHook docbook-xsl-nons docbook_xml_dtd_42 + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/taskflow/default.nix b/nixpkgs/pkgs/development/libraries/taskflow/default.nix new file mode 100644 index 000000000000..dd2f8fb39144 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/taskflow/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, doctest +, cmake +}: + +stdenv.mkDerivation rec { + pname = "taskflow"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "taskflow"; + repo = "taskflow"; + rev = "v${version}"; + hash = "sha256-5bTTV/WAxslHQ+hvATtUUA1h3MuNzwVTlYMbD/sINRM="; + }; + + patches = [ + (substituteAll { + src = ./unvendor-doctest.patch; + inherit doctest; + }) + ]; + + postPatch = '' + rm -r 3rd-party + + # tries to use x86 intrinsics on aarch64-darwin + sed -i '/^#if __has_include (<immintrin\.h>)/,/^#endif/d' taskflow/utility/os.hpp + ''; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = { + description = "General-purpose Parallel and Heterogeneous Task Programming System"; + homepage = "https://taskflow.github.io/"; + changelog = let + release = lib.replaceStrings ["."] ["-"] version; + in "https://taskflow.github.io/taskflow/release-${release}.html"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/nixpkgs/pkgs/development/libraries/taskflow/unvendor-doctest.patch new file mode 100644 index 000000000000..85f2e1fcff98 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/taskflow/unvendor-doctest.patch @@ -0,0 +1,21 @@ +diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt +index 3397d798..8277191e 100644 +--- a/unittests/CMakeLists.txt ++++ b/unittests/CMakeLists.txt +@@ -1,6 +1,6 @@ + enable_testing() + +-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake) ++include(@doctest@/lib/cmake/doctest/doctest.cmake) + + list(APPEND TF_UNITTESTS + utility +@@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS + foreach(unittest IN LISTS TF_UNITTESTS) + add_executable(${unittest} ${unittest}.cpp) + target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) +- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) ++ target_include_directories(${unittest} PRIVATE @doctest@/include/doctest) + doctest_discover_tests(${unittest}) + endforeach() + diff --git a/nixpkgs/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix index 7913f05354d4..4617614b25ee 100644 --- a/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -28,6 +28,21 @@ stdenv.mkDerivation rec { url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; }) + + # Fixes build with upcoming gcc-13: + # https://github.com/oneapi-src/oneTBB/pull/833 + (fetchurl { + name = "gcc-13.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; + sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; + }) + + # Fixes build for aarch64-darwin + (fetchurl { + name = "aarch64-darwin.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; + sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; + }) ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 4dedc13db2a8..0196e62fb977 100644 --- a/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; # https://github.com/tdlib/td/issues/1790 - rev = "92c2a9c4e521df720abeaa9872e1c2b797d5c93f"; - sha256 = "ZoKsgdkS78mptfbxkkV4pgcgJEaWwKZWK2cvmxgJN4E="; + rev = "054a823c1a812ee3e038f702c6d8ba3e6974be9c"; + sha256 = "sha256-YlvIGR3Axej0nfcGBQ5lwwYVWsLgqFrYgOxoNubYMPM="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/tecla/default.nix b/nixpkgs/pkgs/development/libraries/tecla/default.nix index 11918d76da6c..7163f24815c5 100644 --- a/nixpkgs/pkgs/development/libraries/tecla/default.nix +++ b/nixpkgs/pkgs/development/libraries/tecla/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; + homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; license = "as-is"; - + mainProgram = "enhance"; platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/template-glib/default.nix b/nixpkgs/pkgs/development/libraries/template-glib/default.nix index 375a7c3237a5..23d2e8907ff1 100644 --- a/nixpkgs/pkgs/development/libraries/template-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/template-glib/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "nsm3HgTU9csU91XveQYxzQtFwGA+Ecg2/Hz9niaM0Ho="; }; - buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - nativeBuildInputs = [ glib gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection ]; + buildInputs = [ glib ]; mesonFlags = [ "-Denable_gtk_doc=true" diff --git a/nixpkgs/pkgs/development/libraries/tepl/default.nix b/nixpkgs/pkgs/development/libraries/tepl/default.nix index f561efb473c5..e7918ea56e29 100644 --- a/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -9,17 +9,19 @@ , gtksourceview4 , icu , pkg-config +, gtk-doc +, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "tepl"; - version = "6.00.0"; + version = "6.0.2"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8"; + sha256 = "W0qcbGG9AAVT75eZ9MpiXQX1gBA2+ywvkopJRIyQPAk="; }; nativeBuildInputs = [ @@ -27,6 +29,8 @@ stdenv.mkDerivation rec { ninja gobject-introspection pkg-config + gtk-doc + docbook-xsl-nons ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/termcolor/default.nix b/nixpkgs/pkgs/development/libraries/termcolor/default.nix index 3d9458341211..fbae29f4ca58 100644 --- a/nixpkgs/pkgs/development/libraries/termcolor/default.nix +++ b/nixpkgs/pkgs/development/libraries/termcolor/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "termcolor"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ikalnytskyi"; repo = "termcolor"; rev = "v${version}"; - sha256 = "sha256-W0hB+lFJ2sm7DsbOzITOtjJuntSM55BfwUunOOS4RcA="; + sha256 = "sha256-2RXQ8sn2VNhQ2WZfwCCeQuM6x6C+sLA6ulAaFtaDMZw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/the-foundation/default.nix b/nixpkgs/pkgs/development/libraries/the-foundation/default.nix new file mode 100644 index 000000000000..012d13964c4b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/the-foundation/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitea +, cmake +, pkg-config +, curl +, libunistring +, openssl +, pcre +, zlib +}: + +stdenv.mkDerivation rec { + pname = "the-foundation"; + version = "1.4.0"; + + src = fetchFromGitea { + domain = "git.skyjake.fi"; + owner = "skyjake"; + repo = "the_Foundation"; + rev = "v${version}"; + hash = "sha256-IHwWJryG4HcrW9Bf8KJrisCrbF86RBQj6Xl1HTmcr6k="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ curl libunistring openssl pcre zlib ]; + + meta = with lib; { + description = "Opinionated C11 library for low-level functionality"; + homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index f85e56578bbe..a4ae0a99f92d 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config -, bison, flex +{ lib +, stdenv +, fetchurl +, fetchpatch +, boost +, zlib +, libevent +, openssl +, python3 +, cmake +, pkg-config +, bison +, flex , static ? stdenv.hostPlatform.isStatic }: @@ -12,20 +23,54 @@ stdenv.mkDerivation rec { sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk="; }; - # Workaround to make the python wrapper not drop this package: + # Workaround to make the Python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ cmake pkg-config bison flex ]; - buildInputs = [ boost zlib libevent openssl ] - ++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ]; + nativeBuildInputs = [ + bison + cmake + flex + pkg-config + ]; + + buildInputs = [ + boost + libevent + openssl + zlib + ] ++ lib.optionals (!static) [ + (python3.withPackages (ps: [ps.twisted])) + ]; + + postPatch = '' + # Python 3.10 related failures: + # SystemError: PY_SSIZE_T_CLEAN macro must be defined for '#' formats + # AttributeError: module 'collections' has no attribute 'Hashable' + substituteInPlace test/py/RunClientServer.py \ + --replace "'FastbinaryTest.py'," "" \ + --replace "'TestEof.py'," "" \ + --replace "'TestFrozen.py'," "" + ''; - preConfigure = "export PY_PREFIX=$out"; + preConfigure = '' + export PY_PREFIX=$out + ''; patches = [ # ToStringTest.cpp is failing from some reason due to locale issue, this # doesn't disable all UnitTests as in Darwin. ./disable-failing-test.patch + (fetchpatch { + name = "tests-expired-certs.diff"; # https://github.com/apache/thrift/pull/2629 + url = "https://github.com/apache/thrift/commit/54765854873e19b8ba50a0ec8080dd92d8323851.diff"; + sha256 = "wnG2MjY0DtAhVcEdcxu77tDa4T9Xm2pMYZU2wXLx2OA="; + }) + (fetchpatch { + name = "setuptools-gte-62.1.0.patch"; + url = "https://github.com/apache/thrift/pull/2635/commits/c41ad9d5119e9bdae1746167e77e224f390f2c42.patch"; + hash = "sha256-FkErrg/6vXTomS4AsCsld7t+Iccc55ZiDaNjJ3W1km0="; + }) ]; cmakeFlags = [ @@ -43,12 +88,12 @@ stdenv.mkDerivation rec { disabledTests = [ "PythonTestSSLSocket" ] ++ lib.optionals stdenv.isDarwin [ - # tests that hang up in the darwin sandbox + # Tests that hang up in the Darwin sandbox "SecurityTest" "SecurityFromBufferTest" "python_test" - # tests that fail in the darwin sandbox when trying to use network + # Tests that fail in the Darwin sandbox when trying to use network "UnitTests" "TInterruptTest" "TServerIntegrationTest" @@ -62,6 +107,7 @@ stdenv.mkDerivation rec { ]; doCheck = !static; + checkPhase = '' runHook preCheck @@ -69,6 +115,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; + enableParallelChecking = false; meta = with lib; { @@ -76,6 +123,6 @@ stdenv.mkDerivation rec { homepage = "https://thrift.apache.org/"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix index 1e2eea7ac899..c576405bb3b6 100644 --- a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix +++ b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple, small, efficient, C++ XML parser"; - homepage = "http://www.grinninglizard.com/tinyxml2/index.html"; + homepage = "https://www.grinninglizard.com/tinyxml2/index.html"; platforms = lib.platforms.unix; license = lib.licenses.zlib; }; diff --git a/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/nixpkgs/pkgs/development/libraries/tkrzw/default.nix index 84a026be20fb..fc90c6e304fd 100644 --- a/nixpkgs/pkgs/development/libraries/tkrzw/default.nix +++ b/nixpkgs/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.21"; + version = "1.0.24"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-1g3sIRXxYtD8XGVNpbn4HLTCi+xl2yfJklbUouMQcHs="; + hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA="; }; enableParallelBuilding = true; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # memory intensive meta = with lib; { + broken = stdenv.isDarwin; description = "A set of implementations of DBM"; homepage = "https://dbmx.net/tkrzw/"; maintainers = with maintainers; [ ehmry ]; diff --git a/nixpkgs/pkgs/development/libraries/tllist/default.nix b/nixpkgs/pkgs/development/libraries/tllist/default.nix index ed957f95776c..e5cdad0aae63 100644 --- a/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -5,16 +5,16 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tllist"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "tllist"; - rev = version; - sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg="; + rev = finalAttrs.version; + hash = "sha256-4WW0jGavdFO3LX9wtMPzz3Z1APCPgUQOktpmwAM0SQw="; }; nativeBuildInputs = [ meson ninja ]; @@ -38,9 +38,8 @@ stdenv.mkDerivation rec { primitive data types are supported as well as aggregated ones such as structs, enums and unions. ''; - license = licenses.mit; maintainers = with maintainers; [ fionera AndersonTorres ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/tomlc99/default.nix b/nixpkgs/pkgs/development/libraries/tomlc99/default.nix new file mode 100644 index 000000000000..5ed4fd07b472 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tomlc99/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "tomlc99"; + version = "0.pre+date=2022-04-04"; + + src = fetchFromGitHub { + owner = "cktan"; + repo = pname; + rev = "4e7b082ccc44316f212597ae5b09a35cf9329e69"; + hash = "sha256-R9OBMG/aUa80Qw/zqaks63F9ybQcThfOYRsHP4t1Gv8="; + }; + + dontConfigure = true; + + installFlags = [ + "prefix=${placeholder "out"}" + ]; + + meta = with lib; { + homepage = "https://github.com/cktan/tomlc99"; + description = "TOML v1.0.0-compliant library written in C99"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff b/nixpkgs/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff new file mode 100644 index 000000000000..3559facf3b54 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff @@ -0,0 +1,15 @@ +diff -Naur old-source/tomlcpp.hpp new-source/tomlcpp.hpp +--- tomlcpp/tomlcpp.hpp 1969-12-31 21:00:01.000000000 -0300 ++++ tomlcpp/tomlcpp.hpp 2022-04-14 12:50:14.269775437 -0300 +@@ -25,6 +25,11 @@ + #ifndef TOML_HPP + #define TOML_HPP + ++#include <memory> ++#include <string> ++#include <utility> ++#include <vector> ++ + struct toml_table_t; + struct toml_array_t; + diff --git a/nixpkgs/pkgs/development/libraries/tomlcpp/default.nix b/nixpkgs/pkgs/development/libraries/tomlcpp/default.nix new file mode 100644 index 000000000000..96559f04541b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tomlcpp/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "tomlcpp"; + version = "0.pre+date=2022-05-01"; + + src = fetchFromGitHub { + owner = "cktan"; + repo = pname; + rev = "59fcc6dc89fb3f4130a2865e41e1fa5b8c502e45"; + hash = "sha256-Uc6R5KnGIZXY0EJgFM4Xi7Jtxcu6l8yGh5xgFZPoJDM="; + }; + + patches = [ + # Self-explaining + ./0001-missing-headers.diff + ]; + + dontConfigure = true; + + installFlags = [ + "prefix=${placeholder "out"}" + ]; + + meta = with lib;{ + homepage = "https://github.com/cktan/tomlcpp"; + description = "No fanfare TOML C++ Library"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 5ab4ff3b413f..34a545d7996a 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -2,6 +2,7 @@ , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which +, shadow }: let # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss, @@ -14,17 +15,18 @@ in stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "3.0.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "106yhsjwjadxsl9dqxywg287mdwsksman02hdalhav18vcnvnlpj"; + sha256 = "1jijxnvjcsgz5yw4i9fj7ycdnnz90r3l0zicpwinswrw47ac3yy5"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config doxygen perl + shadow ]; # cmocka is checked / used(?) in the configure script @@ -57,6 +59,8 @@ stdenv.mkDerivation rec { --replace '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c \ --replace '@PREFIX@' $out/lib + substituteInPlace ./configure.ac \ + --replace 'm4_esyscmd_s([git describe --tags --always --dirty])' '${version}' ''; configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ @@ -85,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-tss"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 7c3e495d54a3..3224355e0451 100644 --- a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "izh967d0BhwGrfsmeg4ODz0heZNxvwHQVklaubjdlBc="; + sha256 = "Pt3G0nLAKWn6TCwV360MSddtAh8aJ+xwi2m+gCU1PJQ="; }; nativeBuildInputs = [ @@ -80,7 +80,11 @@ stdenv.mkDerivation rec { totem-pl-parser tracker gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gst_all_1.gstreamer + gst_all_1.gst-libav icu json-glib libcue diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index 5cb3dc73daa8..e8d6ed82ed00 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -25,19 +25,28 @@ , json-glib , systemd , dbus +, writeText }: stdenv.mkDerivation rec { pname = "tracker"; - version = "3.3.0"; + version = "3.3.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Bwb5b+f5XfQqzsgSwd57RZOg1kgyHKg1BqnXHiJBe9o="; + sha256 = "DtK5iRiVbW8WQpxgfdihTIT02gpIlw/S64yTq6PPmRM="; }; + postPatch = '' + patchShebangs utils/data-generators/cc/generate + ''; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -50,13 +59,11 @@ stdenv.mkDerivation rec { gobject-introspection docbook-xsl-nons docbook_xml_dtd_45 - python3 # for data-generators - systemd # used for checks to install systemd user service - dbus # used for checks and pkg-config to install dbus service/s - ] ++ checkInputs; # gi is in the main meson.build and checked regardless of - # whether tests are enabled + (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) + ]; buildInputs = [ + gobject-introspection glib libxml2 sqlite @@ -66,37 +73,47 @@ stdenv.mkDerivation rec { libuuid json-glib libstemmer - ]; - - checkInputs = with python3.pkgs; [ - pygobject3 + dbus + ] ++ lib.optionals stdenv.isLinux [ + systemd ]; mesonFlags = [ "-Ddocs=true" + ] ++ ( + let + # https://gitlab.gnome.org/GNOME/tracker/-/blob/master/meson.build#L159 + crossFile = writeText "cross-file.conf" '' + [properties] + sqlite3_has_fts5 = '${lib.boolToString (lib.hasInfix "-DSQLITE_ENABLE_FTS3" sqlite.NIX_CFLAGS_COMPILE)}' + ''; + in + [ + "--cross-file=${crossFile}" + ] + ) ++ lib.optionals (!stdenv.isLinux) [ + "-Dsystemd_user_services=false" ]; doCheck = true; - postPatch = '' - patchShebangs utils/g-ir-merge/g-ir-merge - patchShebangs utils/data-generators/cc/generate - patchShebangs tests/functional-tests/test-runner.sh.in - patchShebangs tests/functional-tests/*.py - patchShebangs examples/python/endpoint.py - ''; - - preCheck = '' - # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file - export HOME=$(mktemp -d) - - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running functional tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0 - ''; + preCheck = + let + linuxDot0 = lib.optionalString stdenv.isLinux ".0"; + darwinDot0 = lib.optionalString stdenv.isDarwin ".0"; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file + export HOME=$(mktemp -d) + + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running functional tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0${darwinDot0}${extension} $out/lib/libtracker-sparql-3.0${darwinDot0}${extension}${linuxDot0} + ''; checkPhase = '' runHook preCheck @@ -126,6 +143,6 @@ stdenv.mkDerivation rec { description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/tre/default.nix b/nixpkgs/pkgs/development/libraries/tre/default.nix index 9ac026ee94b8..8cd0faf48673 100644 --- a/nixpkgs/pkgs/development/libraries/tre/default.nix +++ b/nixpkgs/pkgs/development/libraries/tre/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; - platforms = lib.platforms.unix; license = lib.licenses.bsd2; + mainProgram = "agrep"; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/ubus/default.nix b/nixpkgs/pkgs/development/libraries/ubus/default.nix index 4bbec39291a9..49aebdd7dca2 100644 --- a/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/uci/default.nix b/nixpkgs/pkgs/development/libraries/uci/default.nix index 49aba6cd1831..c3e61e8d22a0 100644 --- a/nixpkgs/pkgs/development/libraries/uci/default.nix +++ b/nixpkgs/pkgs/development/libraries/uci/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/ucommon/default.nix b/nixpkgs/pkgs/development/libraries/ucommon/default.nix index 7306243bca9d..2ecf7729f4bf 100644 --- a/nixpkgs/pkgs/development/libraries/ucommon/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucommon/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; + # use C++14 Standard until error handling code gets updated upstream + CXXFLAGS = [ "-std=c++14" ]; + # disable flaky networking test postPatch = '' substituteInPlace test/stream.cpp \ diff --git a/nixpkgs/pkgs/development/libraries/ucx/default.nix b/nixpkgs/pkgs/development/libraries/ucx/default.nix index 0dc79d47dda7..4c1728868568 100644 --- a/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "08ajhbhzwkfzhkhswk56zx17q18ii67dg1ca1f5grl9qjgj3mmyw"; + sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg="; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/udns/default.nix b/nixpkgs/pkgs/development/libraries/udns/default.nix index fc0b4a42b55d..da0554d49e60 100644 --- a/nixpkgs/pkgs/development/libraries/udns/default.nix +++ b/nixpkgs/pkgs/development/libraries/udns/default.nix @@ -16,7 +16,20 @@ stdenv.mkDerivation rec { sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i"; }; + # udns uses a very custom build and hardcodes a .so name in a few places. + # Instead of fighting with it to apply the standard dylib script, change + # the right place in the Makefile itself. + postPatch = + if stdenv.isDarwin + then + '' + substituteInPlace Makefile.in \ + --replace --soname, -install_name,$out/lib/ + '' + else ""; + installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/include mkdir -p $out/lib @@ -30,6 +43,7 @@ stdenv.mkDerivation rec { ln -rs $out/lib/libudns.so.0 $out/lib/libudns.so cp dnsget.1 rblcheck.1 $out/share/man/man1 cp udns.3 $out/share/man/man3 + runHook postInstall ''; # keep man3 @@ -40,7 +54,7 @@ stdenv.mkDerivation rec { description = "Async-capable DNS stub resolver library"; license = licenses.lgpl21Plus; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 286f5ccc3fcf..1d34c21d3842 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -8,6 +8,7 @@ , libgudev , libpcap , meson +, mesonEmulatorHook , ninja , pkg-config , python3 @@ -19,15 +20,21 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.7"; + version = "0.17.13"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BdZCoW3QHM4Oue4bpuSFsuwIU1vsZ5pjqVv9TfGNC7U="; + sha256 = "sha256-bG6/bmIJtqSXRuDZGkSNAntUJxurgu1woTLs8pTKE88="; }; + patches = [ + # Hardcode absolute paths to libraries so that consumers + # do not need to set LD_LIBRARY_PATH themselves. + ./hardcode-paths.patch + ]; + nativeBuildInputs = [ docbook-xsl-nons gobject-introspection @@ -36,9 +43,12 @@ stdenv.mkDerivation rec { ninja pkg-config vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection glib systemd libgudev @@ -57,6 +67,21 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = '' + # Substitute the path to this derivation in the patch we apply. + substituteInPlace src/umockdev-wrapper \ + --subst-var-by 'LIBDIR' "''${!outputLib}/lib" + ''; + + preCheck = '' + # Our patch makes the path to the `LD_PRELOAD`ed library absolute. + # When running tests, the library is not yet installed, though, + # so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p "$out/lib" + ln -s "$PWD/libumockdev-preload.so.0" "$out/lib/libumockdev-preload.so.0" + ''; + meta = with lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch b/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch new file mode 100644 index 000000000000..91f1e928ec60 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch @@ -0,0 +1,69 @@ +diff --git a/meson.build b/meson.build +index 2ed9027..1f6bbf2 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,6 +38,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false) + + conf.set('PACKAGE_NAME', meson.project_name()) + conf.set_quoted('VERSION', meson.project_version()) ++conf.set_quoted('LIBDIR', get_option('prefix') / get_option('libdir')) + + # glibc versions somewhere between 2.28 and 2.34 + if cc.has_function('__fxstatat', prefix: '#include <sys/stat.h>') +@@ -148,7 +149,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir', + + if g_ir_compiler.found() + umockdev_typelib = custom_target('UMockdev-1.0 typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', 'libumockdev.so.0', '@INPUT@'], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', get_option('prefix') / get_option('libdir') / 'libumockdev.so.0', '@INPUT@'], + input: hacked_gir, + output: 'UMockdev-1.0.typelib', + install: true, +diff --git a/src/config.vapi b/src/config.vapi +index 5269dd0..a2ec46d 100644 +--- a/src/config.vapi ++++ b/src/config.vapi +@@ -2,5 +2,6 @@ + namespace Config { + public const string PACKAGE_NAME; + public const string VERSION; ++ public const string LIBDIR; + } + +diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala +index 8434d32..68c7f8e 100644 +--- a/src/umockdev-record.vala ++++ b/src/umockdev-record.vala +@@ -435,7 +435,7 @@ main (string[] args) + preload = ""; + else + preload = preload + ":"; +- Environment.set_variable("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); ++ Environment.set_variable("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); + + try { + root_dir = DirUtils.make_tmp("umockdev.XXXXXX"); +diff --git a/src/umockdev-run.vala b/src/umockdev-run.vala +index 9a1ba10..6df2522 100644 +--- a/src/umockdev-run.vala ++++ b/src/umockdev-run.vala +@@ -95,7 +95,7 @@ main (string[] args) + preload = ""; + else + preload = preload + ":"; +- Environment.set_variable ("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); ++ Environment.set_variable ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); + + var testbed = new UMockdev.Testbed (); + +diff --git a/src/umockdev-wrapper b/src/umockdev-wrapper +index 6ce4dcd..706c49a 100755 +--- a/src/umockdev-wrapper ++++ b/src/umockdev-wrapper +@@ -1,5 +1,5 @@ + #!/bin/sh + # Wrapper program to preload the libumockdev library, so that test programs can + # set $UMOCKDEV_DIR for redirecting sysfs and other queries to a test bed. +-exec env LD_PRELOAD=libumockdev-preload.so.0:$LD_PRELOAD "$@" ++exec env LD_PRELOAD=@LIBDIR@/libumockdev-preload.so.0:$LD_PRELOAD "$@" + diff --git a/nixpkgs/pkgs/development/libraries/unibilium/default.nix b/nixpkgs/pkgs/development/libraries/unibilium/default.nix index f5fd4f82bae2..332b2deddf78 100644 --- a/nixpkgs/pkgs/development/libraries/unibilium/default.nix +++ b/nixpkgs/pkgs/development/libraries/unibilium/default.nix @@ -1,22 +1,22 @@ { stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }: stdenv.mkDerivation rec { - pname = "unibilium-unstable"; - - version = "20190811"; + pname = "unibilium"; + version = "2.1.1"; src = fetchFromGitHub { owner = "neovim"; repo = "unibilium"; - rev = "92d929fabaf94ea4feb48149bbc3bbea77c4fab0"; - sha256 = "1l8p3fpdymba62x1f5d990v72z3m5f5g2yf505g0rlf2ysc5r1di"; + rev = "v${version}"; + sha256 = "sha256-A/WECvma7u/Mmecvzi0cP168dt4v+zwC8CiFBkqWezA="; }; - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + makeFlags = [ "PREFIX=$(out)" "LIBTOOL=${libtool}/bin/libtool" ]; + + strictDeps = true; - nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ libtool ncurses ]; + nativeBuildInputs = [ pkg-config perl libtool ]; + buildInputs = [ ncurses ]; meta = with lib; { description = "A very basic terminfo library"; diff --git a/nixpkgs/pkgs/development/libraries/unicorn/default.nix b/nixpkgs/pkgs/development/libraries/unicorn/default.nix index 30ceba76163e..e558bbbbb542 100644 --- a/nixpkgs/pkgs/development/libraries/unicorn/default.nix +++ b/nixpkgs/pkgs/development/libraries/unicorn/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , cmake @@ -7,17 +8,23 @@ stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.0.0-rc5"; + version = "2.0.0-rc7"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = pname; rev = version; - sha256 = "1q9k8swnq4qsi54zdfaap69z56w3yj4n4ggm9pscmmmr69nply5f"; + hash = "sha256-qlxtFCJBmouPuUEu8RduZM+rbOr52sGjdb8ZRHWmJ/w="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + IOKit + ]; meta = with lib; { description = "Lightweight multi-platform CPU emulator library"; diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index 958e417ca17c..1e5149683d4c 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -20,8 +20,9 @@ }; meta = with lib; { + broken = stdenv.isDarwin; description = "Official PostgreSQL ODBC Driver"; - homepage = "https://odbc.postgresql.org/"; + homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; platforms = platforms.linux; }; @@ -61,8 +62,9 @@ }; meta = with lib; { + broken = stdenv.isDarwin; description = "MariaDB ODBC database driver"; - homepage = "https://downloads.mariadb.org/connector-odbc/"; + homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; @@ -89,7 +91,7 @@ }; meta = with lib; { - description = "MariaDB ODBC database driver"; + description = "MySQL ODBC database driver"; homepage = "https://dev.mysql.com/downloads/connector/odbc/"; license = licenses.gpl2; platforms = platforms.linux; @@ -124,6 +126,7 @@ }; meta = with lib; { + broken = stdenv.isDarwin; description = "ODBC driver for SQLite"; homepage = "http://www.ch-werner.de/sqliteodbc"; license = licenses.bsd2; @@ -157,7 +160,7 @@ ''; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out libkrb5 libuuid stdenv.cc.cc ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; @@ -167,11 +170,58 @@ }; meta = with lib; { + broken = stdenv.isDarwin; description = "ODBC Driver 17 for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ spencerjanssen ]; }; }; + + redshift = stdenv.mkDerivation rec { + pname = "redshift-odbc"; + version = "1.4.49.1000"; + + src = fetchurl { + url = "https://s3.amazonaws.com/redshift-downloads/drivers/odbc/${version}/AmazonRedshiftODBC-64-bit-${version}-1.x86_64.deb"; + sha256 = "sha256-r5HvsZjB7+x+ClxtWoONkE1/NAbz90NbHfzxC6tf7jA="; + }; + + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + dpkg -x $src src + cd src + ''; + + # `unixODBC` is loaded with `dlopen`, so `autoPatchElfHook` cannot see it, and `patchELF` phase would strip the manual patchelf. Thus: + # - Manually patchelf with `unixODCB` libraries + # - Disable automatic `patchELF` phase + installPhase = '' + mkdir -p $out/lib + cp opt/amazon/redshiftodbc/lib/64/* $out/lib + patchelf --set-rpath ${unixODBC}/lib/ $out/lib/libamazonredshiftodbc64.so + ''; + + dontPatchELF = true; + + buildInputs = [ unixODBC ]; + + passthru = { + fancyName = "Amazon Redshift (x64)"; + driver = "lib/libamazonredshiftodbc64.so"; + }; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "Amazon Redshift ODBC driver"; + homepage = "https://docs.aws.amazon.com/redshift/latest/mgmt/configure-odbc-connection.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ sir4ur0n ]; + }; + }; } diff --git a/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/nixpkgs/pkgs/development/libraries/uriparser/default.nix index 28eea0525176..c39fdb03e896 100644 --- a/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { - homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. API documentation is available on uriparser website. ''; + homepage = "https://uriparser.github.io/"; license = licenses.bsd3; - platforms = platforms.unix; maintainers = with maintainers; [ bosu ]; + mainProgram = "uriparse"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/nixpkgs/pkgs/development/libraries/usbredir/default.nix index 60f532b9779a..797c32cb6d2d 100644 --- a/nixpkgs/pkgs/development/libraries/usbredir/default.nix +++ b/nixpkgs/pkgs/development/libraries/usbredir/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index ec8dab3f90c7..7e3471eefa01 100644 --- a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DUTF8PROC_ENABLE_TESTING=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/uthenticode/default.nix b/nixpkgs/pkgs/development/libraries/uthenticode/default.nix index 9957eccd4267..06579c2d4731 100644 --- a/nixpkgs/pkgs/development/libraries/uthenticode/default.nix +++ b/nixpkgs/pkgs/development/libraries/uthenticode/default.nix @@ -1,28 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, pe-parse }: +{ stdenv, lib, fetchFromGitHub, cmake, gtest, openssl, pe-parse }: stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.4"; + version = "1.0.9"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - sha256 = "16j91cki63zk4d7wzwvq8al98l8hmvcdil3vfp44ink4q4bfswkx"; + hash = "sha256-MEpbvt03L501BP42j6S7rXE9j1d8j6D2Y5kgPNlbHzc="; }; - patches = [ - # adds USE_SYSTEM_GTEST cmake flag, the patch won't be necessary in next versions - (fetchpatch { - url = "https://github.com/trailofbits/uthenticode/commit/7a4c5499c8e5ea7bfae1c620e1f96c112866b1dd.patch"; - sha256 = "17637j5zwp71jmi803mv1z04arld3k3kmrm8nvrkpg08q5kizh28"; - }) - ]; - - cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_SYSTEM_GTEST=1" ]; + cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ pe-parse openssl gtest ]; + checkInputs = [ gtest ]; + buildInputs = [ pe-parse openssl ]; doCheck = true; checkPhase = "test/uthenticode_test"; diff --git a/nixpkgs/pkgs/development/libraries/utmps/default.nix b/nixpkgs/pkgs/development/libraries/utmps/default.nix index 84f5b26c300c..a7063f198c50 100644 --- a/nixpkgs/pkgs/development/libraries/utmps/default.nix +++ b/nixpkgs/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.1.0"; - sha256 = "0vsx5b99fwmp05l4wsw744gg79hbfb4wlzyfip3k0g76fcs49nil"; + version = "0.1.2.0"; + sha256 = "sha256-kCXZYbgnGg7MjutXhhJra3mTdq+m8r0lwPhy/STxEjw="; description = "A secure utmpx and wtmp implementation"; diff --git a/nixpkgs/pkgs/development/libraries/v8/8_x.nix b/nixpkgs/pkgs/development/libraries/v8/8_x.nix index 5d95a0716eff..b5184bafcbff 100644 --- a/nixpkgs/pkgs/development/libraries/v8/8_x.nix +++ b/nixpkgs/pkgs/development/libraries/v8/8_x.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python3, glib, pkg-config, icu +, gn, ninja, python39, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: @@ -132,11 +132,11 @@ stdenv.mkDerivation rec { myGn ninja pkg-config - python3 + python39 ] ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools - python3.pkgs.setuptools + python39.pkgs.setuptools ]; buildInputs = [ glib icu ]; @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { install -D d8 $out/bin/d8 install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a install -D -m644 icudtl.dat $out/share/v8/icudtl.dat + ln -s libv8.a $out/lib/libv8_monolith.a cp -r ../../include $out mkdir -p $out/lib/pkgconfig diff --git a/nixpkgs/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix index 1d2911c1313f..cf9d597edc21 100644 --- a/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { install -D d8 $out/bin/d8 install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a install -D -m644 icudtl.dat $out/share/v8/icudtl.dat + ln -s libv8.a $out/lib/libv8_monolith.a cp -r ../../include $out mkdir -p $out/lib/pkgconfig @@ -165,5 +166,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + # Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076 + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index e137f97698eb..ca40d4260945 100644 --- a/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "intel-hybrid-driver"; rev = version; sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8="; @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Workaround build failure on -fno-common toolchains like upstream gcc-10. + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ "--enable-drm" "--enable-x11" diff --git a/nixpkgs/pkgs/development/libraries/valhalla/default.nix b/nixpkgs/pkgs/development/libraries/valhalla/default.nix index b3d61e6efd72..dded351d3105 100644 --- a/nixpkgs/pkgs/development/libraries/valhalla/default.nix +++ b/nixpkgs/pkgs/development/libraries/valhalla/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite -, luajit, geos, python3, zeromq }: +, luajit, geos39, python3, zeromq }: stdenv.mkDerivation rec { pname = "valhalla"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl protobuf prime-server boost sqlite libspatialite - luajit geos python3 zeromq + luajit geos39 python3 zeromq ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index f97723bc6543..b0f8f5edd30b 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -4,17 +4,15 @@ , ApplicationServices }: -with lib; - stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R57"; + version = "59"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; - rev = version; - sha256 = "sha256-tPQ1SOIpFevOYzL9a8Lc5+dv2egVX1CY3km8yWVv+Sk="; + rev = "R${version}"; + sha256 = "sha256-6w7GSC5ZNIhLpulni4sKq0OvuxHlTJRilBFGH5PQW8U="; }; patches = [ @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) - ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + ] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; enableParallelBuilding = true; @@ -52,11 +50,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "A video processing framework with the future in mind"; homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; }; - } diff --git a/nixpkgs/pkgs/development/libraries/vc/0.7.nix b/nixpkgs/pkgs/development/libraries/vc/0.7.nix index 310635d9cbf3..2e13f2f46ffa 100644 --- a/nixpkgs/pkgs/development/libraries/vc/0.7.nix +++ b/nixpkgs/pkgs/development/libraries/vc/0.7.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/vc/default.nix b/nixpkgs/pkgs/development/libraries/vc/default.nix index 090b445a3a5c..559ef8d20700 100644 --- a/nixpkgs/pkgs/development/libraries/vc/default.nix +++ b/nixpkgs/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "sha256-rh2vcn58xDsbxxABrxneCq6TKIyT51KxGB7sOtHpvYE="; + sha256 = "sha256-fv0FHAl0xvAFybR/jwhX2LkozwEDy1TNcbVAmRRnLVU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/vigra/default.nix b/nixpkgs/pkgs/development/libraries/vigra/default.nix index a4371e7d1a54..32b97f8ea2d3 100644 --- a/nixpkgs/pkgs/development/libraries/vigra/default.nix +++ b/nixpkgs/pkgs/development/libraries/vigra/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , boost , cmake , fftw @@ -20,25 +19,17 @@ let in stdenv.mkDerivation rec { pname = "vigra"; - version = "1.11.1"; + version = "unstable-2022-01-11"; src = fetchFromGitHub { owner = "ukoethe"; repo = "vigra"; - rev = "Version-${lib.replaceChars ["."] ["-"] version}"; - sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk="; + rev = "093d57d15c8c237adf1704d96daa6393158ce299"; + sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og="; }; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414 - patches = - let clangPatch = fetchurl { - url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch"; - sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; - }; - in [ clangPatch ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost @@ -59,9 +50,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; - # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" - doCheck = false; - meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; diff --git a/nixpkgs/pkgs/development/libraries/vmmlib/default.nix b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix index 4aa525feb193..921284bca481 100644 --- a/nixpkgs/pkgs/development/libraries/vmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = with lib; { + broken = stdenv.isDarwin; description = "A vector and matrix math library implemented using C++ templates"; longDescription = ''vmmlib is a vector and matrix math library implemented diff --git a/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix index 8ad78703d531..e07b8cb7688d 100644 --- a/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ homepage = "https://sourceforge.net/projects/opencore-amr/"; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.Esteth ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index 16a800110942..342bb32e5609 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -78,6 +78,9 @@ stdenv.mkDerivation rec { mesonFlags = lib.optionals (!systemdSupport) [ "-D_systemd=false" + ] ++ lib.optionals stdenv.isDarwin [ + # -Bsymbolic-functions is not supported on darwin + "-D_b_symbolic_functions=false" ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/vtk/9.x.nix b/nixpkgs/pkgs/development/libraries/vtk/9.x.nix index b95bcb2b8693..dea68ca153db 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/9.x.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { - majorVersion = "9.0"; - minorVersion = "3"; - sourceSha256 = "vD65Ylsrjb/stgUqKrCR/JFAXeQzOw7GjzMjgVFU7Yo="; + majorVersion = "9.1"; + minorVersion = "0"; + sourceSha256 = "sha256-j+1C9Pjx64CDEHto6qmtcdoHEQFhoxFq2Af0PlylzpY="; } diff --git a/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/nixpkgs/pkgs/development/libraries/vtk/generic.nix index d770bd54d04c..467abeead3e3 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -1,7 +1,7 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch -, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools +, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng libtiff ] - ++ optionals enableQt [ qtbase qtx11extras qttools ] + ++ optionals enableQt (if lib.versionOlder majorVersion "9" + then [ qtbase qtx11extras qttools ] + else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ]) ++ optionals stdenv.isLinux [ libGLU libGL @@ -53,10 +55,6 @@ in stdenv.mkDerivation rec { patches = map fetchpatch patchesToFetch; - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib"; - ''; - dontWrapQtApps = true; # Shared libraries don't work, because of rpath troubles with the current @@ -73,6 +71,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" + "-DVTK_VERSIONED_INSTALL=OFF" ] ++ optionals enableQt [ "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" ] ++ optionals (enableQt && lib.versionOlder version "8.0") [ @@ -90,16 +89,6 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; - preFixup = '' - for lib in $out/lib/libvtk*.so; do - ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')" - done - - mv $out/include/vtk-${majorVersion}/* $out/include - rmdir $out/include/vtk-${majorVersion} - ln -s $out/include $out/include/vtk-${majorVersion} - ''; - meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 4010ee684590..4fead1a1180f 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.198.0"; + version = "1.3.211.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "sha256-SvC0AX1wIZWLzws3ZS8Wi8fbNUw1+An/PRlFIfNj24Y="; + sha256 = "sha256-FqrcFHsUS8e4ZgZpxVc8nNZWdNltniFmMjyyWVoNc7w="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 077f881e722d..067e47b3a2ff 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,23 +3,26 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.2.198.0"; + version = "1.3.211.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "sha256-k3eCdZqCjFxpKa0pZ0K4XcORxdSOlr1dFa7C3Qzi04Y="; + sha256 = "sha256-NQu98wA7UK231rpoKDs1yQ6pEyB4wZg7MjFC3JwS2BY="; }); + patches = [ ./fix-pkgconfig.patch ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ vulkan-headers ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" - ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"; + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch new file mode 100644 index 000000000000..b5c3bf4428ab --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in +index 153815577..584b15273 100644 +--- a/loader/vulkan.pc.in ++++ b/loader/vulkan.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ + + Name: @CMAKE_PROJECT_NAME@ + Description: Vulkan Loader diff --git a/nixpkgs/pkgs/development/libraries/vxl/default.nix b/nixpkgs/pkgs/development/libraries/vxl/default.nix index d87adabf56c6..878271b43178 100644 --- a/nixpkgs/pkgs/development/libraries/vxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/vxl/default.nix @@ -1,30 +1,18 @@ { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "vxl"; - version = "1.17.0-nix1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; - rev = "777c0beb7c8b30117400f6fc9a6d63bf8cb7c67a"; - sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8"; + rev = "v${version}"; + sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr"; }; nativeBuildInputs = [ cmake unzip ]; buildInputs = [ libtiff expat zlib libpng libjpeg ]; - cmakeFlags = [ - # BUILD_OUL wants old linux headers for videodev.h, not available - # in stdenv linux headers - "-DBUILD_OUL=OFF" - # BUILD_BRL fails to find open() - "-DBUILD_BRL=OFF" - "-DBUILD_CONTRIB=OFF" - ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ - "-DCMAKE_CXX_FLAGS=-fPIC" - "-DCMAKE_C_FLAGS=-fPIC" - ]; - meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; homepage = "http://vxl.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/libraries/wasilibc/default.nix b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix index e8436f9e9565..9448041c5e76 100644 --- a/nixpkgs/pkgs/development/libraries/wasilibc/default.nix +++ b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation { pname = "wasilibc"; - version = "unstable-2021-09-23"; + version = "unstable-2022-04-12"; src = buildPackages.fetchFromGitHub { owner = "WebAssembly"; repo = "wasi-libc"; - rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; - hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + rev = "a279514a6ef30cd8ee1469345b33172fcbc8d52d"; + sha256 = "0a9ldas8p7jg7jlkhb9wdiw141z7vfz6p18mnmxnnnna7bp1y3fz"; fetchSubmodules = true; }; + outputs = [ "out" "dev" "share" ]; + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] postPatch = '' substituteInPlace Makefile \ @@ -19,21 +21,24 @@ stdenv.mkDerivation { ''; preBuild = '' - export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + export SYSROOT_LIB=${builtins.placeholder "out"}/lib + export SYSROOT_INC=${builtins.placeholder "dev"}/include + export SYSROOT_SHARE=${builtins.placeholder "share"}/share + mkdir -p "$SYSROOT_LIB" "$SYSROOT_INC" "$SYSROOT_SHARE" + makeFlagsArray+=( + "SYSROOT_LIB:=$SYSROOT_LIB" + "SYSROOT_INC:=$SYSROOT_INC" + "SYSROOT_SHARE:=$SYSROOT_SHARE" + ) ''; - makeFlags = [ - "WASM_CC=${stdenv.cc.targetPrefix}cc" - "WASM_NM=${stdenv.cc.targetPrefix}nm" - "WASM_AR=${stdenv.cc.targetPrefix}ar" - "INSTALL_DIR=${placeholder "out"}" - ]; - enableParallelBuilding = true; - postInstall = '' - mv $out/lib/*/* $out/lib - ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports + # We just build right into the install paths, per the `preBuild`. + dontInstall = true; + + preFixup = '' + ln -s $share/share/undefined-symbols.txt $out/lib/wasi.imports ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch b/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch deleted file mode 100644 index f6745e6f9433..000000000000 --- a/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 378623b0e39b12bb04d3a3a1e08e64b31bd7d99d Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Fri, 27 Nov 2020 10:22:20 +0100 -Subject: [PATCH] add placeholder for @nm@ - ---- - egl/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/egl/meson.build b/egl/meson.build -index dee9b1d..e477546 100644 ---- a/egl/meson.build -+++ b/egl/meson.build -@@ -11,7 +11,7 @@ wayland_egl = library( - - executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') - --nm_path = find_program('nm').path() -+nm_path = find_program('@nm@').path() - - test( - 'wayland-egl symbols check', --- -2.29.2 - diff --git a/nixpkgs/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix index ee897d64142c..c9d0a7ad3b7c 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , meson , pkg-config @@ -30,20 +29,13 @@ let in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "09c7rpbwavjg4y16mrfa57gk5ix6rnzpvlnv1wp7fnbh9hak985q"; + url = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; + sha256 = "1b0ixya9bfw5c9jx8mzlr7yqnlyvd3jv5z8wln9scdv8q5zlvikd"; }; - patches = [ - (substituteAll { - src = ./0001-add-placeholder-for-nm.patch; - nm = "${stdenv.cc.targetPrefix}nm"; - }) - ]; - postPatch = lib.optionalString withDocumentation '' patchShebangs doc/doxygen/gen-doxygen.py '' + lib.optionalString stdenv.hostPlatform.isStatic '' diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 61696d232f79..5fca71ebf0c1 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.25"; + version = "1.26"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi"; + sha256 = "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"; }; postPatch = lib.optionalString doCheck '' diff --git a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix index 49e0e01872f5..c0b48ea17c6f 100644 --- a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake +, makeFontsConf , pkg-config , pugixml , wayland @@ -8,21 +9,19 @@ , libffi , buildPackages , docSupport ? true -, doxygen ? null +, doxygen +, graphviz }: -assert docSupport -> doxygen != null; - -with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw="; + hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg="; }; cmakeFlags = [ @@ -31,15 +30,23 @@ stdenv.mkDerivation rec { "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen; + # Complains about not being able to find the fontconfig config file otherwise + FONTCONFIG_FILE = lib.optional docSupport (makeFontsConf { fontDirectories = [ ]; }); + + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals docSupport [ doxygen graphviz ]; buildInputs = [ pugixml wayland libGL libffi ]; - outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; + outputs = [ "bin" "dev" "lib" "out" ] ++ lib.optionals docSupport [ "doc" "devman" ]; + + # Resolves the warning "Fontconfig error: No writable cache directories" + preBuild = '' + export XDG_CACHE_HOME="$(mktemp -d)" + ''; meta = with lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; - license = with licenses; [ bsd2 hpnd ]; - maintainers = with maintainers; [ minijackson ]; + license = with lib.licenses; [ bsd2 hpnd ]; + maintainers = with lib.maintainers; [ minijackson ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index afa8c63490a6..77cd8985c67a 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -19,6 +19,8 @@ , gtk3 , wayland , libwebp +, libwpe +, libwpe-fdo , enchant2 , xorg , libxkbcommon @@ -65,7 +67,7 @@ stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.6"; + version = "2.36.6"; outputs = [ "out" "dev" ]; @@ -73,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-a8j9A0qtBDKiRZzk/H7iWtZaSSTGGL+Nk7UrDBqEwfY="; + sha256 = "sha256-EZO8ghlGM2d28N+l4NylZR8eVxV+2hLaRyHSRB8kpho="; }; patches = lib.optionals stdenv.isLinux [ @@ -82,7 +84,15 @@ stdenv.mkDerivation rec { inherit (builtins) storeDir; inherit (addOpenGLRunpath) driverLink; }) + ./libglvnd-headers.patch + + # Hardcode path to WPE backend + # https://github.com/NixOS/nixpkgs/issues/110468 + (substituteAll { + src = ./fdo-backend-path.patch; + wpebackend_fdo = libwpe-fdo; + }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -160,6 +170,8 @@ stdenv.mkDerivation rec { libseccomp libmanette wayland + libwpe + libwpe-fdo xdg-dbus-proxy ] ++ lib.optionals systemdSupport [ systemd @@ -180,7 +192,6 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" - "-DUSE_WPE_RENDERER=OFF" "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch new file mode 100644 index 000000000000..9ddef67f1c1d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch @@ -0,0 +1,11 @@ +--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp ++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +@@ -89,7 +89,7 @@ + #if PLATFORM(WAYLAND) + if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { + #if USE(WPE_RENDERER) +- wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); ++ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); + if (AcceleratedBackingStoreWayland::checkRequirements()) { + parameters.hostClientFileDescriptor = IPC::Attachment(UnixFileDescriptor(wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt)); + parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name())); diff --git a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 1ce3c2d9fa8b..c9fafdd27667 100644 --- a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; }; - patches = [ ./enable-riscv.patch ]; + patches = [ + ./enable-riscv.patch + ./enable-powerpc.patch + ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); diff --git a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch new file mode 100644 index 000000000000..636cae4df854 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch @@ -0,0 +1,37 @@ +This patch was extracted from the Gentoo powerpc64le-qtwebengine +patchset, referenced here: + + https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild + +and downloaded from here: + + https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz + +From 4bbb4482e14ad27cf0bd5032b1b5d4abba29dc99 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Fri, 27 Nov 2020 13:05:45 -0800 +Subject: [PATCH] 5.15.2 ppc64le patchet + +diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h +index ce1f3e8..fd39a16 100644 +--- a/webrtc/typedefs.h ++++ b/webrtc/typedefs.h +@@ -38,6 +38,18 @@ + #define WEBRTC_ARCH_X86 + #define WEBRTC_ARCH_32_BITS + #define WEBRTC_ARCH_LITTLE_ENDIAN ++#elif defined(__PPC__) ++#define WEBRTC_ARCH_PPC_FAMILY ++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++#define WEBRTC_ARCH_LITTLE_ENDIAN ++#else ++#define WEBRTC_ARCH_BIG_ENDIAN ++#endif ++#if defined(__LP64__) ++#define WEBRTC_ARCH_64_BITS ++#else ++#define WEBRTC_ARCH_32_BITS ++#endif + #elif defined(__ARMEL__) + // TODO(ajm): We'd prefer to control platform defines here, but this is + // currently provided by the Android makefiles. Commented to avoid duplicate diff --git a/nixpkgs/pkgs/development/libraries/websocket++/default.nix b/nixpkgs/pkgs/development/libraries/websocket++/default.nix index 6991d3c8843a..c325ade26e5c 100644 --- a/nixpkgs/pkgs/development/libraries/websocket++/default.nix +++ b/nixpkgs/pkgs/development/libraries/websocket++/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "websocket++"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; rev = version; - sha256 = "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy"; + sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM="; }; nativeBuildInputs = [ cmake ]; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ revol-xut ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix index b6064c42b5c9..69fc38c9a74e 100644 --- a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix +++ b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix @@ -7,13 +7,6 @@ with lib; let - mkFlag = trueStr: falseStr: cond: name: val: "--" - + (if cond then trueStr else falseStr) - + name - + optionalString (val != null && cond != false) "=${val}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optLz4 = shouldUsePkg lz4; @@ -39,19 +32,19 @@ stdenv.mkDerivation rec { buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; configureFlags = [ - (mkWith false "attach" null) - (mkWith true "builtins" "") - (mkEnable (optBzip2 != null) "bzip2" null) - (mkEnable false "diagnostic" null) - (mkEnable false "java" null) - (mkEnable (optLeveldb != null) "leveldb" null) - (mkEnable false "python" null) - (mkEnable (optSnappy != null) "snappy" null) - (mkEnable (optLz4 != null) "lz4" null) - (mkEnable (optGperftools != null) "tcmalloc" null) - (mkEnable (optZlib != null) "zlib" null) - (mkWith (optDb != null) "berkeleydb" optDb) - (mkWith false "helium" null) + (withFeature false "attach") + (withFeatureAs true "builtins" "") + (enableFeature (optBzip2 != null) "bzip2") + (enableFeature false "diagnostic") + (enableFeature false "java") + (enableFeature (optLeveldb != null) "leveldb") + (enableFeature false "python") + (enableFeature (optSnappy != null) "snappy") + (enableFeature (optLz4 != null) "lz4") + (enableFeature (optGperftools != null) "tcmalloc") + (enableFeature (optZlib != null) "zlib") + (withFeatureAs (optDb != null) "berkeleydb" optDb) + (withFeature false "helium") ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix b/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix index 398a09ff2aa7..7fe678cb6246 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix b/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix index ed3effaa5405..7648ebe5d257 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix index 0ec158405587..d2ff39d7d574 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr"; }; - checkInputs = [ wayland-scanner ]; + strictDeps = true; + nativeBuildInputs = [ wayland-scanner ]; patchPhase = '' substituteInPlace wlr-protocols.pc.in \ @@ -24,9 +25,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkPhase = '' - make check - ''; + checkTarget = "check"; installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 2fc57b87ab3b..02e7e1d80008 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k"; + sha256 = "sha256-5a83Mi+S+mASdZ6O2+0I+qulsF6yNUe80a3qZvWmXHw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/wtk/default.nix b/nixpkgs/pkgs/development/libraries/wtk/default.nix index 94dea0edae1d..da856226d4e9 100644 --- a/nixpkgs/pkgs/development/libraries/wtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/wtk/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://java.sun.com/products/sjwtoolkit/download.html"; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; }; } diff --git a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index 05a4655b800f..a8c97bb5b49b 100644 --- a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -7,6 +7,8 @@ , pango , pkg-config , wxGTK +# darwin deps +, Cocoa }: stdenv.mkDerivation rec { @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { libexif pango wxGTK - ]; + ] ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { homepage = "http://wxsvg.sourceforge.net/"; @@ -37,9 +39,8 @@ stdenv.mkDerivation rec { wxSVG is C++ library to create, manipulate and render Scalable Vector Graphics (SVG) files with the wxWidgets toolkit. ''; - license = with licenses; gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = wxGTK.meta.platforms; - broken = stdenv.isDarwin; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + inherit (wxGTK.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix index 7cf5484bef77..fecd61bb6e51 100644 --- a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: +{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite, Cocoa, setfile }: stdenv.mkDerivation rec { pname = "wxsqliteplus"; @@ -11,27 +11,32 @@ stdenv.mkDerivation rec { sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; - buildInputs = [ wxGTK wxsqlite3 sqlite ]; + buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa; makeFlags = [ "LDFLAGS=-L${wxsqlite3}/lib" + ] ++ lib.optionals stdenv.isDarwin [ + "SETFILE=${setfile}/bin/SetFile" ]; preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_gtk2u_wxsqlite3-3.0 |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.0.0" else "gtk2u_wxsqlite3-3.0"} |g' Makefile ''; installPhase = '' - install -D wxsqliteplus $out/bin/wxsqliteplus + install -D ${lib.optionalString stdenv.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv wxsqliteplus.app $out/Applications/ ''; meta = with lib; { - homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; - platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + homepage = "https://github.com/guanlisheng/wxsqliteplus"; license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix index 19a57d68e15b..b577e5248203 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix @@ -17,8 +17,6 @@ , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms }: -assert withMesa -> libGLU != null && libGL != null; - stdenv.mkDerivation rec { pname = "wxGTK"; version = "2.8.12.1"; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix index d5bef77202f1..097cce6109cb 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix @@ -22,7 +22,6 @@ , setfile }: -assert withMesa -> libGLU != null && libGL != null; stdenv.mkDerivation rec { pname = "wxGTK"; version = "2.9.5"; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 115453303870..82005a12dd2f 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -18,6 +18,7 @@ , withGtk2 ? true , withWebKit ? false, webkitgtk , AGL +, AVFoundation , Carbon , Cocoa , Kernel @@ -28,7 +29,6 @@ assert withGtk2 -> (!withWebKit); let - inherit (gst_all_1) gstreamer gst-plugins-base; gtk = if withGtk2 then gtk2 else gtk3; in stdenv.mkDerivation rec { @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gstreamer - gst-plugins-base + gst_all_1.gstreamer + gst_all_1.gst-plugins-base gtk libSM libXinerama @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { ++ lib.optional withMesa libGLU ++ lib.optional withWebKit webkitgtk ++ lib.optionals stdenv.isDarwin [ + AVFoundation Carbon Cocoa Kernel @@ -131,7 +132,6 @@ stdenv.mkDerivation rec { license = licenses.wxWindows; maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "x86_64-darwin" ]; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 31d59e24fd84..5bce6250c74f 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -35,8 +35,6 @@ assert withGtk2 -> (!withWebKit); let - inherit (gnome2) GConf; - inherit (gst_all_1) gst-plugins-base gstreamer; gtk = if withGtk2 then gtk2 else gtk3; in stdenv.mkDerivation rec { @@ -59,8 +57,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gst-plugins-base - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gstreamer ] ++ lib.optionals (!stdenv.isDarwin) [ gtk @@ -71,7 +69,7 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optionals withGtk2 [ - GConf + gnome2.GConf ] ++ lib.optional withMesa libGLU ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix index e1f732929cec..73bf013452a5 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix @@ -7,13 +7,15 @@ , libpng , libtiff , zlib -, darwin +, AGL +, Cocoa +, Kernel +, WebKit +, derez +, rez +, setfile }: -let - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; - inherit (darwin.stubs) derez rez setfile; -in stdenv.mkDerivation rec { pname = "wxmac"; version = "3.0.5.1"; diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index dc2b1c40c6cb..df248f6b4d43 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) '' # `AS' is set to the binutils assembler, but we need nasm unset AS - '' + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) '' + '' + lib.optionalString stdenv.hostPlatform.isAarch '' export AS=$CC ''; diff --git a/nixpkgs/pkgs/development/libraries/x265/default.nix b/nixpkgs/pkgs/development/libraries/x265/default.nix index 20c56f4d9037..3bf11737eb3c 100644 --- a/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { cmakeFlags = cmakeCommonFlags ++ [ "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 - "-DENABLE_SHARED=ON" + "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=ON" ] ++ [ diff --git a/nixpkgs/pkgs/development/libraries/xalanc/default.nix b/nixpkgs/pkgs/development/libraries/xalanc/default.nix index b750b26996d5..2b5f2379fde7 100644 --- a/nixpkgs/pkgs/development/libraries/xalanc/default.nix +++ b/nixpkgs/pkgs/development/libraries/xalanc/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8"; }; - buildInputs = [ xercesc getopt cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ xercesc getopt ]; meta = { homepage = "https://xalan.apache.org/"; diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 4d23752b2420..6d617564b04e 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -2,14 +2,14 @@ , libuuid, zlib }: let - generic = version: sha256: stdenv.mkDerivation { + generic = version: hash: stdenv.mkDerivation { pname = "xapian"; inherit version; passthru = { inherit version; }; src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; - inherit sha256; + inherit hash; }; outputs = [ "out" "man" "doc" ]; @@ -38,5 +38,8 @@ let }; }; in { - xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM="; + # Don't forget to change the hashes in xapian-omega and + # python3Packages.xapian. They inherit the version from this package, and + # should always be built with the equivalent xapian version. + xapian_1_4 = generic "1.4.20" "sha256-zivl7/cgdcgQbANA5wsQk9vOviq0LcHBvgjdOtQZRC0="; } diff --git a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index 79e5786f0488..eb03defbf2a6 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: +{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre2, zlib, libmagic }: stdenv.mkDerivation rec { pname = "xapian-omega"; @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; + hash = "sha256-Cf19bGCzlP0A2EcAZJlpofzDqiuIuyxsoiD9+o0liB8="; }; - buildInputs = [ xapian perl pcre zlib libmagic ]; + buildInputs = [ xapian perl pcre2 zlib libmagic ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index f296f59d408b..92796b4116c4 100644 --- a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake gnum4 gperf libtool diff --git a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 95373934a47a..b027c95a7e4b 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, meson +, ninja , pkg-config , libxslt -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , dbus , glib @@ -10,17 +13,19 @@ stdenv.mkDerivation rec { pname = "xdg-dbus-proxy"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s="; + sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs="; }; nativeBuildInputs = [ + meson + ninja pkg-config libxslt - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 ]; @@ -32,10 +37,6 @@ stdenv.mkDerivation rec { dbus ]; - configureFlags = [ - "--enable-man" - ]; - # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 6764df634bbc..199994038b5b 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "42.0.1"; + version = "42.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "3+i1JFDzKDj5+eiY6Vqo36JwXOEtQ4MFVXwSi5zg4uY="; + sha256 = "TtEFpmfkYyVGcQPcc0bSAj+uwdXsFTvRcxbak49TrOA="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment"; + homepage = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"; maintainers = teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 13a16f111ea8..e54f764f9a50 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.12.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "I1ZoDqZQPfPwPr4Ybk+syz+YEkrK2ReflZaJJWD4Nsk="; + sha256 = "I9xQgiE3lNb2vRodO5R1y40lqoOKzALskrVePidant4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index a8450b414e54..5ccd9d6fa49e 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,20 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, systemd, libdrm, inih, scdoc, grim, slurp }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, meson +, ninja +, pkg-config +, wayland-protocols +, grim +, inih +, libdrm +, mesa +, pipewire +, scdoc +, slurp +, systemd +, wayland +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-weePlNcLmZ3R0IDQ95p0wQvsKTYp+sVlTENJtF8Z78Y="; + sha256 = "sha256-UztkfvMIbslPd/d262NZFb6WfESc9nBsSSH96BA4Aqw="; }; nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ]; - buildInputs = [ pipewire wayland systemd libdrm inih scdoc ]; + buildInputs = [ inih libdrm mesa pipewire scdoc systemd wayland ]; mesonFlags = [ "-Dsd-bus-provider=libsystemd" diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 19a671e7e0b0..05b0f5534481 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -5,7 +5,8 @@ , fetchFromGitHub , fetchpatch , flatpak -, fuse +, fuse3 +, systemdMinimal , geoclue2 , glib , gsettings-desktop-schemas @@ -14,6 +15,9 @@ , libxml2 , nixosTests , pipewire +, gdk-pixbuf +, librsvg +, python3 , pkg-config , stdenv , substituteAll @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.12.1"; + version = "1.15.0"; outputs = [ "out" "installedTests" ]; @@ -31,17 +35,9 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE="; + sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc="; }; - patches = [ - # Hardcode paths used by x-d-p itself. - (substituteAll { - src = ./fix-paths.patch; - inherit flatpak; - }) - ]; - nativeBuildInputs = [ autoreconfHook libxml2 @@ -53,12 +49,22 @@ stdenv.mkDerivation rec { acl dbus flatpak - fuse + fuse3 + systemdMinimal # libsystemd glib gsettings-desktop-schemas json-glib libportal pipewire + + # For icon validator + gdk-pixbuf + librsvg + + # For document-fuse installed test. + (python3.withPackages (pp: with pp; [ + pygobject3 + ])) ] ++ lib.optionals enableGeoLocation [ geoclue2 ]; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch deleted file mode 100644 index 98e26e88b5ce..000000000000 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/notification.c b/src/notification.c -index 5412609..4243e98 100644 ---- a/src/notification.c -+++ b/src/notification.c -@@ -366,7 +366,7 @@ - int status; - g_autofree char *err = NULL; - g_autoptr(GError) error = NULL; -- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; -+ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; - const char *args[6]; - - if (G_IS_THEMED_ICON (icon)) diff --git a/nixpkgs/pkgs/development/libraries/xed/default.nix b/nixpkgs/pkgs/development/libraries/xed/default.nix index d8994581913f..18e5b27d9b88 100644 --- a/nixpkgs/pkgs/development/libraries/xed/default.nix +++ b/nixpkgs/pkgs/development/libraries/xed/default.nix @@ -37,6 +37,7 @@ in stdenv.mkDerivation rec { dontInstall = true; # already installed during buildPhase meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index b9f35d407b39..b4d668d5fba1 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -6,9 +6,8 @@ , gtest , doCheck ? true , cudaSupport ? config.cudaSupport or false -, cudatoolkit , ncclSupport ? false -, nccl +, cudaPackages , llvmPackages }: @@ -26,17 +25,30 @@ stdenv.mkDerivation rec { sha256 = "sha256-h7zcHCOxe1h7HRB6idtjf4HUBEoHC4V2pqbN9hpe00g="; }; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.isDarwin [ + llvmPackages.openmp + ] ++ lib.optionals cudaSupport [ + cudaPackages.autoAddOpenGLRunpathHook + ]; - buildInputs = [ gtest ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional ncclSupport nccl; + buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optional ncclSupport cudaPackages.nccl; cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; inherit doCheck; + # By default, cmake build will run ctests with all checks enabled + # If we're building with cuda, we run ctest manually so that we can skip the GPU tests + checkPhase = lib.optionalString cudaSupport '' + ctest --force-new-ctest-process ${lib.optionalString cudaSupport "-E TestXGBoostLib"} + ''; + installPhase = let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' diff --git a/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix index 9cf3ddb92190..39e25241c943 100644 --- a/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 5f2557514804..e4c0e57e76c2 100644 --- a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -4,11 +4,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.2.33"; + version = "1.2.34"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-JgQdNaIKJF7Vovue4HXxCCVmTSdCIMtRkDQPqHpNCTE="; + sha256 = "sha256-Us7UlD81vX0IGKOCmMFSjKSsilRED9cRNKB9LRNwomI="; }; patches = [ @@ -68,10 +68,11 @@ stdenv.mkDerivation rec { ''; meta = { + description = "XML Security Library in C based on libxml2"; homepage = "http://www.aleksey.com/xmlsec"; downloadPage = "https://www.aleksey.com/xmlsec/download.html"; - description = "XML Security Library in C based on libxml2"; license = lib.licenses.mit; + mainProgram = "xmlsec1"; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/xxHash/default.nix b/nixpkgs/pkgs/development/libraries/xxHash/default.nix index f4fa06112814..d5a8df6f437e 100644 --- a/nixpkgs/pkgs/development/libraries/xxHash/default.nix +++ b/nixpkgs/pkgs/development/libraries/xxHash/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch +}: stdenv.mkDerivation rec { pname = "xxHash"; @@ -11,21 +16,35 @@ stdenv.mkDerivation rec { sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA="; }; - # Upstream Makefile does not anticipate that user may not want to - # build .so library. - postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' - sed -i 's/lib: libxxhash.a libxxhash/lib: libxxhash.a/' Makefile - sed -i '/LIBXXH) $(DESTDIR/ d' Makefile - ''; + # CMake build fixes + patches = [ + # Merged in https://github.com/Cyan4973/xxHash/pull/649 + # Should be present in next release + (fetchpatch { + name = "cmake-install-fix"; + url = "https://github.com/Cyan4973/xxHash/commit/636f966ecc713c84ddd3b7ccfde2bfb2cc7492a0.patch"; + sha256 = "sha256-B1PZ/0BXlOrSiPvgCPLvI/sjQvnR0n5PQHOO38LOij0="; + }) - outputs = [ "out" "dev" ]; + # Submitted at https://github.com/Cyan4973/xxHash/pull/723 + (fetchpatch { + name = "cmake-pkgconfig-fix"; + url = "https://github.com/Cyan4973/xxHash/commit/5db353bbd05ee5eb1f90afc08d10da9416154e55.patch"; + sha256 = "sha256-dElgSu9DVo2hY6TTVHLTtt0zkXmQV3nc9i/KbrDkK8s="; + }) + ]; - makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ]; - # pkgs/build-support/setup-hooks/compress-man-pages.sh hook fails - # to compress symlinked manpages. Avoid compressing manpages until - # it's fixed. - dontGzipMan = true; + nativeBuildInputs = [ + cmake + ]; + + # Using unofficial CMake build script to install CMake module files. + cmakeDir = "../cmake_unofficial"; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; meta = with lib; { description = "Extremely fast hash algorithm"; @@ -39,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Cyan4973/xxHash"; license = with licenses; [ bsd2 gpl2 ]; maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/yajl/default.nix b/nixpkgs/pkgs/development/libraries/yajl/default.nix index 645329f83cdb..022284b0b130 100644 --- a/nixpkgs/pkgs/development/libraries/yajl/default.nix +++ b/nixpkgs/pkgs/development/libraries/yajl/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lloyd"; repo = "yajl"; - rev = version; + rev = "refs/tags/${version}"; sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml"; }; diff --git a/nixpkgs/pkgs/development/libraries/yder/default.nix b/nixpkgs/pkgs/development/libraries/yder/default.nix index 9dd55482300c..9ab0f5db747e 100644 --- a/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.15"; + version = "1.4.17"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hPAL1UngodNbQCCdKulaF5faI0JOjmWdz3q8oyPH7C4="; + sha256 = "sha256-4o1sKxlWeAgZZm01sPV2yIR3xXZwzPJwqcGCkz6+Cfc="; }; patches = [ @@ -39,11 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" - ''; - meta = with lib; { description = "Logging library for C applications"; homepage = "https://github.com/babelouest/yder"; diff --git a/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch index 61a67c5897b8..f68ce2a0213e 100644 --- a/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch +++ b/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch @@ -1,9 +1,13 @@ ---- i/libyder.pc.in -+++ w/libyder.pc.in +--- a/libyder.pc.in ++++ b/libyder.pc.in @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=@PKGCONFIG_TARGET_LIBDIR@ +-includedir=@PKGCONFIG_TARGET_INCLUDES@ +libdir=@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++includedir=@CMAKE_INSTALL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ + diff --git a/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch b/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch new file mode 100644 index 000000000000..cd51d17b1500 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch @@ -0,0 +1,18 @@ +diff --git a/meson.build b/meson.build +index 1c6b32d..aa7dd25 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,10 +58,10 @@ endif + + # argp-standalone dependency (if required) + if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') +- if fs.is_dir(join_paths([get_option('prefix'), 'include'])) +- inc += include_directories(join_paths([get_option('prefix'), 'include'])) ++ argplib = cc.find_library('argp', has_headers : ['argp.h'], required: false) ++ if not argplib.found() ++ argplib = dependency('argp-standalone') + endif +- argplib = cc.find_library('argp', dirs : join_paths([get_option('prefix'), 'lib'])) + else + argplib = dependency('', required : false) + endif diff --git a/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/nixpkgs/pkgs/development/libraries/zchunk/default.nix index c639eb7b30e9..815326e53838 100644 --- a/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -11,15 +11,20 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; + hash = "sha256-/gtkw020pybUDUeYydXgJ4PLvdOqZ0RbrLOfNMDaCmA="; }; + # unbreak on darwin by finding argp-standalone, based on the patch from + # buildroot: + # https://github.com/buildroot/buildroot/raw/master/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch + patches = lib.optional stdenv.isDarwin ./0001-meson-fix-argp-standalone.patch; + nativeBuildInputs = [ meson ninja @@ -47,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # does not find argp-standalone }; } diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix deleted file mode 100644 index e8082e50447a..000000000000 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, fetchFromGitHub -, mcpp, bzip2, expat, openssl, db5 -, darwin, libiconv, Security -, zeroc-ice # to share meta -, cpp11 ? false -}: - -stdenv.mkDerivation rec { - pname = "zeroc-ice"; - version = "3.6.5"; - - src = fetchFromGitHub { - owner = "zeroc-ice"; - repo = "ice"; - rev = "v${version}"; - sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15"; - }; - - buildInputs = [ mcpp bzip2 expat openssl db5 ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - - postUnpack = '' - sourceRoot=$sourceRoot/cpp - ''; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace config/Make.rules.Darwin \ - --replace xcrun "" - ''; - - patches = [ - # Fixes compilation warning about uninitialied variables (in test code) - ./uninitialized-variable-warning.patch - ]; - - preBuild = '' - makeFlagsArray+=( - "prefix=$out" - "OPTIMIZE=yes" - "USR_DIR_INSTALL=yes" - "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}" - "SKIP=slice2py" # provided by a separate package - ) - ''; - - # cannot find -lIceXML (linking bin/transformdb) - enableParallelBuilding = false; - - outputs = [ "out" "bin" "dev" ]; - - postInstall = '' - mkdir -p $bin $dev/share - mv $out/bin $bin - mv $out/share/Ice-* $dev/share/ice - rm -rf $out/share/slice - ''; - - inherit (zeroc-ice) meta; -} diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index fcd836348556..4eef03c4a619 100644 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -1,6 +1,5 @@ { stdenv, lib, fetchFromGitHub , bzip2, expat, libedit, lmdb, openssl -, darwin, libiconv, Security , python3 # for tests only , cpp11 ? false }: @@ -23,24 +22,16 @@ let in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4"; + sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g="; }; - buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Make.rules.Darwin \ - --replace xcrun "" - ''; + buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ]; preBuild = '' makeFlagsArray+=( @@ -63,6 +54,9 @@ in stdenv.mkDerivation rec { # these tests require network access so we need to skip them. brokenTests = map escapeRegex [ "Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple" + + # FIXME: certificate expired, remove for next release? + "IceSSL/configuration" ]; # matches CONFIGS flag in makeFlagsArray configFlag = optionalString cpp11 "--config=cpp11-shared"; @@ -84,5 +78,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch b/nixpkgs/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch deleted file mode 100644 index 878dee26bb83..000000000000 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/test/Glacier2/dynamicFiltering/TestControllerI.h b/test/Glacier2/dynamicFiltering/TestControllerI.h -index 7e21639..1279200 100644 ---- a/test/Glacier2/dynamicFiltering/TestControllerI.h -+++ b/test/Glacier2/dynamicFiltering/TestControllerI.h -@@ -21,13 +21,12 @@ struct SessionTuple - { - Glacier2::SessionPrx session; - Glacier2::SessionControlPrx sessionControl; -- bool configured; -+ bool configured = false; - - SessionTuple() {} - SessionTuple(Glacier2::SessionPrx s, Glacier2::SessionControlPrx control): - session(s), -- sessionControl(control), -- configured(false) -+ sessionControl(control) - {} - - SessionTuple& diff --git a/nixpkgs/pkgs/development/libraries/zimg/default.nix b/nixpkgs/pkgs/development/libraries/zimg/default.nix index 38b106d474b7..475ebc7517e5 100644 --- a/nixpkgs/pkgs/development/libraries/zimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20"; + sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 9f8e357d3ab0..56438f8e1735 100644 --- a/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zimlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchzip , meson, ninja, pkg-config , python3 , icu @@ -11,13 +11,19 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "6.3.2"; + version = "7.2.2"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI="; + sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs="; + }; + + testData = fetchzip rec { + passthru.version = "0.4"; + url = "https://github.com/openzim/zim-testing-suite/releases/download/v${passthru.version}/zim-testing-suite-${passthru.version}.tar.gz"; + sha256 = "sha256-2eJqmvs/GrvOD/pq8dTubaiO9ZpW2WqTNQByv354Z0w="; }; nativeBuildInputs = [ @@ -39,6 +45,8 @@ stdenv.mkDerivation rec { patchShebangs scripts ''; + mesonFlags = [ "-Dtest_data_dir=${testData}" ]; + checkInputs = [ gtest ]; diff --git a/nixpkgs/pkgs/development/libraries/zint/default.nix b/nixpkgs/pkgs/development/libraries/zint/default.nix new file mode 100644 index 000000000000..e7663009c59d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zint/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, qtbase +, qttools +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "zint"; + version = "2.11.0"; + + src = fetchFromGitHub { + owner = "woo-j"; + repo = "zint"; + rev = version; + sha256 = "sha256-DtfyXBBEDcltGUAutHl/ksRTTYmS7Ll9kjfgD7NmBbA="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ qtbase qttools ]; + + postInstall = '' + install -Dm644 $src/zint-qt.desktop $out/share/applications/zint-qt.desktop + install -Dm644 $src/zint-qt.png $out/share/pixmaps/zint-qt.png + install -Dm644 $src/frontend_qt/images/scalable/zint-qt.svg $out/share/icons/hicolor/scalable/apps/zint-qt.svg + ''; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "A barcode generating tool and library"; + longDescription = '' + The Zint project aims to provide a complete cross-platform open source + barcode generating solution. The package currently consists of a Qt based + GUI, a CLI command line executable and a library with an API to allow + developers access to the capabilities of Zint. + ''; + homepage = "http://www.zint.org.uk"; + changelog = "https://github.com/woo-j/zint/blob/${version}/ChangeLog"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch b/nixpkgs/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch new file mode 100644 index 000000000000..1ade02654e58 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch @@ -0,0 +1,346 @@ +From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Tue, 17 Apr 2018 22:09:22 -0700 +Subject: [PATCH 1/2] Fix a bug that can crash deflate on some input when using + Z_FIXED. + +This bug was reported by Danilo Ramos of Eideticom, Inc. It has +lain in wait 13 years before being found! The bug was introduced +in zlib 1.2.2.2, with the addition of the Z_FIXED option. That +option forces the use of fixed Huffman codes. For rare inputs with +a large number of distant matches, the pending buffer into which +the compressed data is written can overwrite the distance symbol +table which it overlays. That results in corrupted output due to +invalid distances, and can result in out-of-bound accesses, +crashing the application. + +The fix here combines the distance buffer and literal/length +buffers into a single symbol buffer. Now three bytes of pending +buffer space are opened up for each literal or length/distance +pair consumed, instead of the previous two bytes. This assures +that the pending buffer cannot overwrite the symbol table, since +the maximum fixed code compressed length/distance is 31 bits, and +since there are four bytes of pending space for every three bytes +of symbol space. +--- + deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- + deflate.h | 25 +++++++++---------- + trees.c | 50 +++++++++++-------------------------- + 3 files changed, 79 insertions(+), 70 deletions(-) + +diff --git a/deflate.c b/deflate.c +index 425babc..19cba87 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + +- ushf *overlay; +- /* We overlay pending_buf and d_buf+l_buf. This works since the average +- * output size for (length,distance) codes is <= 24 bits. +- */ +- + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; +@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + +- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +- s->pending_buf = (uchf *) overlay; +- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); ++ /* We overlay pending_buf and sym_buf. This works since the average size ++ * for length/distance pairs over any compressed block is assured to be 31 ++ * bits or less. ++ * ++ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 ++ * extra bits, for lengths 131 to 257. The longest fixed distance codes are ++ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest ++ * possible fixed-codes length/distance pair is then 31 bits total. ++ * ++ * sym_buf starts one-fourth of the way into pending_buf. So there are ++ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol ++ * in sym_buf is three bytes -- two for the distance and one for the ++ * literal/length. As each symbol is consumed, the pointer to the next ++ * sym_buf value to read moves forward three bytes. From that symbol, up to ++ * 31 bits are written to pending_buf. The closest the written pending_buf ++ * bits gets to the next sym_buf symbol to read is just before the last ++ * code is written. At that time, 31*(n-2) bits have been written, just ++ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at ++ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 ++ * symbols are written.) The closest the writing gets to what is unread is ++ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and ++ * can range from 128 to 32768. ++ * ++ * Therefore, at a minimum, there are 142 bits of space between what is ++ * written and what is read in the overlain buffers, so the symbols cannot ++ * be overwritten by the compressed data. That space is actually 139 bits, ++ * due to the three-bit fixed-code block header. ++ * ++ * That covers the case where either Z_FIXED is specified, forcing fixed ++ * codes, or when the use of fixed codes is chosen, because that choice ++ * results in a smaller compressed block than dynamic codes. That latter ++ * condition then assures that the above analysis also covers all dynamic ++ * blocks. A dynamic-code block will only be chosen to be emitted if it has ++ * fewer bits than a fixed-code block would for the same set of symbols. ++ * Therefore its average symbol length is assured to be less than 31. So ++ * the compressed data for a dynamic block also cannot overwrite the ++ * symbols from which it is being constructed. ++ */ ++ ++ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); ++ s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { +@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + deflateEnd (strm); + return Z_MEM_ERROR; + } +- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); +- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; ++ s->sym_buf = s->pending_buf + s->lit_bufsize; ++ s->sym_end = (s->lit_bufsize - 1) * 3; ++ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K ++ * on 16 bit machines and because stored blocks are restricted to ++ * 64K-1 bytes. ++ */ + + s->level = level; + s->strategy = strategy; +@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) + #else + deflate_state *ds; + deflate_state *ss; +- ushf *overlay; + + + if (deflateStateCheck(source) || dest == Z_NULL) { +@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); +- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); +- ds->pending_buf = (uchf *) overlay; ++ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { +@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); +- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); +- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; ++ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; +@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +diff --git a/deflate.h b/deflate.h +index 23ecdd3..d4cf1a9 100644 +--- a/deflate.h ++++ b/deflate.h +@@ -217,7 +217,7 @@ typedef struct internal_state { + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + +- uchf *l_buf; /* buffer for literals or lengths */ ++ uchf *sym_buf; /* buffer for distances and literals/lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for +@@ -239,13 +239,8 @@ typedef struct internal_state { + * - I can't count above 4 + */ + +- uInt last_lit; /* running index in l_buf */ +- +- ushf *d_buf; +- /* Buffer for distances. To simplify the code, d_buf and l_buf have +- * the same number of elements. To use different lengths, an extra flag +- * array would be necessary. +- */ ++ uInt sym_next; /* running index in sym_buf */ ++ uInt sym_end; /* symbol table full when sym_next reaches this */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ +@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + + # define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ +- s->d_buf[s->last_lit] = 0; \ +- s->l_buf[s->last_lit++] = cc; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = cc; \ + s->dyn_ltree[cc].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + # define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ +- s->d_buf[s->last_lit] = dist; \ +- s->l_buf[s->last_lit++] = len; \ ++ s->sym_buf[s->sym_next++] = dist; \ ++ s->sym_buf[s->sym_next++] = dist >> 8; \ ++ s->sym_buf[s->sym_next++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + #else + # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +diff --git a/trees.c b/trees.c +index 4f4a650..decaeb7 100644 +--- a/trees.c ++++ b/trees.c +@@ -416,7 +416,7 @@ local void init_block(s) + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; +- s->last_lit = s->matches = 0; ++ s->sym_next = s->matches = 0; + } + + #define SMALLEST 1 +@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, +- s->last_lit)); ++ s->sym_next / 3)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + +@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ + { +- s->d_buf[s->last_lit] = (ush)dist; +- s->l_buf[s->last_lit++] = (uch)lc; ++ s->sym_buf[s->sym_next++] = dist; ++ s->sym_buf[s->sym_next++] = dist >> 8; ++ s->sym_buf[s->sym_next++] = lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; +@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } +- +-#ifdef TRUNCATE_BLOCK +- /* Try to guess if it is profitable to stop the current block here */ +- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { +- /* Compute an upper bound for the compressed length */ +- ulg out_length = (ulg)s->last_lit*8L; +- ulg in_length = (ulg)((long)s->strstart - s->block_start); +- int dcode; +- for (dcode = 0; dcode < D_CODES; dcode++) { +- out_length += (ulg)s->dyn_dtree[dcode].Freq * +- (5L+extra_dbits[dcode]); +- } +- out_length >>= 3; +- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", +- s->last_lit, in_length, out_length, +- 100L - out_length*100L/in_length)); +- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; +- } +-#endif +- return (s->last_lit == s->lit_bufsize-1); +- /* We avoid equality with lit_bufsize because of wraparound at 64K +- * on 16 bit machines and because stored blocks are restricted to +- * 64K-1 bytes. +- */ ++ return (s->sym_next == s->sym_end); + } + + /* =========================================================================== +@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ +- unsigned lx = 0; /* running index in l_buf */ ++ unsigned sx = 0; /* running index in sym_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + +- if (s->last_lit != 0) do { +- dist = s->d_buf[lx]; +- lc = s->l_buf[lx++]; ++ if (s->sym_next != 0) do { ++ dist = s->sym_buf[sx++] & 0xff; ++ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; ++ lc = s->sym_buf[sx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); +@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) + } + } /* literal or match pair ? */ + +- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ +- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, +- "pendingBuf overflow"); ++ /* Check that the overlay between pending_buf and sym_buf is ok: */ ++ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); + +- } while (lx < s->last_lit); ++ } while (sx < s->sym_next); + + send_code(s, END_BLOCK, ltree); + } +-- +2.33.1 + diff --git a/nixpkgs/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch b/nixpkgs/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch new file mode 100644 index 000000000000..dadc904a07fb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch @@ -0,0 +1,27 @@ +From 4346a16853e19b45787ce933666026903fb8f3f8 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Tue, 17 Apr 2018 22:44:41 -0700 +Subject: [PATCH 2/2] Assure that the number of bits for deflatePrime() is + valid. + +--- + deflate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/deflate.c b/deflate.c +index 19cba87..23aef18 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -589,7 +589,8 @@ int ZEXPORT deflatePrime (strm, bits, value) + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (bits < 0 || bits > 16 || ++ s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +-- +2.33.1 + diff --git a/nixpkgs/pkgs/development/libraries/zlib/comprehensive-crc-validation-for-wrong-implementations.patch b/nixpkgs/pkgs/development/libraries/zlib/comprehensive-crc-validation-for-wrong-implementations.patch new file mode 100644 index 000000000000..85a6a7e3ab41 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zlib/comprehensive-crc-validation-for-wrong-implementations.patch @@ -0,0 +1,51 @@ +From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Wed, 30 Mar 2022 11:14:53 -0700 +Subject: [PATCH] Correct incorrect inputs provided to the CRC functions. + +The previous releases of zlib were not sensitive to incorrect CRC +inputs with bits set above the low 32. This commit restores that +behavior, so that applications with such bugs will continue to +operate as before. +--- + crc32.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/crc32.c b/crc32.c +index a1bdce5c2..451887bc7 100644 +--- a/crc32.c ++++ b/crc32.c +@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + /* Compute the CRC up to a word boundary. */ + while (len && ((z_size_t)buf & 7) != 0) { +@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + #ifdef W + +@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + #ifdef DYNAMIC_CRC_TABLE + once(&made, make_crc_table); + #endif /* DYNAMIC_CRC_TABLE */ +- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2; ++ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff); + } + + /* ========================================================================= */ +@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op) + uLong crc2; + uLong op; + { +- return multmodp(op, crc1) ^ crc2; ++ return multmodp(op, crc1) ^ (crc2 & 0xffffffff); + } diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix index e10fa000d826..1527be44f7a7 100644 --- a/nixpkgs/pkgs/development/libraries/zlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix @@ -30,11 +30,9 @@ stdenv.mkDerivation (rec { [ "https://www.zlib.net/fossils/zlib-${version}.tar.gz" # stable archive path "mirror://sourceforge/libpng/zlib/${version}/zlib-${version}.tar.gz" ]; - sha256 = "1n9na4fq4wagw1nzsfjr6wyly960jfa94460ncbf6p1fac44i14i"; + sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9"; }; - patches = lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \ @@ -42,6 +40,17 @@ stdenv.mkDerivation (rec { --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; + patches = [ + ./fix-configure-issue-cross.patch + # Starting zlib 1.2.12, zlib is stricter to incorrect CRC inputs + # with bits set above the low 32. + # see https://github.com/madler/zlib/issues/618 + # TODO: remove the patch if upstream releases https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2 + # see https://github.com/NixOS/nixpkgs/issues/170539 for history. + ./comprehensive-crc-validation-for-wrong-implementations.patch + ]; + + strictDeps = true; outputs = [ "out" "dev" ] ++ lib.optional splitStaticOutput "static"; setOutputFlags = false; diff --git a/nixpkgs/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch b/nixpkgs/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch deleted file mode 100644 index 3de4978c3066..000000000000 --- a/nixpkgs/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gzguts.h b/gzguts.h -index 990a4d2..6378d46 100644 ---- a/gzguts.h -+++ b/gzguts.h -@@ -39,7 +39,7 @@ - # include <io.h> - #endif - --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) - # define WIDECHAR - #endif - diff --git a/nixpkgs/pkgs/development/libraries/zlib/fix-configure-issue-cross.patch b/nixpkgs/pkgs/development/libraries/zlib/fix-configure-issue-cross.patch new file mode 100644 index 000000000000..0136071eabe7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zlib/fix-configure-issue-cross.patch @@ -0,0 +1,24 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/nixpkgs/pkgs/development/libraries/zlog/default.nix b/nixpkgs/pkgs/development/libraries/zlog/default.nix index b115cf7b675b..82c08b46bc8b 100644 --- a/nixpkgs/pkgs/development/libraries/zlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "1.2.15"; @@ -11,14 +11,23 @@ stdenv.mkDerivation rec { sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-43521.patch"; + url = "https://github.com/HardySimpson/zlog/commit/a5be8b3a8ddc498de4ad041757285136a55d97e3.patch"; + sha256 = "sha256-igHXUHN2Ke8Gb5AeDrDwG2aUNRpispgqVlGuASute+8="; + }) + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; - platforms = platforms.unix; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "zlog-chk-conf"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix index e74bb9ddc32e..528d545c37c6 100644 --- a/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zxcvbn-c"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "tsyrogit"; repo = "zxcvbn-c"; rev = "v${version}"; - sha256 = "12ksdnpxlqlmg9zhyyk3bspcf0sfj5zk735vr4ry635qi7gzcaas"; + sha256 = "sha256-RKqbv0iGkjS7Y7KikqglZ+AK1oiw4G1mB2Zg87tOlbI="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix b/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix index 514ebe9975ad..126ef2bc69d6 100644 --- a/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zxing-cpp"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nu-book"; repo = pname; rev = "v${version}"; - hash = "sha256-M565VNKhSmYFmCMEI9UFuHWNZWeHrf9qzZkMAw9LUr4="; + hash = "sha256-MTu8tvJXpo6+Z0aSIZ27nmerNtNBOwnL/jDkGedIiM8="; }; nativeBuildInputs = [ |