Unverified Commit 8084770f authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #279600 from NixOS/cachix-1.7 

cachix: 1.6.1 -> 1.7
parents a31eb10d 92a280a8

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

+36 −1
Original line number Diff line number Diff line
@@ -391,7 +391,42 @@ self: super: { 
  # https://github.com/awakesecurity/nix-graph/issues/5

  nix-graph = doJailbreak super.nix-graph;



  cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix;

  # Manually maintained

  cachix-api = overrideCabal (drv: {

    version = "1.7";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.7";

      sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";

    };

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

  }) super.cachix-api;

  cachix = (overrideCabal (drv: {

    version = "1.7";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.7";

      sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";

    };

    postUnpack = "sourceRoot=$sourceRoot/cachix";

  }) (lib.pipe

        (super.cachix.override {

          nix = self.hercules-ci-cnix-store.nixPackage;

        })

        [

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

         (addBuildTool pkgs.buildPackages.pkg-config)

         (addBuildDepend self.immortal)

         # should be removed once hackage packages catch up

         (addBuildDepend self.crypton)

         (addBuildDepend self.generic-lens)

         (addBuildDepend self.amazonka)

         (addBuildDepend self.amazonka-core)

         (addBuildDepend self.amazonka-s3)

        ]

  ));



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

  kademlia = dontCheck super.kademlia;

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

+2 −35
Original line number Diff line number Diff line
@@ -1092,41 +1092,8 @@ self: super: builtins.intersectAttrs super { 
  # won't work (or would need to patch test suite).

  domaindriven-core = dontCheck super.domaindriven-core;



  cachix-api = overrideCabal (drv: {

    version = "1.6.1";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.6.1";

      sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";

    };

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

    postPatch = ''

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

    '';

  }) super.cachix-api;

  cachix = overrideCabal (drv: {

    version = "1.6.1";

    src = pkgs.fetchFromGitHub {

      owner = "cachix";

      repo = "cachix";

      rev = "v1.6.1";

      sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";

    };

    postUnpack = "sourceRoot=$sourceRoot/cachix";

    postPatch = ''

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

    '';

  }) (lib.pipe

        (super.cachix.override {

          nix = self.hercules-ci-cnix-store.nixPackage;

        })

        [

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

         (addBuildTool pkgs.pkg-config)

         (addBuildDepend self.immortal)

        ]

  );

  cachix = self.generateOptparseApplicativeCompletions [ "cachix" ]

    (enableSeparateBinOutput super.cachix);



  hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };

  hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -20720,9 +20720,7 @@ with pkgs; 














  c-blosc = callPackage ../development/libraries/c-blosc { };



























  # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990













  # ghc94: https://discourse.haskell.org/t/facing-mmap-4096-bytes-at-nil-cannot-allocate-memory-youre-not-alone/6259













  cachix = haskell.lib.justStaticExecutables haskell.packages.ghc94.cachix;













  cachix = lib.getBin haskellPackages.cachix;





























  calcium = callPackage ../development/libraries/calcium { };