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

Merge master into staging-next

parents 2ab7fc11 f0cf83a1

lib/tests/modules.sh

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix 
# is the option.

checkConfigOutput '^true$' config.result ./module-argument-default.nix



# gvariant

checkConfigOutput '^true$' config.assertion ./gvariant.nix



# types.pathInStore

checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix

checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix

lib/tests/modules/gvariant.nix

+55 −87
Original line number Diff line number Diff line 
{ config, lib, ... }:



let inherit (lib) concatStringsSep mapAttrsToList mkMerge mkOption types gvariant;

in {

  options.examples = mkOption { type = types.attrsOf gvariant; };

{

  options = {

    examples = lib.mkOption { type = lib.types.attrs; };

    assertion = lib.mkOption { type = lib.types.bool; };

  };



  config = {

    examples = with gvariant;

      mkMerge [

        { bool = true; }

        { bool = true; }



        { float = 3.14; }



        { int32 = mkInt32 (- 42); }

        { int32 = mkInt32 (- 42); }



        { uint32 = mkUint32 42; }

        { uint32 = mkUint32 42; }



        { int16 = mkInt16 (-42); }

        { int16 = mkInt16 (-42); }



        { uint16 = mkUint16 42; }

        { uint16 = mkUint16 42; }



        { int64 = mkInt64 (-42); }

        { int64 = mkInt64 (-42); }



        { uint64 = mkUint64 42; }

        { uint64 = mkUint64 42; }



        { array1 = [ "one" ]; }

        { array1 = mkArray [ "two" ]; }

        { array2 = mkArray [ (mkInt32 1) ]; }

        { array2 = mkArray [ (nkUint32 2) ]; }



        { emptyArray1 = [ ]; }

        { emptyArray2 = mkEmptyArray type.uint32; }



        { string = "foo"; }

        { string = "foo"; }

        {

    examples = with lib.gvariant; {

      bool = true;

      float = 3.14;

      int32 = mkInt32 (- 42);

      uint32 = mkUint32 42;

      int16 = mkInt16 (-42);

      uint16 = mkUint16 42;

      int64 = mkInt64 (-42);

      uint64 = mkUint64 42;

      array1 = [ "one" ];

      array2 = mkArray [ (mkInt32 1) ];

      array3 = mkArray [ (mkUint32 2) ];

      emptyArray = mkEmptyArray type.uint32;

      string = "foo";

      escapedString = ''

        '\

      '';

        }



        { tuple = mkTuple [ (mkInt32 1) [ "foo" ] ]; }



        { maybe1 = mkNothing type.string; }

        { maybe2 = mkJust (mkUint32 4); }



        { variant1 = mkVariant "foo"; }

        { variant2 = mkVariant 42; }



        { dictionaryEntry = mkDictionaryEntry (mkInt32 1) [ "foo" ]; }

      ];

      tuple = mkTuple [ (mkInt32 1) [ "foo" ] ];

      maybe1 = mkNothing type.string;

      maybe2 = mkJust (mkUint32 4);

      variant = mkVariant "foo";

      dictionaryEntry = mkDictionaryEntry (mkInt32 1) [ "foo" ];

    };



    assertions = [

      {

        assertion = (

    assertion =

      let

            mkLine = n: v: "${n} = ${toString (gvariant.mkValue v)}";

            result = concatStringsSep "\n" (mapAttrsToList mkLine config.examples);

        mkLine = n: v: "${n} = ${toString (lib.gvariant.mkValue v)}";

        result = lib.concatStringsSep "\n" (lib.mapAttrsToList mkLine config.examples);

      in

          result + "\n"

        ) == ''

          array1 = @as ['one','two']

          array2 = @au [1,2]

      (result + "\n") == ''

        array1 = @as ['one']

        array2 = @ai [1]

        array3 = @au [@u 2]

        bool = true

        dictionaryEntry = @{ias} {1,@as ['foo']}

          emptyArray1 = @as []

          emptyArray2 = @au []

        emptyArray = @au []

        escapedString = '\'\\\n'

        float = 3.140000

          int = -42

        int16 = @n -42

        int32 = -42

        int64 = @x -42

        maybe1 = @ms nothing

        maybe2 = just @u 4
@@ -84,10 +55,7 @@ in { 
        uint16 = @q 42

        uint32 = @u 42

        uint64 = @t 42

          variant1 = @v <'foo'>

          variant2 = @v <42>

        variant = <'foo'>

      '';

      }

    ];

  };

}

nixos/modules/misc/nixpkgs.nix

+6 −10
Original line number Diff line number Diff line
@@ -176,16 +176,12 @@ in 
        '';

      type = types.listOf overlayType;

      description = lib.mdDoc ''

        List of overlays to use with the Nix Packages collection.

        (For details, see the Nixpkgs documentation.)  It allows

        you to override packages globally. Each function in the list

        takes as an argument the *original* Nixpkgs.

        The first argument should be used for finding dependencies, and

        the second should be used for overriding recipes.



        If `nixpkgs.pkgs` is set, overlays specified here

        will be applied after the overlays that were already present

        in `nixpkgs.pkgs`.

        List of overlays to apply to Nixpkgs.

        This option allows modifying the Nixpkgs package set accessed through the `pkgs` module argument.



        For details, see the [Overlays chapter in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#chap-overlays).



        If the {option}`nixpkgs.pkgs` option is set, overlays specified using `nixpkgs.overlays` will be applied after the overlays that were already included in `nixpkgs.pkgs`.

      '';

    };

pkgs/applications/audio/g4music/default.nix

+7 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, stdenv

, fetchFromGitLab

, desktop-file-utils

, gitUpdater

, gobject-introspection

, gst_all_1

, gtk4
@@ -14,14 +15,14 @@ 
}:

stdenv.mkDerivation (finalAttrs: {

  pname = "g4music";

  version = "3.2";

  version = "3.3";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "neithern";

    repo = "g4music";

    rev = "v${finalAttrs.version}";

    hash = "sha256-BlHOYD4sOmJPNMzM5QA97Ah1N9tIat0Y6qxN6c5pmsw=";

    hash = "sha256-sajA8+G1frQA0p+8RK84hvh2P36JaarmSZx/sxMoFqo=";

  };



  nativeBuildInputs = [
@@ -44,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: { 
    gstreamer

  ]);



  passthru.updateScript = gitUpdater {

    rev-prefix = "v";

  };



  meta = with lib; {

    description = "A beautiful, fast, fluent, light weight music player written in GTK4";

    homepage = "https://gitlab.gnome.org/neithern/g4music";

pkgs/applications/audio/helvum/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, fetchFromGitLab

, glib

, gtk4

, libadwaita

, meson

, ninja

, pipewire
@@ -17,20 +18,20 @@ 


stdenv.mkDerivation rec {

  pname = "helvum";

  version = "0.4.1";

  version = "0.5.1";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    owner = "pipewire";

    repo = pname;

    rev = version;

    hash = "sha256-nBU8dk22tzVf60yznTYJBYRKG+ctwWl1epU90R0zXr0=";

    hash = "sha256-9vlzLPpyZ9qtCEbCDvYhWDcV+8T63ukdos1l2U6fD+E=";

  };



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-kzu8dzKob9KxKEP3ElUYCCTdyvbzi+jSXTaaaaPMhYg=";

    hash = "sha256-Xebm3XlsO6kBoMnxJsOk/3SO7avVoaGqi2CVWBRzr88=";

  };



  nativeBuildInputs = [
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec { 
    desktop-file-utils

    glib

    gtk4

    libadwaita

    pipewire

  ];