Unverified Commit 73205ff5 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 22032910 7764e287

lib/systems/examples.nix

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ rec { 
    config = "armv6l-unknown-linux-gnueabihf";

  } // platforms.raspberrypi;



  bluefield2 = {

    config = "aarch64-unknown-linux-gnu";

  } // platforms.bluefield2;



  remarkable1 = {

    config = "armv7l-unknown-linux-gnueabihf";

  } // platforms.zero-gravitas;

lib/systems/platforms.nix

+8 −0
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ rec { 
  # Legacy attribute, for compatibility with existing configs only.

  raspberrypi2 = armv7l-hf-multiplatform;



  # Nvidia Bluefield 2 (w. crypto support)

  bluefield2 = {

    gcc = {

      arch = "armv8-a+fp+simd+crc+crypto";

      cpu = "cortex-a72";

    };

  };



  zero-gravitas = {

    linux-kernel = {

      name = "zero-gravitas";

nixos/modules/services/networking/cgit.nix

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ let 
      # taken from https://github.com/python/cpython/blob/05cb728d68a278d11466f9a6c8258d914135c96c/Lib/re.py#L251-L266

      special = [

        "(" ")" "[" "]" "{" "}" "?" "*" "+" "-" "|" "^" "$" "\\" "." "&" "~"

        "#" " " "\t" "\n" "\r" "\v" "\f"

        "#" " " "\t" "\n" "\r"

        "" # \v / 0x0B

        "" # \f / 0x0C

      ];

    in

      replaceStrings special (map (c: "\\${c}") special);

pkgs/applications/emulators/fs-uae/launcher.nix

+5 −2
Original line number Diff line number Diff line
@@ -34,8 +34,11 @@ stdenv.mkDerivation (finalAttrs: { 


  preFixup = ''

    wrapQtApp "$out/bin/fs-uae-launcher" \

      --set PYTHONPATH "$PYTHONPATH" \

      --prefix PATH : ${lib.makeBinPath [ fsuae ]}

      --set PYTHONPATH "$PYTHONPATH"



    # fs-uae-launcher search side by side for fs-uae

    # see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable

    ln -s ${fsuae}/bin/fs-uae $out/bin

  '';



  meta = {

pkgs/applications/misc/otpclient/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 


stdenv.mkDerivation rec {

  pname = "otpclient";

  version = "3.1.8";

  version = "3.1.9";



  src = fetchFromGitHub {

    owner = "paolostivanin";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-wwK8JI/IP89aRmetUXE+RlrqU8bpfIkzMZ9nF7qFe1Q=";

    hash = "sha256-FSXUqnES/YxONwLza4N2C4Ks02OOfRaXHbdBxr85sFg=";

  };



  nativeBuildInputs = [