commit 03756b98364a8e8c4319d1a5b163d25a5b297fe5 · pyrox.dev/nixpkgs

+2

doc/release-notes/rl-2505.section.md

···

       424
       424
        
       - [`lib.packagesFromDirectoryRecursive`] now rejects unknown arguments.

     

       425
       425
        
         [`lib.packagesFromDirectoryRecursive`]: https://nixos.org/manual/nixpkgs/stable/#function-library-lib.filesystem.packagesFromDirectoryRecursive

     

       426
       426
        
       

     

       427
       427
       +
       - The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed.

     

       428
       428
       +
       

     

       427
       429
        
       ### Deprecations {#sec-nixpkgs-release-25.05-lib-deprecations}

     

       428
       430
        
       

     

       429
       431
        
       - `functor` is an implementation detail and should not be relied upon, but since its status wasn't clear and it has had some use cases without alternatives, changes are being handled as gracefully as possible. Deprecations within functor:

+3 -3

pkgs/by-name/op/opengamepadui/package.nix

···

       81
       81
        
             GODOT = lib.getExe godot_4_4;

     

       82
       82
        
             GODOT_VERSION = lib.elemAt versionAndRelease 0;

     

       83
       83
        
             GODOT_RELEASE = lib.elemAt versionAndRelease 1;

     

       84
       84
       -
             EXPORT_TEMPLATE = "${godot_4_4.export-templates-bin}";

     

       84
       84
       +
             EXPORT_TEMPLATE = "${godot_4_4.export-templates-bin}/share/godot/export_templates";

     

       85
       85
        
             BUILD_TYPE = "${finalAttrs.buildType}";

     

       86
       86
        
           };

     

       87
       87
        
       

     
···

       92
       92
        
         preBuild = ''

     

       93
       93
        
           # Godot looks for export templates in HOME

     

       94
       94
        
           export HOME=$(mktemp -d)

     

       95
       95
       -
           mkdir -p $HOME/.local/share/godot/export_templates

     

       96
       96
       -
           ln -s "${godot_4_4.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"

     

       95
       95
       +
           mkdir -p $HOME/.local/share/godot/

     

       96
       96
       +
           ln -s "$EXPORT_TEMPLATE" "$HOME"/.local/share/godot/

     

       97
       97
        
         '';

     

       98
       98
        
       

     

       99
       99
        
         postInstall = ''

+2 -2

pkgs/by-name/pi/pixelorama/package.nix

···

       65
       65
        
           runHook preBuild

     

       66
       66
        
       

     

       67
       67
        
           export HOME=$(mktemp -d)

     

       68
       68
       -
           mkdir -p $HOME/.local/share/godot/export_templates

     

       69
       69
       -
           ln -s "${godot.export-templates-bin}" "$HOME/.local/share/godot/export_templates/${godot_version_folder}"

     

       68
       68
       +
           mkdir -p $HOME/.local/share/godot/

     

       69
       69
       +
           ln -s "${godot.export-templates-bin}"/share/godot/export_templates "$HOME"/.local/share/godot/

     

       70
       70
        
           mkdir -p build

     

       71
       71
        
           godot4 --headless --export-release "${preset}" ./build/pixelorama

     

       72
       72

+1 -1

pkgs/development/tools/godot/4.3/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         version = "4.3-stable";

     

       3
       3
        
         hash = "sha256-MzElflwXHWLgPtoOIhPLA00xX8eEdQsexZaGIEOzbj0=";

     

       4
       4
       -
         exportTemplatesHash = "sha256-XRnKii+eexIkbGf7bqc42SR0NBULFvgMdOpSRNNk6kg=";

     

       4
       4
       +
         exportTemplatesHash = "sha256-9fENuvVqeQg0nmS5TqjCyTwswR+xAUyVZbaKK7Q3uSI=";

     

       5
       5
        
         nugetDeps = ./deps.json;

     

       6
       6
        
       }

+1 -1

pkgs/development/tools/godot/4.4/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         version = "4.4.1-stable";

     

       3
       3
        
         hash = "sha256-O4TdPYu1K2zWKMBP/7xd0UPLDb7/4dBnkGM7QydD3Yo=";

     

       4
       4
       -
         exportTemplatesHash = "sha256-KV4sDBZPiMf7IORaNFR2uEK1midnyyjCUfG9hl6AwHY=";

     

       4
       4
       +
         exportTemplatesHash = "sha256-eo0UreSJ/U0i8XgZMCH+iodqnlEGjtTd4m2sOuTFmog=";

     

       5
       5
        
         nugetDeps = ./deps.json;

     

       6
       6
        
       }

+2 -2

pkgs/development/tools/godot/common.nix

···

       326
       326
        
                     runHook preBuild

     

       327
       327
        
       

     

       328
       328
        
                     export HOME=$(mktemp -d)

     

       329
       329
       -
                     mkdir -p $HOME/.local/share/godot/export_templates

     

       330
       330
       -
                     ln -s "${pkg.export-templates-bin}" "$HOME/.local/share/godot/export_templates/${dottedVersion}"

     

       329
       329
       +
                     mkdir -p $HOME/.local/share/godot/

     

       330
       330
       +
                     ln -s "${pkg.export-templates-bin}"/share/godot/export_templates "$HOME"/.local/share/godot/

     

       331
       331
        
       

     

       332
       332
        
                     godot --headless -s create-scene.gd

     

       333
       333

+26 -5

pkgs/development/tools/godot/export-templates-bin.nix

···

       1
       1
        
       {

     

       2
       2
       -
         fetchzip,

     

       2
       2
       +
         fetchurl,

     

       3
       3
        
         godot,

     

       4
       4
        
         hash,

     

       5
       5
        
         lib,

     

       6
       6
       +
         stdenvNoCC,

     

       7
       7
       +
         unzip,

     

       6
       8
        
         version,

     

       7
       9
        
       }:

     

       8
       10
        
       # Export templates is necessary for setting up Godot engine, it's used when exporting projects.

     

       9
       11
        
       # Godot applications/games packages needs to reference export templates.

     

       10
       12
        
       # Export templates version should be kept in sync with Godot version.

     

       11
       13
        
       # https://docs.godotengine.org/en/stable/tutorials/export/exporting_projects.html#export-templates

     

       12
       12
       -
       fetchzip {

     

       14
       14
       +
       stdenvNoCC.mkDerivation {

     

       13
       15
        
         pname = "godot-export-templates";

     

       14
       16
        
         version = version;

     

       15
       15
       -
         extension = "zip";

     

       16
       16
       -
         url = "https://github.com/godotengine/godot/releases/download/${version}/Godot_v${version}_export_templates.tpz";

     

       17
       17
       -
         inherit hash;

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchurl {

     

       19
       19
       +
           url = "https://github.com/godotengine/godot/releases/download/${version}/Godot_v${version}_export_templates.tpz";

     

       20
       20
       +
           inherit hash;

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           unzip

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         unpackPhase = ''

     

       28
       28
       +
           runHook preUnpack

     

       29
       29
       +
           unzip -q "$src"

     

       30
       30
       +
           runHook postUnpack

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         installPhase = ''

     

       34
       34
       +
           templates="$out"/share/godot/export_templates

     

       35
       35
       +
           mkdir -p "$templates"

     

       36
       36
       +
           read version < templates/version.txt

     

       37
       37
       +
           mv templates "$templates/$version"

     

       38
       38
       +
         '';

     

       18
       39
        
       

     

       19
       40
        
         meta = {

     

       20
       41
        
           inherit (godot.meta)