Unverified Commit 51c2025d authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #231026: staging-next 2023-05-10

parents bec91668 021f9a2f

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed.



- Python implements [PEP 668](https://peps.python.org/pep-0668/), providing better feedback to users that try to run `pip install` system-wide.



- `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands.



- `libxcrypt`, the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, Dovecot, and [many other packages](https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20libxcrypt&type=code).

nixos/modules/config/no-x-libs.nix

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ with lib; 
      networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };

      pango = super.pango.override { x11Support = false; };

      pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };

      pipewire = super.pipewire.override { x11Support = false; };

      qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };

      qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });

      qt5 = super.qt5.overrideScope (const (super': {

nixos/tests/bpf.nix

+5 −2
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { 
        "    printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() "

        "}'"))

    # module BTF (bpftrace >= 0.17)

    print(machine.succeed("bpftrace -e 'kfunc:nft_trans_alloc_gfp { "

    # test is currently disabled on aarch64 as kfunc does not work there yet

    # https://github.com/iovisor/bpftrace/issues/2496

    print(machine.succeed("uname -m | grep aarch64 || "

        "bpftrace -e 'kfunc:nft_trans_alloc_gfp { "

        "    printf(\"portid: %d\\n\", args->ctx->portid); "

        "} BEGIN { exit() }'"))

  '';

pkgs/applications/version-management/git/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -186,14 +186,12 @@ stdenv.mkDerivation (finalAttrs: { 


      # Fix references to the perl, sed, awk and various coreutil binaries used by

      # shell scripts that git calls (e.g. filter-branch)

      # and completion scripts

      SCRIPT="$(cat <<'EOS'

        BEGIN{

          @a=(

            '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',

            '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',

            '${coreutils}/bin/wc', '${coreutils}/bin/tr',

            '${coreutils}/bin/ls'

            '${coreutils}/bin/wc', '${coreutils}/bin/tr'

            ${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}

          );

        }
@@ -204,8 +202,7 @@ stdenv.mkDerivation (finalAttrs: { 
      EOS

      )"

      perl -0777 -i -pe "$SCRIPT" \

        $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse} \

        $out/share/bash-completion/completions/{git,gitk}

        $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}





      # Also put git-http-backend into $PATH, so that we can use smart

pkgs/build-support/cc-wrapper/cc-wrapper.sh

+18 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ cInclude=1 
expandResponseParams "$@"

linkType=$(checkLinkType "${params[@]}")



declare -ag positionalArgs=()

declare -i n=0

nParams=${#params[@]}

while (( "$n" < "$nParams" )); do
@@ -54,6 +55,17 @@ while (( "$n" < "$nParams" )); do 
                c++*) isCxx=1 ;;

            esac

            ;;

        --) # Everything else is positional args!

            # See: https://github.com/llvm/llvm-project/commit/ed1d07282cc9d8e4c25d585e03e5c8a1b6f63a74



            # Any positional arg (i.e. any argument after `--`) will be

            # interpreted as a "non flag" arg:

            if [[ -v "params[$n]" ]]; then nonFlagArgs=1; fi



            positionalArgs=("${params[@]:$n}")

            params=("${params[@]:0:$((n - 1))}")

            break;

            ;;

        -?*) ;;

        *) nonFlagArgs=1 ;; # Includes a solitary dash (`-`) which signifies standard input; it is not a flag

    esac
@@ -207,6 +219,12 @@ if [ "$cc1" = 1 ]; then 
  extraBefore=()

fi



# Finally, if we got any positional args, append them to `extraAfter`

# now:

if [[ "${#positionalArgs[@]}" -gt 0 ]]; then

    extraAfter+=(-- "${positionalArgs[@]}")

fi



# Optionally print debug info.

if (( "${NIX_DEBUG:-0}" >= 1 )); then

    # Old bash workaround, see ld-wrapper for explanation.