diff options
Diffstat (limited to 'pkgs/applications')
20 files changed, 75 insertions, 69 deletions
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 1c457c8a0e7b..17d90c6d310b 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -4,7 +4,6 @@ , scons , boost , ladspaH -, libcxxabi }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "-fomit-frame-pointer -ffast-math -mfpmath=sse" "-I${boost.dev}/include -I${ladspaH}/include" \ --replace "env.has_key('cxx')" "True" \ --replace "env['cxx']" "'${stdenv.cc.targetPrefix}c++'" \ - --replace "-Wl,--strip-all" "${lib.optionalString stdenv.isDarwin "-L${libcxxabi}/lib"}" + --replace "-Wl,--strip-all" "" substituteInPlace filters.cpp \ --replace "LADSPA_HINT_SAMPLE_RATE, 0, 0.5" "LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5" diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 3d0073bf8143..00f50233d50f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -83,6 +83,18 @@ self: let rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile ''; }); + + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = (old.postUnpack or "") + "\n" + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); }; elpaDevelPackages = super // overrides; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 0b142281559a..18a0a36fc06c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -63,9 +63,6 @@ self: let cl-print = null; # builtin tle = null; # builtin advice = null; # builtin - seq = if lib.versionAtLeast self.emacs.version "27" - then null - else super.seq; # Compilation instructions for the Ada executables: # https://www.nongnu.org/ada-mode/ ada-mode = super.ada-mode.overrideAttrs (old: { @@ -174,6 +171,18 @@ self: let ''; }); + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = (old.postUnpack or "") + "\n" + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); + }; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index c48550f8680a..a52533564616 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -68,6 +68,7 @@ , withAlsaLib ? false , withAthena ? false , withCsrc ? true +, withDbus ? stdenv.isLinux , withGTK2 ? false , withGTK3 ? withPgtk && !noGui , withGconf ? false @@ -77,6 +78,7 @@ , withMotif ? false , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false +, withSelinux ? stdenv.isLinux , withSQLite3 ? lib.versionAtLeast version "29" , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withToolkitScrollBars ? true @@ -227,8 +229,9 @@ mkDerivation (finalAttrs: { alsa-lib ] ++ lib.optionals withGpm [ gpm - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals withDbus [ dbus + ] ++ lib.optionals withSelinux [ libselinux ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [ gsettings-desktop-schemas @@ -338,6 +341,8 @@ mkDerivation (finalAttrs: { (lib.withFeature withTreeSitter "tree-sitter") (lib.withFeature withXinput2 "xinput2") (lib.withFeature withXwidgets "xwidgets") + (lib.withFeature withDbus "dbus") + (lib.withFeature withSelinux "selinux") ]; env = lib.optionalAttrs withNativeCompilation { diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index dce0ad168106..299c5e06cbd5 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -75,10 +75,6 @@ rustPlatform.buildRustPackage rec { # This variable is read by build script, so that Lapce editor knows its version RELEASE_TAG_NAME = "v${version}"; - - } // lib.optionalAttrs stdenv.cc.isClang { - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; postPatch = '' diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index db789c4babd3..da50844aa726 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -78,11 +78,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { darwin.apple_sdk.frameworks.AppKit ]; - env = lib.optionalAttrs stdenv.isDarwin { - # Work around https://github.com/NixOS/nixpkgs/issues/166205 - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - postFixup = let libPath = lib.makeLibraryPath ([ libglvnd diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 5aab7711cf3e..a32285f19e7a 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0075"; + version = "9.1.0148"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-rirPSh0rFg25JHl4idADLz6fIRmEALzp2Oa7De6uuGU="; + hash = "sha256-lBs9PwNE3GoxtMka9oftYx3gegjCv6D3sEyAWK6RZzM="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/applications/misc/done/default.nix index 5e163df938b8..cbc23dc9eb4f 100644 --- a/pkgs/applications/misc/done/default.nix +++ b/pkgs/applications/misc/done/default.nix @@ -60,8 +60,6 @@ stdenv.mkDerivation rec { env = lib.optionalAttrs stdenv.isDarwin { GETTEXT_DIR = gettext; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; meta = with lib; { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 5b42f1d08c3c..8bc2a69c1b91 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -38,6 +38,16 @@ let hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; }; }); + + netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { + version = "0.9.0"; + + src = fetchPypi { + pname = "netaddr"; + inherit version; + hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; + }; + }); } ) diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 661bbd22be85..3bd280766b16 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages }: stdenv.mkDerivation rec { pname = "procmail"; @@ -30,8 +30,19 @@ stdenv.mkDerivation rec { sed -e "3i\ .PHONY: install " -i Makefile + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace src/Makefile.0 \ + --replace-fail '@./_autotst' '@${stdenv.hostPlatform.emulator buildPackages} ./_autotst' + sed -e '3i\ + _autotst() { ${stdenv.hostPlatform.emulator buildPackages} ./_autotst "$@"; } \ + _locktst() { ${stdenv.hostPlatform.emulator buildPackages} ./_locktst "$@"; } \ + ' -i src/autoconf ''; + # default target is binaries + manpages; manpages don't cross compile without more work. + makeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "bins" ]; + installTargets = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "install.bin" ]; + meta = with lib; { description = "Mail processing and filtering utility"; homepage = "https://github.com/BuGlessRB/procmail/"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 45823df01d99..25a25e8f358d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -183,7 +183,7 @@ let # We only link c++ libs here, our compiler wrapper can find wasi libc and crt itself. wasiSysRoot = runCommand "wasi-sysroot" {} '' mkdir -p $out/lib/wasm32-wasi - for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/* ${pkgsCross.wasi32.llvmPackages.libcxxabi}/lib/*; do + for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/*; do ln -s $lib $out/lib/wasm32-wasi done ''; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 899b44aae2e1..464926d07f44 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { loguru more-itertools packaging - pendulum_3 + pendulum psutil pynzb pyrsistent diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index a0c7b678d5a0..45197d2d7086 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages.libcxx ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 1943a395bd7b..2cf57b8b6c00 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -35,10 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ]; - env = lib.optionalAttrs (stdenv.cc.libcxx != null) { - # work around https://github.com/NixOS/nixpkgs/issues/166205 - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - } // lib.optionalAttrs stdenv.cc.isClang { + env = lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } // lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index ff945e3aeed2..5fb25d1cc93c 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -2,7 +2,7 @@ , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 -, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin +, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, e2fsprogs, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime , libinput, libcap, libjson, libsecret, libcanberra-gtk3 @@ -96,7 +96,6 @@ stdenv.mkDerivation rec { libcap libcanberra-gtk3 libcxx - libcxxabi libinput libjpeg libjson diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index d4d0290277e1..16518734c656 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -120,11 +120,6 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' ''; - env = lib.optionalAttrs stdenv.cc.isClang { - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - # Some tests require networking doCheck = false; diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index fbc41a67d73b..dca55d969db4 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -50,11 +50,6 @@ stdenv.mkDerivation (finalAttrs: { "-DINSTALL_LICENSE=OFF" ]; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index ddade9b4b384..36f164e8492d 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { pytest-freezer pytest-mock pytest-regressions - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) ]; doCheck = true; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 767172787fba..8f57c97230fb 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.43.2"; + version = "2.44.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-9hLBq8Y1V9UK04SYY/yRCWcBOfyZAeV0Rg7HbgURrbk="; + hash = "sha256-41hzjctbXqNAzpAKABXAOuhugE5/9k5HqkYx3e5oHeM="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -318,25 +318,20 @@ stdenv.mkDerivation (finalAttrs: { disable_test t0001-init 'shared overrides system' disable_test t0001-init 'init honors global core.sharedRepository' disable_test t1301-shared-repo - # git-completion.bash: line 405: compgen: command not found: - disable_test t9902-completion 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' + # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found + disable_test t9902-completion # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks - - ${lib.optionalString (!sendEmailSupport) '' - # Disable sendmail tests - disable_test t9001-send-email - ''} - + '' + lib.optionalString (!sendEmailSupport) '' + # Disable sendmail tests + disable_test t9001-send-email + '' + '' # XXX: I failed to understand why this one fails. # Could someone try to re-enable it on the next release ? # Tested to fail: 2.18.0 and 2.19.0 disable_test t1700-split-index "null sha1" - # Tested to fail: 2.18.0 - disable_test t9902-completion "sourcing the completion script clears cached --options" - # Flaky tests: disable_test t5319-multi-pack-index disable_test t6421-merge-partial-clone @@ -345,12 +340,11 @@ stdenv.mkDerivation (finalAttrs: { disable_test t0021-conversion disable_test t3910-mac-os-precompose - ${lib.optionalString (!perlSupport) '' - # request-pull is a Bash script that invokes Perl, so it is not available - # when NO_PERL=1, and the test should be skipped, but the test suite does - # not check for the Perl prerequisite. - disable_test t5150-request-pull - ''} + '' + lib.optionalString (!perlSupport) '' + # request-pull is a Bash script that invokes Perl, so it is not available + # when NO_PERL=1, and the test should be skipped, but the test suite does + # not check for the Perl prerequisite. + disable_test t5150-request-pull '' + lib.optionalString stdenv.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. @@ -358,8 +352,6 @@ stdenv.mkDerivation (finalAttrs: { # fail (as of 2.33.0) #===( 18623;1208 8/? 224/? 2/? )= =fatal: Not a valid object name refs/tags/signed-empty disable_test t6300-for-each-ref - #===( 22665;1651 9/? 1/? 0/? 0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found - disable_test t9902-completion # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) disable_test t5003-archive-zip '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 188c5bbe2206..695e596e8c85 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -4,10 +4,7 @@ , lib , emptyDirectory , linkFarm -, symlinkJoin , jam -, libcxx -, libcxxabi , openssl , xcbuild , CoreServices @@ -33,10 +30,6 @@ let # cone-based Git sparse checkout, either.) { name = "contrib"; path = "${src}/contrib"; } ]; - libcxxUnified = symlinkJoin { - inherit (libcxx) name; - paths = [ libcxx libcxxabi ]; - }; in stdenv.mkDerivation rec { pname = "p4"; @@ -70,7 +63,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ "-sOSVER=1013" "-sMACOSX_SDK=${emptyDirectory}" - "-sLIBC++DIR=${libcxxUnified}/lib" + "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" ]; CCFLAGS = |