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

Merge staging-next into staging

parents 1273b9a3 c1fb3b22

doc/languages-frameworks/beam.section.md

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ let 
    git

    # replace with beam.packages.erlang.elixir_1_11 if you need

    beam.packages.erlang.elixir

    nodejs-15_x

    nodejs

    postgresql_13

    # only used for frontend dependencies

    # you are free to use yarn2nix as well

nixos/tests/zsh-history.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { 
    # Login

    default.wait_until_tty_matches(1, "login: ")

    default.send_chars("root\n")

    default.wait_until_tty_matches(1, "root@default>")

    default.wait_until_tty_matches(1, r"\nroot@default\b")



    # Generate some history

    default.send_chars("echo foobar\n")

pkgs/applications/editors/neovim/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, libuv, lua, ncurses, pkg-config

, unibilium, xsel, gperf

, libvterm-neovim

, tree-sitter

, glibcLocales ? null, procps ? null



# now defaults to false because some tests can be flaky (clipboard etc)
@@ -31,13 +32,13 @@ let 
in

  stdenv.mkDerivation rec {

    pname = "neovim-unwrapped";

    version = "0.4.4";

    version = "0.5.0";



    src = fetchFromGitHub {

      owner = "neovim";

      repo = "neovim";

      rev = "v${version}";

      sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m";

      sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi";

    };



    patches = [
@@ -58,6 +59,7 @@ in 
      msgpack

      ncurses

      neovimLuaEnv

      tree-sitter

      unibilium

    ] ++ optional stdenv.isDarwin libiconv

      ++ optionals doCheck [ glibcLocales procps ]
@@ -96,6 +98,7 @@ in 
      "-DGPERF_PRG=${gperf}/bin/gperf"

      "-DLUA_PRG=${neovimLuaEnv.interpreter}"

      "-DLIBLUV_LIBRARY=${luvpath}"

      "-DUSE_BUNDLED=OFF"

    ]

    ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"

    ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"

pkgs/applications/networking/mumble/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ let 
      description = "Low-latency, high quality voice chat software";

      homepage = "https://mumble.info";

      license = licenses.bsd3;

      maintainers = with maintainers; [ petabyteboy infinisil ];

      maintainers = with maintainers; [ petabyteboy infinisil felixsinger ];

      platforms = platforms.linux;

    };

  });

pkgs/development/python-modules/aiomusiccast/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


buildPythonPackage rec {

  pname = "aiomusiccast";

  version = "0.8.0";

  version = "0.8.1";



  format = "pyproject";
@@ -18,7 +18,7 @@ buildPythonPackage rec { 
    owner = "vigonotion";

    repo = "aiomusiccast";

    rev = version;

    sha256 = "1x55w2vhb5mgvlg19cs887xd7fg0cwnp6hb34vajp80q4yff9xk5";

    sha256 = "sha256-1k0ELXA8TgAyRYdzSFXp/BsPesC1WCiC4PqHfcPk0u8=";

  };



  nativeBuildInputs = [