Unverified Commit 304aa26a authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 7dc68350 dd1fb03f

nixos/modules/system/activation/switchable-system.nix

+14 −24
Original line number Diff line number Diff line
@@ -71,41 +71,31 @@ 


      preSwitchChecks.switchInhibitors =

        let

          realpath = lib.getExe' pkgs.coreutils "realpath";

          mktemp = lib.getExe' pkgs.coreutils "mktemp";

          rm = lib.getExe' pkgs.coreutils "rm";

          jq = lib.getExe' pkgs.jq "jq";

          jq = lib.getExe pkgs.jq;

          empty = pkgs.writeText "empty-inhibitors" "{}";

        in

        # bash

        ''

          incoming="''${1-}"

          action="''${2-}"



          if [ "$action" == "boot" ]; then

          case "$action" in

            boot|dry-activate)

              echo "Not checking switch inhibitors (action = $action)"

              exit

          fi

              ;;

          esac



          echo -n "Checking switch inhibitors..."



          # Create a temporary file that we use in case a generation does not have

          # the switch-inhibitors file.

          empty="$(${mktemp} -t switch_inhibit.XXXX)"

          # shellcheck disable=SC2329

          clean_up() {

            ${rm} -f "$empty"

          }

          trap clean_up EXIT

          echo "{}" > "$empty"



          current_inhibitors="$(${realpath} /run/current-system)/switch-inhibitors"

          current_inhibitors="/run/current-system/switch-inhibitors"

          if [ ! -f "$current_inhibitors" ]; then

            current_inhibitors="$empty"

            current_inhibitors="${empty}"

          fi



          new_inhibitors="$(${realpath} "$incoming")/switch-inhibitors"

          new_inhibitors="$incoming/switch-inhibitors"

          if [ ! -f "$new_inhibitors" ]; then

            new_inhibitors="$empty"

            new_inhibitors="${empty}"

          fi



          diff="$(
@@ -115,8 +105,8 @@ 
              --rawfile current "$current_inhibitors" \

              --rawfile newgen "$new_inhibitors" \

            '

              $current | try fromjson catch {} as $old |

              $newgen | try fromjson catch {} as $new |

              ($current | fromjson) as $old |

              ($newgen | fromjson) as $new |

              $old |

              to_entries |

              map(

nixos/tests/switch-test.nix

+3 −0
Original line number Diff line number Diff line
@@ -776,6 +776,9 @@ in 
          assert_contains(out, "baz")

          # Confirm that we can set that same generation as the new boot default

          switch_to_specialisation("${machine}", "inhibitors_changed", action="boot")

          # Confirm that dry-activate is not blocked by inhibitors

          out = switch_to_specialisation("${machine}", "inhibitors_changed", action="dry-activate")

          assert_contains(out, "Not checking switch inhibitors")

          # Check that we can switch into a new generation with new inhibitors, but same values for existing ones

          switch_to_specialisation("${machine}", "inhibitors_new", action="switch")

          # Check that we can switch back into a generation without inhibitors

pkgs/by-name/cp/cpeditor/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "cpeditor";

  version = "7.0.2";

  version = "7.1.1";



  src = fetchFromGitHub {

    owner = "cpeditor";

    repo = "cpeditor";

    tag = finalAttrs.version;

    hash = "sha256-rdGdbMJ3j01RAS/xPZ9zimL0mv8ZW3vYXht6jNFyheI=";

    hash = "sha256-zEK3137DjQmuc7Y4c/HF0n37bdokj9ci2/agSaG7nZE=";

    fetchSubmodules = true;

  };

pkgs/by-name/en/envoy-bin/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ stdenvNoCC.mkDerivation { 
    license = lib.licenses.asl20;

    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];

    maintainers = with lib.maintainers; [

      katexochen

      charludo

    ];

    mainProgram = "envoy";

pkgs/by-name/fo/fosrl-pangolin/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ in 


buildNpmPackage (finalAttrs: {

  pname = "pangolin";

  version = "1.17.0";

  version = "1.17.1";



  src = fetchFromGitHub {

    owner = "fosrl";

    repo = "pangolin";

    tag = finalAttrs.version;

    hash = "sha256-E0GfYznHj4CKsRWQm6zHTAJ8hJw9ieFoKIOT9tcumYQ=";

    hash = "sha256-V1yOSFN2g5MHPIXF/UFymgXrfN5tE99cuIFnWpdCVCA=";

  };



  npmDepsHash = "sha256-DyPfylne9Ku7sEUNN0LLlN0EOnCjcklsh+F6YP+rXv4=";