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

Merge master into staging-next

parents 2984c5a0 d865557a

lib/customisation.nix

+5 −1
Original line number Diff line number Diff line
@@ -203,7 +203,11 @@ rec { 


    in if missingArgs == {}

       then makeOverridable f allArgs

       else throw "lib.customisation.callPackageWith: ${error}";

       # This needs to be an abort so it can't be caught with `builtins.tryEval`,

       # which is used by nix-env and ofborg to filter out packages that don't evaluate.

       # This way we're forced to fix such errors in Nixpkgs,

       # which is especially relevant with allowAliases = false

       else abort "lib.customisation.callPackageWith: ${error}";





  /* Like callPackage, but for a function that returns an attribute

lib/systems/inspect.nix

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ rec { 
      { cpu = { family = "riscv"; }; }

      { cpu = { family = "x86"; }; }

    ];



    isElf          = { kernel.execFormat = execFormats.elf; };

    isMacho        = { kernel.execFormat = execFormats.macho; };

  };



  # given two patterns, return a pattern which is their logical AND.

pkgs/applications/misc/phoc/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
, libxkbcommon

, wlroots

, xorg

, gitUpdater

, nixosTests

}:
@@ -71,7 +72,13 @@ in stdenv.mkDerivation rec { 
    patchShebangs build-aux/post_install.py

  '';



  passthru.tests.phosh = nixosTests.phosh;

  passthru = {

    tests.phosh = nixosTests.phosh;

    updateScript = gitUpdater {

      url = "https://gitlab.gnome.org/World/Phosh/phoc";

      rev-prefix = "v";

    };

  };



  meta = with lib; {

    description = "Wayland compositor for mobile phones like the Librem 5";

pkgs/applications/networking/cluster/kubectl-gadget/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


buildGoModule rec {

  pname = "kubectl-gadget";

  version = "0.23.1";

  version = "0.24.0";



  src = fetchFromGitHub {

    owner = "inspektor-gadget";

    repo = "inspektor-gadget";

    rev = "v${version}";

    hash = "sha256-rlsjkjJg0IRGRBpTGhKTpMVQgxhizN7P+py2R+sczrk=";

    hash = "sha256-JC6+6PADTfxpVRowh09fXC8EO/qIsUTTba2uYxxxJ/A=";

  };



  vendorHash = "sha256-+DXQ4Rgd7egKsDyU0/WQgninlsjPHFAoHy/sSQYE1p8=";

  vendorHash = "sha256-7pwEQ1O3i4SmVSTTmOX9KPR0ePdDpf2dQgD4e6fDyzQ=";



  CGO_ENABLED = 0;

pkgs/applications/radio/gridtracker/default.nix

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


stdenv.mkDerivation rec {

  pname = "gridtracker";

  version = "1.23.1207";

  version = "1.24.0104";



  src = fetchFromGitLab {

    owner = "gridtracker.org";

    repo = "gridtracker";

    rev = "v${version}";

    sha256 = "sha256-r7H+fds8FbSLDxPQqn0XUPC6loLgsaNX+DBqJJ96/d4=";

    sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU=";

  };



  nativeBuildInputs = [ wrapGAppsHook ];