Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'

Conflicts:
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/pkgs/build-support/go/module.nix

1 files changed, 16 insertions, 16 deletions

diff --git a/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix b/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix
index 096528fa3538..fba65999b0f9 100644
--- a/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix
+++ b/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix
@@ -1,32 +1,32 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenvNoCC, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  pname = "ananicy";
-  version = "unstable-2023-10-11";
+stdenvNoCC.mkDerivation {
+  pname = "ananicy-rules-cachyos";
+  version = "unstable-2024-04-22";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "3dafc3eb667b6ed7024359de78bf961c7248954d";
-    sha256 = "sha256-bMwM/2R6jdgrQ6C0JnHyMp9L4OWI6KVGcninrr7wLQ8=";
+    rev = "8646faa8c0c8fc16d78ca3a25d65ddbd86b9d468";
+    hash = "sha256-b9M6Uqlb6Ysp8BRe1QV62sjVOU6tgFbrjTxDc3B4xlg=";
   };
 
   dontConfigure = true;
   dontBuild = true;
 
   installPhase = ''
-    runHook preBuild
-    mkdir -p $out
-    cp -r * $out
-    rm $out/README.md
-    runHook postBuild
+    runHook preInstall
+    mkdir -p $out/etc/ananicy.d
+    rm README.md LICENSE
+    cp -r * $out/etc/ananicy.d
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/CachyOS/ananicy-rules";
-    description = "ananicy-cpp-rules for CachyOS ";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ artturin ];
+    description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ artturin johnrtitor diniamo ];
   };
 }