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

Merge master into staging-next

parents a4cb5a50 7df7ff7d

nixos/doc/manual/development/settings-options.section.md

+31 −0
Original line number Diff line number Diff line
@@ -358,6 +358,37 @@ have a predefined type and string generator already declared under 


    :   Outputs the xml with header.



`pkgs.formats.pythonVars` { }



:   A function taking an empty attribute set (for future extensibility)

    and returning a set with python variable specific attributes `type`, `lib`, and

    `generate` as specified [below](#pkgs-formats-result).



    The `lib` attribute contains functions to be used in settings, for

    generating special Python values:



    `mkRaw pythonCode`



    :   Outputs the given string as raw Python code



    `_imports`



    `_imports` is a special value you can set to specify additional modules to be

    imported on top of the file.



    `Example usage:`



    ```nix

      let

        format = pkgs.formats.pythonVars { };

      in {

        _imports = [ "re" ];



        conditional = format.lib.mkRaw "1 if True else 2";

        function_result = format.lib.mkRaw "re.findall(r'\\bf[a-z]*', 'which foot or hand fell fastest')";

      }

    ```



`pkgs.formats.cdn` { }



:   A function taking an empty attribute set (for future extensibility)

nixos/modules/services/desktop-managers/pantheon.nix

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ in 
            elementary-code

            elementary-files

            elementary-mail

            elementary-maps

            elementary-music

            elementary-photos

            elementary-screenshot

pkgs/by-name/cl/clifm/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "clifm";

  version = "1.26";

  version = "1.26.3";



  src = fetchFromGitHub {

    owner = "leo-arch";

    repo = "clifm";

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

    hash = "sha256-eNgghfK2NSSrzn0X1XNcaE+jErlLG5rhg4+RLjERsFU=";

    hash = "sha256-lYeYElTeQpOnptL/c/06OWpsmI/Jkd7rlKGw0mKc9/c=";

  };



  buildInputs = [

pkgs/by-name/de/deco/package.nix

+14 −12
Original line number Diff line number Diff line
@@ -5,17 +5,18 @@ 
  scsh,

  feh,

  xorg,

  xdg-user-dirs,

}:



stdenv.mkDerivation {

  pname = "deco";

  version = "unstable-2019-04-03";

  version = "0-unstable-2025-07-07";



  src = fetchFromGitHub {

    owner = "ebzzry";

    owner = "vedatechnologiesinc";

    repo = "deco";

    rev = "dd8ec7905bc85d085eb2ee3bddabea451054288c";

    sha256 = "sha256-/3GeNvWOCRPOYTUbodXDUxR5QVDEyx6x2Jt5PxsPdvk=";

    rev = "2fd28241ed28c07b9d641061d4e1bf3cacfcc7a0";

    hash = "sha256-kjXEvgYO1p/dX9nXQ3HHcXmJdtxDM6xzKqDQu3yM4Tw=";

  };



  installPhase = ''
@@ -25,17 +26,18 @@ stdenv.mkDerivation { 
  '';



  postFixup = ''

    substituteInPlace $out/bin/deco --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"

    substituteInPlace $out/bin/deco --replace "feh" "${feh}/bin/feh"

    substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo"

    substituteInPlace $out/bin/deco --replace-fail "/usr/bin/env scsh" "${scsh}/bin/scsh"

    substituteInPlace $out/bin/deco --replace-fail "feh" "${feh}/bin/feh"

    substituteInPlace $out/bin/deco --replace-fail "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo"

    substituteInPlace $out/bin/deco --replace-fail "xdg-user-dir" "${xdg-user-dirs}/bin/xdg-user-dir"

  '';



  meta = with lib; {

    homepage = "https://github.com/ebzzry/deco";

  meta = {

    homepage = "https://github.com/vedatechnologiesinc/deco";

    description = "Simple root image setter";

    license = licenses.mit;

    maintainers = [ maintainers.ebzzry ];

    platforms = platforms.unix;

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.ebzzry ];

    platforms = lib.platforms.unix;

    mainProgram = "deco";

  };

pkgs/by-name/de/devenv/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
}:



let

  version = "1.9";

  version = "1.9.1";

  devenvNixVersion = "2.30.4";



  devenv_nix =
@@ -42,10 +42,10 @@ rustPlatform.buildRustPackage { 
    owner = "cachix";

    repo = "devenv";

    tag = "v${version}";

    hash = "sha256-MG+c0mo4g9UHSuqibX3OVkiADWmMn/PWDfVhD4U29PM=";

    hash = "sha256-v86pQGIWHJPkRryglJSXOp0aEoU6ZtURuURsXLqfqSE=";

  };



  cargoHash = "sha256-7uB9oC0jHWBFeUtIyVpTjeximU6eSxSCiBzo/whoKxQ=";

  cargoHash = "sha256-41VmzZvoRd2pL5/o6apHztpS2XrL4HGPIJPBkUbPL1I=";



  buildAndTestSubdir = "devenv";