From 19c0215967f45c4bca1a6b555cc2d1e6589e7882 Mon Sep 17 00:00:00 2001 From: wr7 Date: Mon, 11 Mar 2024 12:00:54 -0500 Subject: [PATCH 1/2] maintainers: add wr7 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index faa621e905595..029511cabf8df 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21765,6 +21765,12 @@ github = "wr0belj"; githubId = 40501814; }; + wr7 = { + name = "wr7"; + email = "d-wr7@outlook.com"; + github = "wr7"; + githubId = 53203261; + }; wraithm = { name = "Matthew Wraith"; email = "wraithm@gmail.com"; From 54de37bbe620d49a4b26b62b12459a035b3c888b Mon Sep 17 00:00:00 2001 From: wr7 Date: Mon, 11 Mar 2024 12:24:59 -0500 Subject: [PATCH 2/2] glsl_analyzer: init at 1.4.5 --- pkgs/by-name/gl/glsl_analyzer/package.nix | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/gl/glsl_analyzer/package.nix diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix new file mode 100644 index 0000000000000..ed57790a27d66 --- /dev/null +++ b/pkgs/by-name/gl/glsl_analyzer/package.nix @@ -0,0 +1,39 @@ +{ lib +, pkgs +, fetchFromGitHub +, zig_0_12 +, darwin +}: + +let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in + +stdenv.mkDerivation (finalAttrs: { + pname = "glsl_analyzer"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "nolanderc"; + repo = "glsl_analyzer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+eYBw/F1RzI5waAkLgbV0J/Td91hbNcAtHcisQaL82k="; + }; + + nativeBuildInputs = [ + zig_0_12.hook + ]; + + postPatch = '' + substituteInPlace build.zig \ + --replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"' + ''; + + meta = { + description = "Language server for GLSL (OpenGL Shading Language)"; + changelog = "https://github.com/nolanderc/glsl_analyzer/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/nolanderc/glsl_analyzer"; + mainProgram = "glsl_analyzer"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wr7 ]; + platforms = lib.platforms.unix; + }; +})