<ins> { fetchFromGitHub, buildGoModule, buildLua, lib, }: let version = "1.6.1"; src = fetchFromGitHub { owner = "tnychn"; repo = "mpv-discord"; rev = "v${version}"; hash = "sha256-P1UaXGboOiqrXapfLzJI6IT3esNtflkQkcNXt4Umukc="; }; core = buildGoModule { name = "mpv-discord-core"; inherit version; src = "${src}/mpv-discord"; vendorHash = "sha256-xe1jyWFQUD+Z4qBAVQ0SBY0gdxmi5XG9t29n3f/WKDs="; }; in buildLua { pname = "mpv-discord"; inherit version src; scriptPath = "scripts/discord.lua"; postInstall = '' substituteInPlace $out/share/mpv/scripts/discord.lua  --replace-fail 'binary_path = ""' 'binary_path = "${core}/bin/mpv-discord"' ''; meta = { description = "Cross-platform Discord Rich Presence integration for mpv with no external dependencies"; homepage = "https://github.com/tnychn/mpv-discord"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bddvlpr ]; }; } </ins>


githubId = 13000278; name = "Maksim Bronsky"; }; <ins> PlushBeaver = { name = "Dmitry Kozlyuk"; email = "dmitry.kozliuk+nixpkgs@gmail.com"; github = "PlushBeaver"; githubId = 8988269; }; </ins> pmahoney = { email = "pat@polycrystal.org"; github = "pmahoney";


# filters assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null; <del> assert enableExtraPlugins || enableDitaaFilter -> jre != null; </del> <ins> assert (enableExtraPlugins && enableJava) || enableDitaaFilter -> jre != null; </ins> assert enableExtraPlugins || enableMscgenFilter -> mscgen != null; assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null; assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null;


<del> { lib, stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let </del> <ins> { lib, stdenv, fetchurl, unzip, writeText, dos2unix, dataPath ? "/var/lib/rainloop" }: let </ins> common = { edition, sha256 }: stdenv.mkDerivation (rec { pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; version = "1.16.0"; <del> nativeBuildInputs = [ unzip ]; </del> <ins> nativeBuildInputs = [ unzip dos2unix ]; </ins> unpackPhase = '' mkdir rainloop


let efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint; efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint; <ins> initrdSecrets = config.boot.initrd.secrets != {}; </ins> in pkgs.writeText "grub-config.xml" (builtins.toXML { splashImage = f cfg.splashImage;


# - https://github.com/NixOS/nixpkgs/issues/108772 # - https://github.com/NixOS/nixpkgs/pull/117555 print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) <del> # TODO: The DB should be encrypted and the following should be machine.fail # instead of machine.succeed but the DB is currently unencrypted and we # want to notice if this isn't the case anymore as the transition to a # encrypted DB can cause data loss!: </del> machine.succeed( <del> "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -i sqlite" </del> <ins> "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep 'db.sqlite: data'" ) machine.fail( "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" </ins> ) ''; })


(callPackage ../development/libraries/volk { }) ; <del> vorta = libsForQt5.callPackage ../applications/backup/vorta { }; </del> <ins> vorta = qt6Packages.callPackage ../applications/backup/vorta { }; </ins> vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };


in stdenv.mkDerivation rec { inherit pname version; <del> src = srcs.toolbox; postUnpack = '' mkdir -p $sourceRoot/third_party/{rxcpp,gtest} ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz ln -s ${srcs.gtest} $sourceRoot/third_party/gtest/release-${gtestVersion}.tar.gz ''; </del> <ins> outputs = [ "out" "dev" "doc" ]; </ins> <del> # broken doCheck = false; </del> <ins> src = srcs.toolbox; </ins> patches = [ <ins> # Fix compile errors with json-c # https://github.com/shogun-toolbox/shogun/pull/4104 </ins> (fetchpatch { <del> url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; </del> <ins> url = "https://github.com/shogun-toolbox/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; </ins> sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; }) <ins> # Fix compile errors with GCC 9+ # https://github.com/shogun-toolbox/shogun/pull/4811 (fetchpatch { url = "https://github.com/shogun-toolbox/shogun/commit/c8b670be4790e0f06804b048a6f3d77c17c3ee95.patch"; sha256 = "sha256-MxsR3Y2noFQevfqWK3nmX5iK4OVWeKBl5tfeDNgjcXk="; }) (fetchpatch { url = "https://github.com/shogun-toolbox/shogun/commit/5aceefd9fb0e2132c354b9a0c0ceb9160cc9b2f7.patch"; sha256 = "sha256-AgJJKQA8vc5oKaTQDqMdwBR4hT4sn9+uW0jLe7GteJw="; }) # Fix compile errors with Eigen 3.4 ./eigen-3.4.patch </ins> ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; <del> CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve xz lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) ++ optional  (opencvSupport) opencv; NIX_CFLAGS_COMPILE="-faligned-new"; cmakeFlags = let onOff = b: if b then "ON" else "OFF"; flag = n: b: "-D"+n+"="+onOff b; in with lib; [ (flag "ENABLE_TESTING" doCheck) (flag "BUILD_META_EXAMPLES" doCheck) (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck) (flag "PythonModular" pythonSupport) (flag "OpenCV" opencvSupport) (flag "USE_SVMLIGHT" withSvmLight) </del> <ins> nativeBuildInputs = [ cmake swig ctags ] ++ (with pythonPackages; [ python jinja2 ply ]); buildInputs = [ eigen blas lapack glpk protobuf json_c libxml2 hdf5 curl libarchive bzip2 xz snappy lzo nlopt lp_solve colpack ] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ]) ++ lib.optional opencvSupport opencv; cmakeFlags = let enableIf = cond: if cond then "ON" else "OFF"; in [ "-DBUILD_META_EXAMPLES=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'"  # Sporadic segfault "-DENABLE_TESTING=${enableIf doCheck}" "-DDISABLE_META_INTEGRATION_TESTS=ON" "-DTRAVIS_DISABLE_META_CPP=ON" "-DPythonModular=${enableIf pythonSupport}" "-DOpenCV=${enableIf opencvSupport}" "-DUSE_SVMLIGHT=${enableIf withSvmLight}" </ins> ]; <ins> CXXFLAGS = "-faligned-new"; doCheck = true; postUnpack = '' mkdir -p $sourceRoot/third_party/{rxcpp,GoogleMock} ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz ln -s ${srcs.gtest} $sourceRoot/third_party/GoogleMock/release-${gtestVersion}.tar.gz ''; </ins> postPatch = '' # Fix preprocessing SVMlight code sed -i


nsh = callPackage ../shells/nsh { }; <del> nushell = callPackage ../shells/nushell { inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security; </del> <ins> nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; </ins> inherit (darwin.apple_sdk) sdk; };


unbound = handleTest ./unbound.nix {}; unifi = handleTest ./unifi.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; <del> upnp = handleTest ./upnp.nix {}; </del> <ins> upnp.iptables = handleTest ./upnp.nix { useNftables = false; }; upnp.nftables = handleTest ./upnp.nix { useNftables = true; }; </ins> uptermd = handleTest ./uptermd.nix {}; uptime-kuma = handleTest ./uptime-kuma.nix {}; usbguard = handleTest ./usbguard.nix {};


<ins> diff --git a/setup/main.py b/setup/main.py index 8d581cd..2ac47b9 100644 --- a/setup/main.py +++ b/setup/main.py @@ -37,7 +37,7 @@ def get_hangul_keyboard_list(): from ctypes import CDLL, c_int, c_char_p -    libhangul = CDLL('libhangul.so.1') +    libhangul = CDLL('@libhangul@') libhangul.hangul_ic_get_n_keyboards.argtypes = [] libhangul.hangul_ic_get_n_keyboards.restype = c_int libhangul.hangul_ic_get_keyboard_id.argtypes = [c_int] </ins>


<del> { stdenv, fetchgit, unzip, firefox-esr, makeWrapper }: </del> <ins> { stdenv, fetchgit, unzip, firefox-esr-52, makeWrapper }: </ins> stdenv.mkDerivation rec { pkgname = "conkeror"; version = "1.0.4"; name = "${pkgname}-${version}"; src = fetchgit { url = git://repo.or.cz/conkeror.git; rev = "refs/tags/${version}";


<del> diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index f33b3bf3f..1214f179c 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") include("cpm-png.cmake") include("cpm-curl.cmake") include("cpm-openmpt.cmake") +	include("cpm-libgme.cmake") endif() - -include("cpm-libgme.cmake") </del>


, systemd , enableProprietaryCodecs ? true , gn <del> , cups, darwin, openbsm, runCommand, xcbuild </del> <ins> , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin </ins> , ffmpeg_3 ? null , lib, stdenv }:


env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=strict-prototypes" <ins> "-Wno-error=deprecated-declarations" </ins> ]); enableParallelBuilding = true;


datacenter.settings = lib.mkOption { type = settingsFormat.type; default = { <del> LOG_LEVEL=4; LOG_FILE_NAME="/var/log/fabricmanager.log"; LOG_APPEND_TO_LOG=1; LOG_FILE_MAX_SIZE=1024; LOG_USE_SYSLOG=0; DAEMONIZE=1; BIND_INTERFACE_IP="127.0.0.1"; STARTING_TCP_PORT=16000; FABRIC_MODE=0; FABRIC_MODE_RESTART=0; STATE_FILE_NAME="/var/tmp/fabricmanager.state"; FM_CMD_BIND_INTERFACE="127.0.0.1"; FM_CMD_PORT_NUMBER=6666; FM_STAY_RESIDENT_ON_FAILURES=0; ACCESS_LINK_FAILURE_MODE=0; TRUNK_LINK_FAILURE_MODE=0; NVSWITCH_FAILURE_MODE=0; ABORT_CUDA_JOBS_ON_FM_EXIT=1; TOPOLOGY_FILE_PATH="${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; DATABASE_PATH="${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; </del> <ins> LOG_LEVEL = 4; LOG_FILE_NAME = "/var/log/fabricmanager.log"; LOG_APPEND_TO_LOG = 1; LOG_FILE_MAX_SIZE = 1024; LOG_USE_SYSLOG = 0; DAEMONIZE = 1; BIND_INTERFACE_IP = "127.0.0.1"; STARTING_TCP_PORT = 16000; FABRIC_MODE = 0; FABRIC_MODE_RESTART = 0; STATE_FILE_NAME = "/var/tmp/fabricmanager.state"; FM_CMD_BIND_INTERFACE = "127.0.0.1"; FM_CMD_PORT_NUMBER = 6666; FM_STAY_RESIDENT_ON_FAILURES = 0; ACCESS_LINK_FAILURE_MODE = 0; TRUNK_LINK_FAILURE_MODE = 0; NVSWITCH_FAILURE_MODE = 0; ABORT_CUDA_JOBS_ON_FM_EXIT = 1; TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; </ins> }; defaultText = lib.literalExpression '' <del> { LOG_LEVEL=4; LOG_FILE_NAME="/var/log/fabricmanager.log"; LOG_APPEND_TO_LOG=1; LOG_FILE_MAX_SIZE=1024; LOG_USE_SYSLOG=0; DAEMONIZE=1; BIND_INTERFACE_IP="127.0.0.1"; STARTING_TCP_PORT=16000; FABRIC_MODE=0; FABRIC_MODE_RESTART=0; STATE_FILE_NAME="/var/tmp/fabricmanager.state"; FM_CMD_BIND_INTERFACE="127.0.0.1"; FM_CMD_PORT_NUMBER=6666; FM_STAY_RESIDENT_ON_FAILURES=0; ACCESS_LINK_FAILURE_MODE=0; TRUNK_LINK_FAILURE_MODE=0; NVSWITCH_FAILURE_MODE=0; ABORT_CUDA_JOBS_ON_FM_EXIT=1; TOPOLOGY_FILE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; DATABASE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; } </del> <ins> { LOG_LEVEL=4; LOG_FILE_NAME="/var/log/fabricmanager.log"; LOG_APPEND_TO_LOG=1; LOG_FILE_MAX_SIZE=1024; LOG_USE_SYSLOG=0; DAEMONIZE=1; BIND_INTERFACE_IP="127.0.0.1"; STARTING_TCP_PORT=16000; FABRIC_MODE=0; FABRIC_MODE_RESTART=0; STATE_FILE_NAME="/var/tmp/fabricmanager.state"; FM_CMD_BIND_INTERFACE="127.0.0.1"; FM_CMD_PORT_NUMBER=6666; FM_STAY_RESIDENT_ON_FAILURES=0; ACCESS_LINK_FAILURE_MODE=0; TRUNK_LINK_FAILURE_MODE=0; NVSWITCH_FAILURE_MODE=0; ABORT_CUDA_JOBS_ON_FM_EXIT=1; TOPOLOGY_FILE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; DATABASE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; } </ins> ''; description = '' Additional configuration options for fabricmanager.


<ins> { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "open-fprintd"; version = "0.6"; src = fetchFromGitHub { owner = "uunicorn"; repo = pname; rev = version; sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; }; propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; checkInputs = with python3Packages; [ dbus-python ]; postInstall = '' install -D -m 644 debian/open-fprintd.service  $out/lib/systemd/system/open-fprintd.service install -D -m 644 debian/open-fprintd-resume.service  $out/lib/systemd/system/open-fprintd-resume.service install -D -m 644 debian/open-fprintd-suspend.service  $out/lib/systemd/system/open-fprintd-suspend.service substituteInPlace $out/lib/systemd/system/open-fprintd.service  --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" substituteInPlace $out/lib/systemd/system/open-fprintd-resume.service  --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" substituteInPlace $out/lib/systemd/system/open-fprintd-suspend.service  --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" ''; postFixup = '' wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" ''; meta = with lib; { description = "Fprintd replacement which allows you to have your own backend as a standalone service"; homepage = "https://github.com/uunicorn/open-fprintd"; license = licenses.gpl2Only; platforms = platforms.linux; }; } </ins>


<del> { lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: </del> <ins> { lib , fetchFromGitHub , singularity , python3Packages }: </ins> <del> buildPythonApplication rec { version = "1.1.3"; </del> <ins> python3Packages.buildPythonApplication rec { </ins> pname = "udocker"; <ins> version = "1.3.1"; </ins> src = fetchFromGitHub { owner = "indigo-dc"; <del> repo = "udocker" ; </del> <ins> repo = "udocker"; </ins> rev = "v${version}"; <del> sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z"; </del> <ins> sha256 = "0dfsjgidsnah8nrclrq10yz3ja859123z81kq4zdifbrhnrn5a2x"; </ins> }; <del> buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ]; postPatch = '' substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH substituteInPlace udocker.py --replace /bin/chmod ${coreutils}/bin/chmod substituteInPlace udocker.py --replace /bin/rm ${coreutils}/bin/rm substituteInPlace tests/unit_tests.py --replace /bin/rm ${coreutils}/bin/rm substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False" ''; </del> <ins> # crun patchelf proot runc fakechroot # are download statistically linked during runtime buildInputs = [ singularity ] ++ (with python3Packages; [ pytest-runner pycurl ]); checkInputs = with python3Packages; [ pytestCheckHook ]; </ins> <del> checkInputs = [ nose mock </del> <ins> disabledTests = [ "test_05__get_volume_bindings" </ins> ]; <del> checkPhase = '' NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py ''; </del> <ins> disabledTestPaths = [ # Network "tests/unit/test_curl.py" "tests/unit/test_dockerioapi.py" ]; </ins> meta = with lib; { description = "basic user tool to execute simple docker containers in user space without root privileges";


vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA="; nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook3 ]; <del> buildInputs = [ webkitgtk_4_1 glib fuse ]; </del> <ins> buildInputs = [ webkitgtk_4_1 glib fuse glib-networking ]; </ins> ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ];


nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; <del> nexus = callPackage ../development/tools/repository-managers/nexus { jre_headless = jre8_headless; }; </del> nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { enableUnfree = true; };


"--enable-docs" "--enable-tools" "--enable-guest-agent" <ins> "--sysconfdir=/etc" </ins> ] # disable sysctl check on darwin. ++ optional stdenv.isDarwin "--cpu=x86_64"


$CXX -o cxx-check ${./cxx-main.cc} ${emulator} ./cxx-check <ins> # test for https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1431745905 # .../include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found # in libcxxStdenv echo "checking whether cxxabi.h can be included... " >&2 $CXX -o include-cxxabi ${./include-cxxabi.cc} ${emulator} ./include-cxxabi </ins> ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib


cuda-native-redist = symlinkJoin { name = "cuda-redist"; <del> paths = with cudaPackages; [ cuda_cudart # cuda_runtime.h cuda_nvcc ] ++ cuda-common-redist; </del> <ins> paths = with cudaPackages; [cuda_nvcc] ++ cuda-common-redist; </ins> }; cuda-redist = symlinkJoin {


# # The following selects the correct Clang version, matching the version # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. <del> clang = let # https://github.com/NixOS/nixpkgs/issues/295322 clangNoMarch = swiftLlvmPackages.clang.override { disableMarch = true; }; in if pkgs.stdenv.isDarwin </del> <ins> clang = if pkgs.stdenv.isDarwin </ins> then <del> clangNoMarch.override rec { </del> <ins> swiftLlvmPackages.clang.override rec { </ins> libc = apple_sdk.Libsystem; bintools = pkgs.bintools.override { inherit libc; }; # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the


}; "kicad-unstable" = { kicadVersion = { <del> version =			"2022-06-21"; </del> <ins> version =			"2022-09-18"; </ins> src = { <del> rev =			"b54bb909755d39dcce38ef277c715d7f31ab8e00"; sha256 =		"0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48"; </del> <ins> rev =			"0efc1149afed2af5b81e4555de4623217ece650f"; sha256 =		"19fqy8yvvl45izg5ynhch9r4gl4ncx0bz9s6n1x98bgzxkdyc14q"; </ins> }; }; libVersion = { <del> version =			"2022-06-21"; </del> <ins> version =			"2022-09-18"; </ins> libSources = { <del> symbols.rev =		"a003b00f6f1056d726e32e911cd65b32946f5503"; symbols.sha256 =	"02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; </del> <ins> symbols.rev =		"879023fba005d23f285b6d052d9e6bcba1d754aa"; symbols.sha256 =	"1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk"; </ins> templates.rev =		"ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; templates.sha256 =	"08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; <del> footprints.rev =	"5df530ec44892407d6382d933ff9ad42dd19df0e"; footprints.sha256 =	"1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; packages3d.rev =	"6bfd8dfa3adc6ac316b9857977c87f22282c6e24"; packages3d.sha256 =	"0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; </del> <ins> footprints.rev =	"b1dfe894de90b0063befc02b914dc9e2b47e3a62"; footprints.sha256 =	"06kn6c00wlnr33mks582xhadvkbbgmqhb4qc1wjfw264pavz7v7y"; packages3d.rev =	"45df600c5e3dd5113d62e6445115e7c37bdf362f"; packages3d.sha256 =	"0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; </ins> }; }; };


<ins> diff --git a/pre_commit/languages/pygrep.py b/pre_commit/languages/pygrep.py index ec55560..44e08a1 100644 --- a/pre_commit/languages/pygrep.py +++ b/pre_commit/languages/pygrep.py @@ -98,7 +98,7 @@ def run_hook( color: bool, ) -> tuple[int, bytes]: cmd = (sys.executable, '-m', __name__, *args, entry) -    return xargs(cmd, file_args, color=color) +    return xargs(cmd, file_args, color=color, env={ "PYTHONPATH": ':'.join(sys.path) }) def main(argv: Sequence[str] | None = None) -> int: </ins>


<ins> { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets , qtquickcontrols2, qtgraphicaleffects }: mkDerivation rec { pname = "AusweisApp2"; version = "1.20.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = "${version}"; sha256 = "0qkwdaxhig4qjim7h20j6ln6w76ycppfc786nd8l69bd1qv46m40"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; meta = with stdenv.lib; { description = "Authentication software for the German ID card"; downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; homepage = "https://www.ausweisapp.bund.de/ausweisapp2/"; license = licenses.eupl12; maintainers = with maintainers; [ b4dm4n ]; platforms = platforms.linux; }; } </ins>


''; }) super.haskell-language-server; <ins> # NOTE: this patch updates the hevm code to work with the latest packages that broke the build # it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1 </ins> # tests depend on a specific version of solc <del> hevm = dontCheck (doJailbreak super.hevm); </del> <ins> hevm = dontCheck (appendPatch ./patches/hevm-update-deps.patch super.hevm); </ins> # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b


stdenv.mkDerivation rec { pname = "igraph"; <del> version = "0.7.1"; </del> <ins> version = "0.8.2"; </ins> src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; <del> sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; </del> <ins> sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; </ins> }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; <del> # This file is normally generated by igraph's bootstrap.sh, but we can do it # ourselves. ~ C. </del> <ins> # 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. </ins> postPatch = '' <del> echo "${version}" > VERSION </del> <ins> echo "${version}" > IGRAPH_VERSION </ins> ''; <ins> doCheck = true; </ins> meta = { description = "The network analysis package"; homepage = "https://igraph.org/"; license = lib.licenses.gpl2; <ins> # NB: Known to fail tests on aarch64. platforms = [ "x86_64-linux" ]; </ins> maintainers = [ lib.maintainers.MostAwesomeDude ]; }; }


<del> { stdenv, fetchFromGitHub, cmake, gmp }: </del> <ins> { stdenv, fetchFromGitHub, cmake, gmp, coreutils }: </ins> stdenv.mkDerivation rec { pname = "lean"; <del> version = "3.10.0"; </del> <ins> version = "3.13.1"; </ins> src = fetchFromGitHub { owner  = "leanprover-community"; repo   = "lean"; rev    = "v${version}"; <del> sha256 = "0nmh09x3scfqg0bg1qf8b7z67s11hbfd7kr1h6k1zw94fyn2mg8q"; </del> <ins> sha256 = "1ak5l40h5yjlbzz92l724l6bm5q341cg6k1yk13sbwn42l8szsar"; </ins> }; nativeBuildInputs = [ cmake ];


<del> { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig </del> <ins> { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig </ins> , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ <del> stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 </del> <ins> stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 </ins> fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr


<ins> { lib , stdenv , fetchFromGitHub , buildPythonPackage , unittestCheckHook , cython , setuptools , wheel , numpy }: buildPythonPackage { pname = "daqp"; version = "0.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "darnstrom"; repo = "daqp"; rev = "5a15a3d16731d3d50f867218c1b281567db556fd"; hash = "sha256-in7Ci/wM7i0csJ4XVfo1lboWOyfuuU+8E+TzGmMV3x0="; }; sourceRoot = "source/interfaces/daqp-python"; postPatch = '' sed -i 's|../../../daqp|../..|' setup.py sed -i 's|if src_path and os.path.exists(src_path):|if False:|' setup.py ''; nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "test" "-p" "'*.py'" "-v" ]; nativeBuildInputs = [ cython setuptools wheel ]; propagatedBuildInputs = [ numpy ]; pythonImportsCheck = [ "daqp" ]; meta = with lib; { description = "A dual active-set algorithm for convex quadratic programming"; homepage = "https://github.com/darnstrom/daqp"; license = licenses.mit; maintainers = with maintainers; [ renesat ]; }; } </ins>


, nlopt , ipopt , boost <ins> , tbb </ins> }: stdenv.mkDerivation rec { pname = "pagmo2"; <del> version = "2.9"; </del> <ins> version = "2.18.0"; </ins> src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; <del> sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; </del> <ins> sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj"; </ins> }; nativeBuildInputs = [ cmake ]; <del> buildInputs = [ eigen nlopt ipopt boost ]; </del> <ins> buildInputs = [ eigen nlopt ipopt boost tbb ]; </ins> cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no"


<ins> # pkgs.appimageTools {#sec-pkgs-appimageTools} `pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, `pkgs.appimage-run` can be used as well. ::: warning The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future. ::: ## AppImage formats {#ssec-pkgs-appimageTools-formats} There are different formats for AppImages, see [the specification](https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format) for details. - Type 1 images are ISO 9660 files that are also ELF executables. - Type 2 images are ELF executables with an appended filesystem. They can be told apart with `file -k`: ```ShellSession $ file -k type1.AppImage type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0, spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped012- data $ file -k type2.AppImage type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped012- data ``` Note how the type 1 AppImage is described as an `ISO 9660 CD-ROM filesystem`, and the type 2 AppImage is not. ## Wrapping {#ssec-pkgs-appimageTools-wrapping} Depending on the type of AppImage you're wrapping, you'll have to use `wrapType1` or `wrapType2`. ```nix appimageTools.wrapType2 { # or wrapType1 name = "patchwork"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage"; sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; }; extraPkgs = pkgs: with pkgs; [ ]; } ``` - `name` specifies the name of the resulting image. - `src` specifies the AppImage file to extract. - `extraPkgs` allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: - Looking through the extracted AppImage files, reading its scripts and running `patchelf` and `ldd` on its executables. This can also be done in `appimage-run`, by setting `APPIMAGE_DEBUG_EXEC=bash`. - Running `strace -vfefile` on the wrapped executable, looking for libraries that can't be found. </ins>


]; disabledTests = [ <del> # Test are failing due to scipy update (removal of scipy.random in 1.9.0) # Is fixed upstream but requires a new release "test_feasibility_problem" </del> <ins> # Need an unfree license package - mkl </ins> "test_issue14" <del> "test_polish_random" "test_polish_unconstrained" "test_primal_and_dual_infeasible_problem" "test_primal_infeasible_problem" "test_solve" "test_unconstrained_problem" "test_update_A_allind" "test_update_A" "test_update_bounds" "test_update_l" "test_update_P_A_allind" "test_update_P_A_indA" "test_update_P_A_indP_indA" "test_update_P_A_indP" "test_update_P_allind" "test_update_P" "test_update_q" "test_update_u" "test_warm_start" </del> ]; meta = with lib; {


lapack blas python3 <ins> (getLib gfortran.cc) # libgfortran.so </ins> ] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [ cuda_cudart # cuda_runtime.h libcublas # cublas_v2.h


<para> This chapter contains information about how to use and maintain the Nix expressions for a number of specific packages, such as the Linux kernel or X.org. </para> <del> <xi:include href="citrix.xml" /> </del> <ins> <xi:include href="citrix.section.xml" /> </ins> <xi:include href="dlib.xml" /> <xi:include href="eclipse.section.xml" /> <xi:include href="elm.section.xml" />


rustcArgs ? [], strip ? true }: <ins> let darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; in </ins> makeBinWriter { compileScript = '' cp "$contentPath" tmp.rs <del> PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} -o "$out" tmp.rs </del> <ins> PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} ${lib.escapeShellArgs darwinArgs} -o "$out" tmp.rs </ins> ''; inherit strip; } name;


<del> From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" <hjl.tools@gmail.com> Date: Wed, 8 Aug 2018 06:09:15 -0700 Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the corresponding x86 instruction set isn’t used.  When merging properties from 2 input files and one input file doesn't have the GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have it neither.  This patch removes the GNU_PROPERTY_X86_ISA_1_USED property if an input file doesn't have it. This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA requirement. bfd/ PR ld/23486 * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. (_bfd_x86_elf_link_setup_gnu_properties): Adding the GNU_PROPERTY_X86_ISA_1_NEEDED, instead of GNU_PROPERTY_X86_ISA_1_USED, property. ld/ PR ld/23486 * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. * testsuite/ld-x86-64/x86-64.exp: Likewise. * testsuite/ld-i386/pr23486a.d: New file. * testsuite/ld-i386/pr23486b.d: Likewise. * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. * testsuite/ld-x86-64/pr23486a.d: Likewise. * testsuite/ld-x86-64/pr23486a.s: Likewise. * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. * testsuite/ld-x86-64/pr23486b.d: Likewise. * testsuite/ld-x86-64/pr23486b.s: Likewise. * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". * testsuite/ld-i386/property-4.r: Likewise. * testsuite/ld-i386/property-5.r: Likewise. * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. * testsuite/ld-x86-64/property-3.r: Likewise. * testsuite/ld-x86-64/property-4.r: Likewise. * testsuite/ld-x86-64/property-5.r: Likewise. * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. (cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) --- bfd/elfxx-x86.c                               | 25 ++++++++++++--- ld/testsuite/ld-i386/i386.exp                 |  2 ++ ld/testsuite/ld-i386/pr23486a.d               | 10 ++++++ ld/testsuite/ld-i386/pr23486b.d               | 10 ++++++ ld/testsuite/ld-i386/property-3.r             |  1 - ld/testsuite/ld-i386/property-4.r             |  1 - ld/testsuite/ld-i386/property-5.r             |  1 - ld/testsuite/ld-i386/property-x86-ibt3a.d     |  5 ++- ld/testsuite/ld-i386/property-x86-ibt3b.d     |  5 ++- ld/testsuite/ld-i386/property-x86-shstk3a.d   |  5 ++- ld/testsuite/ld-i386/property-x86-shstk3b.d   |  5 ++- ld/testsuite/ld-x86-64/pr23486a-x32.d         | 10 ++++++ ld/testsuite/ld-x86-64/pr23486a.d             | 10 ++++++ ld/testsuite/ld-x86-64/pr23486a.s             | 30 +++++++++++++++++ ld/testsuite/ld-x86-64/pr23486b-x32.d         | 10 ++++++ ld/testsuite/ld-x86-64/pr23486b.d             | 10 ++++++ ld/testsuite/ld-x86-64/pr23486b.s             | 30 +++++++++++++++++ ld/testsuite/ld-x86-64/property-3.r           |  1 - ld/testsuite/ld-x86-64/property-4.r           |  1 - ld/testsuite/ld-x86-64/property-5.r           |  1 - .../ld-x86-64/property-x86-ibt3a-x32.d        |  5 ++- ld/testsuite/ld-x86-64/property-x86-ibt3a.d   |  5 ++- .../ld-x86-64/property-x86-ibt3b-x32.d        |  5 ++- ld/testsuite/ld-x86-64/property-x86-ibt3b.d   |  5 ++- .../ld-x86-64/property-x86-shstk3a-x32.d      |  5 ++- ld/testsuite/ld-x86-64/property-x86-shstk3a.d |  5 ++- .../ld-x86-64/property-x86-shstk3b-x32.d      |  5 ++- ld/testsuite/ld-x86-64/property-x86-shstk3b.d |  5 ++- ld/testsuite/ld-x86-64/x86-64.exp             |  4 +++ 31 files changed, 211 insertions(+), 47 deletions(-) create mode 100644 ld/testsuite/ld-i386/pr23486a.d create mode 100644 ld/testsuite/ld-i386/pr23486b.d create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, switch (pr_type) { case GNU_PROPERTY_X86_ISA_1_USED: +      if (aprop == NULL || bprop == NULL) +	{ +	  /* Only one of APROP and BPROP can be NULL.  */ +	  if (aprop != NULL) +	    { +	      /* Remove this property since the other input file doesn't +		 have it.  */ +	      aprop->pr_kind = property_remove; +	      updated = TRUE; +	    } +	  break; +	} +      goto or_property; + case GNU_PROPERTY_X86_ISA_1_NEEDED: if (aprop != NULL && bprop != NULL) { +or_property: number = aprop->u.number; aprop->u.number = number | bprop->u.number; -	  /* Remove the property if ISA bits are empty.  */ +	  /* Remove the property if all bits are empty.  */ if (aprop->u.number == 0) { aprop->pr_kind = property_remove; @@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, { if (aprop->u.number == 0) { -		  /* Remove APROP if ISA bits are empty.  */ +		  /* Remove APROP if all bits are empty.  */ aprop->pr_kind = property_remove; updated = TRUE; } } else { -	      /* Return TRUE if APROP is NULL and ISA bits of BPROP +	      /* Return TRUE if APROP is NULL and all bits of BPROP aren't empty to indicate that BPROP should be added to ABFD.  */ updated = bprop->u.number != 0; @@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties { /* If the separate code program header is needed, make sure that the first read-only PT_LOAD segment has no code by -	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */ +	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */ prop = _bfd_elf_get_property (ebfd, -					GNU_PROPERTY_X86_ISA_1_USED, +					GNU_PROPERTY_X86_ISA_1_NEEDED, 4); prop->u.number = GNU_PROPERTY_X86_ISA_1_486; prop->pr_kind = property_number; diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 6d794fe653..78dad02579 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -462,6 +462,8 @@ run_dump_test "pr23189" run_dump_test "pr23194" run_dump_test "pr23372a" run_dump_test "pr23372b" +run_dump_test "pr23486a" +run_dump_test "pr23486b" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d new file mode 100644 index 0000000000..41a6dcf7d5 --- /dev/null +++ b/ld/testsuite/ld-i386/pr23486a.d @@ -0,0 +1,10 @@ +#source: ../ld-x86-64/pr23486a.s +#source: ../ld-x86-64/pr23486b.s +#as: --32 +#ld: -r -m elf_i386 +#readelf: -n + +Displaying notes found in: .note.gnu.property +  Owner                 Data size	Description +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586 diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d new file mode 100644 index 0000000000..08019b7274 --- /dev/null +++ b/ld/testsuite/ld-i386/pr23486b.d @@ -0,0 +1,10 @@ +#source: ../ld-x86-64/pr23486b.s +#source: ../ld-x86-64/pr23486a.s +#as: --32 +#ld: -r -m elf_i386 +#readelf: -n + +Displaying notes found in: .note.gnu.property +  Owner                 Data size	Description +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586 diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r index 0ed91f5922..d03203c1e5 100644 --- a/ld/testsuite/ld-i386/property-3.r +++ b/ld/testsuite/ld-i386/property-3.r @@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 -	x86 ISA used: 586, SSE x86 ISA needed: i486, 586 #pass diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r index cb2bc15d9a..da295eb6c7 100644 --- a/ld/testsuite/ld-i386/property-4.r +++ b/ld/testsuite/ld-i386/property-4.r @@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 -	x86 ISA used: i486, 586, SSE x86 ISA needed: i486, 586, SSE #pass diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r index 552965058c..e4141594b3 100644 --- a/ld/testsuite/ld-i386/property-5.r +++ b/ld/testsuite/ld-i386/property-5.r @@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x900000 -	x86 ISA used: i486, 586, SSE x86 ISA needed: i486, 586, SSE #pass diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d index 4bb35b00fb..0aedea1614 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt3a.d +++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: i486, 586, SSE2, SSE3 -	x86 ISA needed: 586, SSE, SSE3, SSE4_1 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d index 418d58a8f7..bd69ac6478 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt3b.d +++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: i486, 586, SSE2, SSE3 -	x86 ISA needed: 586, SSE, SSE3, SSE4_1 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d index e261038f60..76d2a39f2c 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk3a.d +++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: i486, 586, SSE2, SSE3 -	x86 ISA needed: 586, SSE, SSE3, SSE4_1 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d index 25f3d2361e..e770ecffa5 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk3b.d +++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: i486, 586, SSE2, SSE3 -	x86 ISA needed: 586, SSE, SSE3, SSE4_1 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d new file mode 100644 index 0000000000..6d9fa68cdb --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d @@ -0,0 +1,10 @@ +#source: pr23486a.s +#source: pr23486b.s +#as: --x32 +#ld: -r -m elf32_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property +  Owner                 Data size	Description +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586 diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d new file mode 100644 index 0000000000..dc2b7bf760 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr23486a.d @@ -0,0 +1,10 @@ +#source: pr23486a.s +#source: pr23486b.s +#as: --64 -defsym __64_bit__=1 +#ld: -r -m elf_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property +  Owner                 Data size	Description +  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586 diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s new file mode 100644 index 0000000000..a07d0c7ced --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr23486a.s @@ -0,0 +1,30 @@ +	.section ".note.gnu.property", "a" +.ifdef __64_bit__ +	.p2align 3 +.else +	.p2align 2 +.endif +	.long 1f - 0f		/* name length.  */ +	.long 4f - 1f		/* data length.  */ +	/* NT_GNU_PROPERTY_TYPE_0 */ +	.long 5			/* note type.  */ +0: +	.asciz "GNU"		/* vendor name.  */ +1: +.ifdef __64_bit__ +	.p2align 3 +.else +	.p2align 2 +.endif +	/* GNU_PROPERTY_X86_ISA_1_USED */ +	.long 0xc0000000	/* pr_type.  */ +	.long 3f - 2f		/* pr_datasz.  */ +2: +	.long 0xa +3: +.ifdef __64_bit__ +	.p2align 3 +.else +	.p2align 2 +.endif +4: diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d new file mode 100644 index 0000000000..0445e69d82 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d @@ -0,0 +1,10 @@ +#source: pr23486b.s +#source: pr23486a.s +#as: --x32 +#ld: -r -m elf32_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property +  Owner                 Data size	Description +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586 diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d new file mode 100644 index 0000000000..dc2b7bf760 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr23486b.d @@ -0,0 +1,10 @@ +#source: pr23486a.s +#source: pr23486b.s +#as: --64 -defsym __64_bit__=1 +#ld: -r -m elf_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property +  Owner                 Data size	Description +  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586 diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s new file mode 100644 index 0000000000..c5167eeb65 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr23486b.s @@ -0,0 +1,30 @@ +	.section ".note.gnu.property", "a" +.ifdef __64_bit__ +	.p2align 3 +.else +	.p2align 2 +.endif +	.long 1f - 0f		/* name length.  */ +	.long 4f - 1f		/* data length.  */ +	/* NT_GNU_PROPERTY_TYPE_0 */ +	.long 5			/* note type.  */ +0: +	.asciz "GNU"		/* vendor name.  */ +1: +.ifdef __64_bit__ +	.p2align 3 +.else +	.p2align 2 +.endif +	/* GNU_PROPERTY_X86_ISA_1_NEEDED */ +	.long 0xc0000001	/* pr_type.  */ +	.long 3f - 2f		/* pr_datasz.  */ +2: +	.long 0x3 +3: +.ifdef __64_bit__ +	.p2align 3 +.else +	.p2align 2 +.endif +4: diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r index 0ed91f5922..d03203c1e5 100644 --- a/ld/testsuite/ld-x86-64/property-3.r +++ b/ld/testsuite/ld-x86-64/property-3.r @@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 -	x86 ISA used: 586, SSE x86 ISA needed: i486, 586 #pass diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r index cb2bc15d9a..da295eb6c7 100644 --- a/ld/testsuite/ld-x86-64/property-4.r +++ b/ld/testsuite/ld-x86-64/property-4.r @@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 -	x86 ISA used: i486, 586, SSE x86 ISA needed: i486, 586, SSE #pass diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r index 552965058c..e4141594b3 100644 --- a/ld/testsuite/ld-x86-64/property-5.r +++ b/ld/testsuite/ld-x86-64/property-5.r @@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x900000 -	x86 ISA used: i486, 586, SSE x86 ISA needed: i486, 586, SSE #pass diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d index 011426f5a4..4cec728dc7 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d index 1b4229a037..a8df49a351 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d index 290ed6abf1..c112626711 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d index 1142e03272..f10dffdc2c 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d index 819542d181..0147a3c7b6 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d index 4c5d0e0a18..1f8c2dc929 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d index ba181e0bc5..7ca2539ca5 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d index 5216f385dd..f66a40e449 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d @@ -6,6 +6,5 @@ Displaying notes found in: .note.gnu.property Owner                 Data size	Description -  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0 -      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -	x86 ISA needed: i486, 586, SSE2, SSE3 +  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0 +      Properties: x86 ISA needed: i486, 586, SSE2, SSE3 diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 6edb9e86f4..ae21e554ad 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -403,6 +403,10 @@ run_dump_test "pr23372a" run_dump_test "pr23372a-x32" run_dump_test "pr23372b" run_dump_test "pr23372b-x32" +run_dump_test "pr23486a" +run_dump_test "pr23486a-x32" +run_dump_test "pr23486b" +run_dump_test "pr23486b-x32" if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { return -- 2.20.1 </del>