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

Merge master into staging-next

parents e01403d0 f9335711

lib/modules.nix

+5 −5
Original line number Diff line number Diff line
@@ -761,13 +761,13 @@ rec { 
      options = opt.options or

        (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");

      f = tp:

        let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet");

        in

        if tp.name == "option set" || tp.name == "submodule" then

          throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."

        else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options)

        else if optionSetIn "listOf"  then types.listOf  (types.submodule options)

        else if optionSetIn "nullOr"  then types.nullOr  (types.submodule options)

        else if (tp.functor.wrapped.name or null) == "optionSet" then

          if tp.name == "attrsOf" then types.attrsOf (types.submodule options)

          else if tp.name == "listOf" then types.listOf  (types.submodule options)

          else if tp.name == "nullOr" then types.nullOr  (types.submodule options)

          else tp

        else tp;

    in

      if opt.type.getSubModules or null == null

maintainers/scripts/haskell/regenerate-hackage-packages.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" 
# See: https://github.com/NixOS/nixpkgs/pull/122023

export LC_ALL=C.UTF-8



extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'

extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'

unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)"

config_dir=pkgs/development/haskell-modules/configuration-hackage2nix

pkgs/applications/audio/roomeqwizard/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 


stdenv.mkDerivation rec {

  pname = "roomeqwizard";

  version = "5.20.4";

  version = "5.20.5";



  src = fetchurl {

    url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh";

    sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8";

    sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U=";

  };



  dontUnpack = true;

pkgs/applications/editors/vim/plugins/generated.nix

+412 −388

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/vim/plugins/overrides.nix

+21 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
, which

, xkb-switch

, ycmd

, zoxide

, nodejs



# test dependencies
@@ -693,6 +694,17 @@ self: super: { 
    dependencies = with self; [ telescope-nvim ];

  });



  telescope-zoxide = super.telescope-zoxide.overrideAttrs (old: {

    dependencies = with self; [ telescope-nvim ];



    buildInputs = [ zoxide ];



    postPatch = ''

      substituteInPlace lua/telescope/_extensions/zoxide/config.lua \

        --replace "zoxide query -ls" "${zoxide}/bin/zoxide query -ls"

    '';

  });



  tup =

    let

      # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim
@@ -1076,6 +1088,15 @@ self: super: { 
    };

  });



  zoxide-vim = super.zoxide-vim.overrideAttrs (old: {

    buildInputs = [ zoxide ];



    postPatch = ''

      substituteInPlace autoload/zoxide.vim \

        --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'"

    '';

  });



} // (

  let

    nodePackageNames = [