diff options
| author | Artturi <Artturin@artturin.com> | 2023-07-16 00:43:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-16 00:43:45 +0300 |
| commit | d1abbbd9b694c67ef6fbb249c89c590e8f79c5b0 (patch) | |
| tree | 9c015a238f849b44edc07ad963eb4c84800f8030 /pkgs/misc | |
| parent | 3afe31e0a0e5342673c7d61be33c2acfc34ff5be (diff) | |
| parent | 4cf80061735a4cb12d87fd8c5c9e90d1ecc3f040 (diff) | |
Merge pull request #242309 from Artturin/ananicyextraxadd
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/ananicy-rules-cachyos/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/misc/ananicy/default.nix | 12 |
2 files changed, 35 insertions, 9 deletions
diff --git a/pkgs/misc/ananicy-rules-cachyos/default.nix b/pkgs/misc/ananicy-rules-cachyos/default.nix new file mode 100644 index 0000000000000..575f582d2c9fc --- /dev/null +++ b/pkgs/misc/ananicy-rules-cachyos/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ananicy"; + version = "unstable-2023-06-28"; + + src = fetchFromGitHub { + owner = "CachyOS"; + repo = "ananicy-rules"; + rev = "b2b4342d769bc3c6abc4ce77bd53d6ca06d659e5"; + sha256 = "sha256-TGX7GlfSeKu68mVM71/kdJH31gzMmhzCAqA390aEq8U="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preBuild + mkdir -p $out + cp -r * $out + rm $out/README.md + runHook postBuild + ''; + + meta = with lib; { + homepage = "https://github.com/CachyOS/ananicy-rules"; + description = "ananicy-cpp-rules for CachyOS "; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/misc/ananicy/default.nix b/pkgs/misc/ananicy/default.nix index 3c2392df731d5..62daaad2c6048 100644 --- a/pkgs/misc/ananicy/default.nix +++ b/pkgs/misc/ananicy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ananicy"; - version = "unstable-2021-11-05"; + version = "unstable-2023-03-21"; src = fetchFromGitHub { owner = "nefelim4ag"; repo = "ananicy"; - rev = "b8968e9b32b0e4e6a01dc2314e43de8fee9da691"; - sha256 = "sha256-tlPY81xdUpZrDYdApXooZ0Mst0n7ARVHyUrmymqg0rk="; + rev = "1e2cc9a62ba3b6793e59da66aa0039f89e1ad49f"; + sha256 = "sha256-nHp47eYI36edka+cBMzayPHEflAzpgLx0VehhsyYpwI="; }; patches = [ @@ -20,12 +20,6 @@ stdenv.mkDerivation rec { # only used for debian packaging. lets exclude it so the patch applies even when that file is changed excludes = [ "package.sh" ]; }) - # https://github.com/Nefelim4ag/Ananicy/pull/439 - # fix syntax error - (fetchpatch { - url = "https://github.com/Nefelim4ag/Ananicy/commit/0f8b809298ccfd88d0e2ab952d6e4131865246da.patch"; - sha256 = "sha256-PWE4F0G97gecgc9HnG7ScA78+QVc8u8aF9u74qVChX0="; - }) ]; nativeBuildInputs = [ makeWrapper ]; |