commit c43a2d392ffbba0e9a4627a69c90dc30189208f9 · pyrox.dev/nixpkgs

+5 -5
pkgs/development/haskell-modules/configuration-common.nix
···

       63
       63
        
       

     

       64
       64
        
         # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.

     

       65
       65
        
         # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/

     

       66
       66
       -
         git-annex = (((overrideCabal super.git-annex (drv: {

     

       66
       66
       +
         git-annex = (overrideCabal (super.git-annex.overrideScope (self: super: {

     

       67
       67
       +
             optparse-applicative = self.optparse-applicative_0_14_0_0;

     

       68
       68
       +
           })) (drv: {

     

       67
       69
        
           src = pkgs.fetchgit {

     

       68
       70
        
             name = "git-annex-${drv.version}-src";

     

       69
       71
        
             url = "git://git-annex.branchable.com/";

     

       70
       72
        
             rev = "refs/tags/" + drv.version;

     

       71
       73
        
             sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx";

     

       72
       74
        
           };

     

       73
       73
       -
         }))).override {

     

       75
       75
       +
         })).override {

     

       74
       76
        
           dbus = if pkgs.stdenv.isLinux then self.dbus else null;

     

       75
       77
        
           fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;

     

       76
       78
        
           hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;

     

       77
       77
       -
         }).overrideScope (self: super: {

     

       78
       78
       -
           optparse-applicative = self.optparse-applicative_0_14_0_0;

     

       79
       79
       -
         });

     

       79
       79
       +
         };

     

       80
       80
        
       

     

       81
       81
        
         # https://github.com/froozen/kademlia/issues/2

     

       82
       82
        
         kademlia = dontCheck super.kademlia;