Unverified Commit 2a71eb4a authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #220333 from domenkozar/cachix-1.3.1 

cachix: 1.3 -> 1.3.1
parents 48e4e2a1 551cec9f

pkgs/development/haskell-modules/configuration-nix.nix

+7 −7
Original line number Diff line number Diff line
@@ -879,17 +879,17 @@ self: super: builtins.intersectAttrs super { 
  domaindriven-core = dontCheck super.domaindriven-core;



  cachix = overrideCabal (drv: {

    version = "1.3";

    version = "1.3.1";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.3";

      sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q=";

      rev = "v1.3.1";

      sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";

    };

    buildDepends = [ self.conduit-concurrent-map ];

    postUnpack = "sourceRoot=$sourceRoot/cachix";

    postPatch = ''

      sed -i 's/1.2/1.3/' cachix.cabal

      sed -i 's/1.3/1.3.1/' cachix.cabal

    '';

  }) (super.cachix.override {

    nix = self.hercules-ci-cnix-store.passthru.nixPackage;
@@ -897,12 +897,12 @@ self: super: builtins.intersectAttrs super { 
    hnix-store-core = super.hnix-store-core_0_6_1_0;

  });

  cachix-api = overrideCabal (drv: {

    version = "1.3";

    version = "1.3.1";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.3";

      sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q=";

      rev = "v1.3.1";

      sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";

    };

    postUnpack = "sourceRoot=$sourceRoot/cachix-api";

  }) super.cachix-api;