diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-26 00:11:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 00:11:53 +0000 |
| commit | a1486d7898975f523c526fcb26b15dac08868135 (patch) | |
| tree | c84c2a63a0e30cfda282aa8a365b8d5c5e2539f4 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | da589d2bc054ae3fae1b9d18bc2cca38762f9685 (diff) | |
| parent | 00a0c4c44152b05220675ff7bbfa2049b130c58f (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6f2ac7a7cd95c..af0ee3becb70d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -396,15 +396,7 @@ self: super: { # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; - cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] - # Adds a workaround to the API changes in the versions library - # Should be dropped by the next release - # https://github.com/cachix/cachix/pull/556 - (appendPatch (fetchpatch { - url = "https://github.com/cachix/cachix/commit/078d2d2212d7533a6a4db000958bfc4373c4deeb.patch"; - hash = "sha256-xfJaO2CuZWFHivq4gqbkNnTOWPiyFVjlwOPV6yibKH4="; - stripLen = 1; - }) super.cachix); + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix; # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; |