cataclysm-dda-git: remove incompatible patches, bump git

[caryoscelus]

Description of changes

update git variety of cataclysm-dda by removing patches that are no longer applicable (and hopefully not required)

note that i've actually done this while working on adding Cataclysm: Bright Nights (a fork of C:DDA) package. if this PR is not going to be reviewed/merged i'm likely just going to fuse this into upcoming PR for that

Things done

• Built on platform(s)
  • [x] x86_64-linux
  • [ ] aarch64-linux
  • [ ] x86_64-darwin
  • [ ] aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • [ ] sandbox = relaxed
  • [ ] sandbox = true
• [ ] Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• [ ] Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• [x] Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
  • [ ] (Package updates) Added a release notes entry if the change is major or breaking
  • [ ] (Module updates) Added a release notes entry if the change is significant
  • [ ] (Module addition) Added a release notes entry if adding a new NixOS module
• [x] Fits CONTRIBUTING.md.

---

Add a :+1: reaction to pull requests you find important.

[rardiol]

Seems to be working fine on NixOS, can't check the Darwin issue myself.

[caryoscelus]

@DeeUnderscore done

[caryoscelus]

@rardiol @DeeUnderscore would you say it would make sense for Bright Nights fork package to be included (lets say as bn.nix and bn-git.nix) in the same directory or keep them separate? so far it seems the only compilation change required (besides different source) -Wno-ignored-attributes flag

[rardiol]

On Tuesday, 30 July 2024 17.14.23 GMT-3 caryoscelus wrote:

@rardiol @DeeUnderscore would you say it would make sense for Bright Nights fork package to be included (lets say as bn.nix and bn-git.nix) in the same directory or keep them separate? so far it seems the only compilation change required (besides different source) -Wno-ignored-attributes flag If it is a fork and is essentially the same derivation and both will evolve together I think it makes sense to keep both in the same directory.

[cizra]

Tested with Linux, works fine. Could we merge this PR separately, now, to get a baseline working, and then continue working on C:BN?

[caryoscelus]

@cizra that was what i expected

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1931

[DeeUnderscore]

Waiting for someone with merge access, then... I wonder if there's a procedure to get their attention.

There is a thread on the Discourse that can be used for that, where I've posted this (see previous automated comment)