diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/spirv-cross/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/vulkan-extension-layer/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/vulkan-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/modemmanager/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 170 | ||||
| -rw-r--r-- | pkgs/tools/networking/whois/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/rhash/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/rhash/do-link-so.patch | 22 | ||||
| -rw-r--r-- | pkgs/tools/security/rhash/dont-fail-ln.patch | 59 |
10 files changed, 107 insertions, 185 deletions
diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 5f970916049c6..7624c10dcdcf3 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.280.0"; + version = "1.3.283.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-jWTTUHUvUyF5Vern3QXZo96Yvp7/T1WQjt3OpvJczsw="; + hash = "sha256-UEXKzx1NXCInOnI96Z1hfrpyoWdb3BOGEKstX1gVzIo="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 7d5273b4c30c0..6f5961de851d1 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.280.0"; + version = "1.3.283.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-THy2/hZacOI6IUPFk8cckpBKM4W3pFFeeEwSTVoMDQo="; + hash = "sha256-ClmCYJD9GRtM0XgbZqbW1OY1ukP8+FifneaXUjvNGQ4="; }; nativeBuildInputs = [ cmake pkg-config jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 6ac7ac411185d..afe23265572df 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.280.0"; + version = "1.3.283.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-tp5b7/1lDF9oe/AsiqhVCvYY8p9UguGAgIkLS/hIhfQ="; + hash = "sha256-kRioHGrk6zsBIsnvusq6usAQqxQmCMmGk+O3ckkGEG4="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ]; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 95423b68d6b90..b507ed416c126 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.280.0"; + version = "1.3.283.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-v6Piz1nvNffopz5FVRkgJ1pXj63jCWTyNopkpjcBFXA="; + hash = "sha256-IAlqFCenv5e70XyLSYh2fE84JZQFJwg+YKTGaK7ShKA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 64d61f0e323ca..d432b590c5c3f 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , glib -, udev , libgudev , polkit , ppp @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { # Since /etc is the domain of NixOS, not Nix, we cannot install files there. # But these are just placeholders so we do not need to install them at all. ./no-dummy-dirs-in-sysconfdir.patch + + (fetchpatch { + name = "GI_TYPELIB_PATH.patch"; + url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/daa829287894273879799a383ed4dc373c6111b0.patch"; + hash = "sha256-tPQokiZO2SpTlX8xMlkWjP1AIXgoLHW3rJwnmG33z/k="; + }) ]; strictDeps = true; @@ -55,7 +61,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - udev libgudev polkit ppp @@ -89,14 +94,16 @@ stdenv.mkDerivation rec { # In Nixpkgs g-ir-scanner is patched to produce absolute paths, and # that interferes with ModemManager's tests, causing them to try to # load libraries from the install path, which doesn't usually exist - # when `make check' is run. So to work around that, we run it as an + # when `meson test' is run. So to work around that, we run it as an # install check instead, when those paths will have been created. doInstallCheck = true; - preInstallCheck = '' + installCheckPhase = '' + runHook preInstallCheck export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon" patchShebangs tools/tests/test-wrapper.sh + mesonCheckPhase + runHook postInstallCheck ''; - installCheckTarget = "check"; meta = with lib; { description = "WWAN modem manager, part of NetworkManager"; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix deleted file mode 100644 index 45c794a532eb3..0000000000000 --- a/pkgs/tools/networking/unbound/default.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ stdenv -, lib -, fetchurl -, openssl -, nettle -, expat -, libevent -, libsodium -, protobufc -, hiredis -, python ? null -, swig -, dns-root-data -, pkg-config -, makeWrapper -, symlinkJoin -, bison -, nixosTests - # - # By default unbound will not be built with systemd support. Unbound is a very - # common dependency. The transitive dependency closure of systemd also - # contains unbound. - # Since most (all?) (lib)unbound users outside of the unbound daemon usage do - # not need the systemd integration it is likely best to just default to no - # systemd integration. - # For the daemon use-case, that needs to notify systemd, use `unbound-with-systemd`. - # -, withSystemd ? false -, systemd ? null - # optionally support DNS-over-HTTPS as a server -, withDoH ? false -, withECS ? false -, withDNSCrypt ? false -, withDNSTAP ? false -, withTFO ? false -, withRedis ? false -# Avoid .lib depending on lib.getLib openssl -# The build gets a little hacky, so in some cases we disable this approach. -, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP -# enable support for python plugins in unbound: note this is distinct from pyunbound -# see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html -, withPythonModule ? false -, withLto ? !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isMinGW -, withMakeWrapper ? !stdenv.hostPlatform.isMinGW -, libnghttp2 - -# for passthru.tests -, gnutls -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "unbound"; - version = "1.19.3"; - - src = fetchurl { - url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz"; - hash = "sha256-OuMivn3C+DFgPksDkUNVM61YYcIyLjSnYAap+2XrVrk="; - }; - - outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - - nativeBuildInputs = - lib.optionals withMakeWrapper [ makeWrapper ] - ++ lib.optionals withDNSTAP [ protobufc ] - ++ [ pkg-config ] - ++ lib.optionals withPythonModule [ swig ]; - - buildInputs = [ openssl nettle expat libevent ] - ++ lib.optionals withSystemd [ systemd ] - ++ lib.optionals withDoH [ libnghttp2 ] - ++ lib.optionals withPythonModule [ python ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-ssl=${openssl.dev}" - "--with-libexpat=${expat.dev}" - "--with-libevent=${libevent.dev}" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--sbindir=\${out}/bin" - "--with-rootkey-file=${dns-root-data}/root.key" - "--enable-pie" - "--enable-relro-now" - ] ++ lib.optionals (!withLto) [ - "--disable-flto" - ] ++ lib.optionals withSystemd [ - "--enable-systemd" - ] ++ lib.optionals withPythonModule [ - "--with-pythonmodule" - ] ++ lib.optionals withDoH [ - "--with-libnghttp2=${libnghttp2.dev}" - ] ++ lib.optionals withECS [ - "--enable-subnet" - ] ++ lib.optionals withDNSCrypt [ - "--enable-dnscrypt" - "--with-libsodium=${symlinkJoin { name = "libsodium-full"; paths = [ libsodium.dev libsodium.out ]; }}" - ] ++ lib.optionals withDNSTAP [ - "--enable-dnstap" - ] ++ lib.optionals withTFO [ - "--enable-tfo-client" - "--enable-tfo-server" - ] ++ lib.optionals withRedis [ - "--enable-cachedb" - "--with-libhiredis=${hiredis}" - ]; - - PROTOC_C = lib.optionalString withDNSTAP "${protobufc}/bin/protoc-c"; - - # Remove references to compile-time dependencies that are included in the configure flags - postConfigure = let - inherit (builtins) storeDir; - in '' - sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h - ''; - - nativeCheckInputs = [ bison ]; - - doCheck = true; - - postPatch = lib.optionalString withPythonModule '' - substituteInPlace Makefile.in \ - --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" - ''; - - installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; - - postInstall = '' - make unbound-event-install - '' + lib.optionalString withMakeWrapper '' - wrapProgram $out/bin/unbound-control-setup \ - --prefix PATH : ${lib.makeBinPath [ openssl ]} - '' + lib.optionalString (withMakeWrapper && withPythonModule) '' - wrapProgram $out/bin/unbound \ - --prefix PYTHONPATH : "$out/${python.sitePackages}" \ - --argv0 $out/bin/unbound - ''; - - preFixup = lib.optionalString withSlimLib - # Build libunbound again, but only against nettle instead of openssl. - # This avoids gnutls.out -> unbound.lib -> lib.getLib openssl. - '' - configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only" - configurePhase - buildPhase - if [ -n "$doCheck" ]; then - checkPhase - fi - installPhase - '' - # get rid of runtime dependencies on $dev outputs - + ''substituteInPlace "$lib/lib/libunbound.la" '' - + lib.concatMapStrings - (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") - (builtins.filter (p: p != null) finalAttrs.buildInputs); - - passthru.tests = { - inherit gnutls; - nixos-test = nixosTests.unbound; - nixos-test-exporter = nixosTests.prometheus-exporters.unbound; - }; - - meta = with lib; { - description = "Validating, recursive, and caching DNS resolver"; - license = licenses.bsd3; - homepage = "https://www.unbound.net"; - maintainers = lib.teams.helsinki-systems.members; - platforms = platforms.unix ++ platforms.windows; - }; -}) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 4b7d7b778c0a0..9855a948783af 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.22"; + version = "5.5.23"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - hash = "sha256-5ogHgGODqEUQ5ggoevpfSmJ8GvWImm0ufjnpcbcX7rk="; + hash = "sha256-c/Mx2HXAj6mHH8rElG7+F94sSrVSL1N9HZBvaMWUjlw="; }; patches = [ diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index e789eeba05394..cdad16bb4b43c 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , which , enableStatic ? stdenv.hostPlatform.isStatic +, gettext }: stdenv.mkDerivation rec { @@ -16,7 +17,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-3CW41ULdXoID4cOgrcG2j85tgIJ/sz5hU7A83qpuxf4="; }; + patches = [ ./dont-fail-ln.patch ./do-link-so.patch ]; + nativeBuildInputs = [ which ]; + buildInputs = lib.optionals stdenv.hostPlatform.isFreeBSD [ gettext ]; # configure script is not autotools-based, doesn't support these options dontAddStaticConfigureFlags = true; diff --git a/pkgs/tools/security/rhash/do-link-so.patch b/pkgs/tools/security/rhash/do-link-so.patch new file mode 100644 index 0000000000000..d75df2d048cdb --- /dev/null +++ b/pkgs/tools/security/rhash/do-link-so.patch @@ -0,0 +1,22 @@ +From b8c91ea6551e99e10352386cd46ea26973bb4a4d Mon Sep 17 00:00:00 2001 +From: Aleksey Kravchenko <rhash.admin@gmail.com> +Date: Mon, 11 Sep 2023 03:49:20 +0300 +Subject: [PATCH] Fix #238: Build on Unix + +--- + librhash/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/librhash/Makefile b/librhash/Makefile +index e8ee862..34f1263 100644 +--- a/librhash/Makefile ++++ b/librhash/Makefile +@@ -27,7 +27,7 @@ install-lib-static: $(LIBRHASH_STATIC) + install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED) + $(INSTALL) -d $(SO_DIR) + $(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/ +- test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" || ( \ ++ test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \ + rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \ + ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) ) + diff --git a/pkgs/tools/security/rhash/dont-fail-ln.patch b/pkgs/tools/security/rhash/dont-fail-ln.patch new file mode 100644 index 0000000000000..7703db5feb241 --- /dev/null +++ b/pkgs/tools/security/rhash/dont-fail-ln.patch @@ -0,0 +1,59 @@ +From 9ef90b958b7ae50aeeb5c269468034d73d6e2efe Mon Sep 17 00:00:00 2001 +From: Aleksey Kravchenko <rhash.admin@gmail.com> +Date: Mon, 31 Jul 2023 02:48:15 +0300 +Subject: [PATCH] Fix #238: Build on *BSD + +--- + configure | 3 ++- + librhash/Makefile | 8 ++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/configure b/configure +index dae76d5..39ef8c1 100755 +--- a/configure ++++ b/configure +@@ -567,6 +567,7 @@ qnx() { test "$OS_LC" = "qnx"; } + sunos() { test "$OS_LC" = "sunos"; } + wine() { test "$OS_LC" = "wine"; } + win32() { cygwin || mingw32 || mingw64 || msys || wine; } ++bsd() { dragonfly || freebsd || netbsd || openbsd ; } + posix_make() { aix || bsdos || hpux || irix || qnx || sunos; } + + ##################################################################### +@@ -713,7 +714,7 @@ if win32; then + elif darwin; then + SHARED_EXT=".${RHASH_VERSION_MAJOR}.dylib" + SOLINK_EXT=".dylib" +-elif linux; then ++elif linux || bsd; then + # use the full library version for the library file extension + SHARED_EXT=".so.${RHASH_VERSION}" + fi +diff --git a/librhash/Makefile b/librhash/Makefile +index d48e06e..e8ee862 100644 +--- a/librhash/Makefile ++++ b/librhash/Makefile +@@ -27,9 +27,9 @@ install-lib-static: $(LIBRHASH_STATIC) + install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED) + $(INSTALL) -d $(SO_DIR) + $(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/ +- test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \ ++ test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" || ( \ + rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \ +- ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) ++ ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) ) + + install-implib: + $(INSTALL) -d $(LIBDIR) +@@ -175,9 +175,9 @@ $(EXPORTS_FILE): $(LIB_HEADERS) + $(LIB_HEADERS) | grep -v "$(EXPORTS_SKIP)" > $@ + + $(LIBRHASH_SOLINK): +- test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \ ++ test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \ + rm -f $(LIBRHASH_SO_MAJ) && \ +- ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ) ++ ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ) ) + rm -f $(LIBRHASH_SOLINK) + ln -s $(LIBRHASH_SO_MAJ) $(LIBRHASH_SOLINK) + |