summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2023-09-25 17:40:34 +0100
committerDomen Kožar <domen@dev.si>2023-09-25 17:40:34 +0100
commit461a549036fc552923f72973d7916a8f3b35741d (patch)
treecf81639a0ac8ad01f8830e9e38edda5fa262226d /pkgs/development/haskell-modules/configuration-common.nix
parent4ddbdb0d9cf2237fdb79c2d1dad0abcf425f647f (diff)
downloadnixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar
nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.gz
nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.bz2
nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.lz
nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.xz
nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.zst
nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.zip
cachix: 1.6 -> 1.6.1
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix10
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 c5aef8b2b13..1889828528d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -391,15 +391,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;