Merge remote-tracking branch 'upstream/master'

NixOS · Oct 26, 2024 · 9cf1994 · 9cf1994
2 parents 01d5adc + f251273
commit 9cf1994
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 3 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -8625,6 +8625,12 @@
     githubId = 6430643;
     name = "Henry Till";
   };
+  hensoko = {
+    email = "[email protected]";
+    github = "hensoko";
+    githubId = 13552930;
+    name = "hensoko";
+  };
   heph2 = {
     email = "[email protected]";
     github = "heph2";

diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix
@@ -0,0 +1,64 @@
+{
+  alsa-lib,
+  cmake,
+  fetchFromGitHub,
+  glslang,
+  lib,
+  libX11,
+  libXcursor,
+  libglvnd,
+  makeWrapper,
+  ninja,
+  stdenv,
+  vulkan-headers,
+  vulkan-loader,
+  vulkan-validation-layers,
+}:
+stdenv.mkDerivation {
+  pname = "opengothic";
+  version = "0.80-unstable-09-10-2024";
+
+  src = fetchFromGitHub {
+    owner = "Try";
+    repo = "OpenGothic";
+    rev = "0db60b0a956e2a2f365aa3a8bdbe366be198e641";
+    fetchSubmodules = true;
+    hash = "sha256-Hf3B7B4CaW/GsTcYs0PChpPfA9aK41pPJkImtUDgoKc=";
+  };
+
+  outputs = [
+    "dev"
+    "out"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    glslang
+    makeWrapper
+    ninja
+  ];
+
+  buildInputs = [
+    alsa-lib
+    libX11
+    libXcursor
+    libglvnd
+    vulkan-headers
+    vulkan-loader
+    vulkan-validation-layers
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/Gothic2Notr \
+      --set LD_PRELOAD "${lib.getLib alsa-lib}/lib/libasound.so.2"
+  '';
+
+  meta = {
+    description = "Open source re-implementation of Gothic 2: Night of the Raven";
+    homepage = "https://github.com/Try/OpenGothic";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ azahi ];
+    platforms = lib.platforms.linux;
+    mainProgram = "Gothic2Notr";
+  };
+}
diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "craft-platforms";
-  version = "0.3.1";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-platforms";
     rev = "refs/tags/${version}";
-    hash = "sha256-VDSwvBWoGHcjGCEA4RDVwRzQGNVaphwZu/iaktAweb0=";
+    hash = "sha256-MzHjnOvsloT1Vf5NjI5jyFBvCo3v5ovvpWuwOJ/O/0A=";
   };
 
   postPatch = ''

diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
@@ -32,10 +32,11 @@ stdenv.mkDerivation rec {
   patches = [ ./install.patch ];
 
   meta = {
+    mainProgram = "iostat";
     homepage = "http://sebastien.godard.pagesperso-orange.fr/";
     description = "Collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.hensoko ];
   };
 }