Unverified Commit b4443120 authored by Niklas Korz's avatar Niklas Korz Committed by GitHub
Browse files

shader-slang: 2025.21.1 -> 2025.22, add test for creating executables (#460184)

parents e086d0d7 0d20b314

pkgs/by-name/sh/shader-slang/package.nix

+28 −5
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
  unordered_dense,

  versionCheckHook,

  gitUpdater,

  runCommandCC,



  # Required for compiling to SPIR-V or GLSL

  withGlslang ? true,
@@ -20,13 +21,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "shader-slang";

  version = "2025.21.1";

  version = "2025.22";



  src = fetchFromGitHub {

    owner = "shader-slang";

    repo = "slang";

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

    hash = "sha256-Z6nTgVQaXFKmFeTZTltrlv46IdptwaOssh0PQIBUv+U=";

    hash = "sha256-D3XB6mf3tKTH6t4jG5kYgE9sNAhFwZyi8Ynrh+4A9v8=";

    fetchSubmodules = true;

  };
@@ -119,10 +120,32 @@ stdenv.mkDerivation (finalAttrs: { 
  versionCheckProgramArg = "-v";

  doInstallCheck = true;



  passthru.updateScript = gitUpdater {

  passthru = {

    updateScript = gitUpdater {

      rev-prefix = "v";

      ignoredVersions = "*-draft";

    };

    tests.hello =

      runCommandCC "compile-hello-world"

        {

          # Intermediate files generated by slangc trigger this warning

          NIX_CFLAGS_COMPILE = "-Wno-error=format-security";

        }

        ''

          cat > hello.slang << EOF

          export __extern_cpp int main()

          {

              printf("Hello, world!\n");

              return 0;

          }

          EOF



          ${lib.getExe finalAttrs.finalPackage} hello.slang -target executable -o hello

          ./hello | grep "Hello, world!"



          touch $out

        '';

  };



  meta = {

    description = "Shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion";

pkgs/by-name/un/unordered_dense/package.nix

+2 −6
Original line number Diff line number Diff line
@@ -3,10 +3,9 @@ 
  lib,

  fetchFromGitHub,

  cmake,

  ninja,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "unordered-dense";

  pname = "unordered_dense";

  version = "4.8.1";



  src = fetchFromGitHub {
@@ -16,10 +15,7 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-JdPlyShWnAcdgixDHRaroFg7YWdPtD4Nl1PmpcQ1SAk=";

  };



  nativeBuildInputs = [

    cmake

    ninja

  ];

  nativeBuildInputs = [ cmake ];



  meta = {

    description = "Fast & densely stored hashmap and hashset based on robin-hood backward shift deletion";