Unverified Commit 7e5e43ef authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #257291 from domenkozar/cachix-1.6.1 

cachix: 1.6 -> 1.6.1
parents 2cd3ae19 461a5490

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

+1 −9
Original line number Diff line number Diff line
@@ -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;

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

+9 −9
Original line number Diff line number Diff line
@@ -1070,29 +1070,29 @@ self: super: builtins.intersectAttrs super { 
  domaindriven-core = dontCheck super.domaindriven-core;



  cachix-api = overrideCabal (drv: {

    version = "1.6";

    version = "1.6.1";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.6";

      sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc=";

      rev = "v1.6.1";

      sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";

    };

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

    postPatch = ''

      sed -i 's/1.5/1.6/' cachix-api.cabal

      sed -i 's/1.6/1.6.1/' cachix-api.cabal

    '';

  }) super.cachix-api;

  cachix = overrideCabal (drv: {

    version = "1.6";

    version = "1.6.1";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.6";

      sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc=";

      rev = "v1.6.1";

      sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";

    };

    postUnpack = "sourceRoot=$sourceRoot/cachix";

    postPatch = ''

      sed -i 's/1.5/1.6/' cachix.cabal

      sed -i 's/1.6/1.6.1/' cachix.cabal

    '';

  }) (lib.pipe

        (super.cachix.override {
@@ -1102,7 +1102,7 @@ self: super: builtins.intersectAttrs super { 
        [

         (addBuildTool self.hercules-ci-cnix-store.nixPackage)

         (addBuildTool pkgs.pkg-config)

         (addBuildDepend self.ascii-progress)

         (addBuildDepend self.immortal)

        ]

  );