From d45ba336b28661b16e6c8bb027bb68ba4e62c1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 5 Mar 2019 10:59:51 +0700
Subject: [PATCH] cachix: 0.1.3 -> 0.2.0

---
 .../haskell-modules/configuration-common.nix  |  3 ++
 pkgs/development/tools/cachix/cachix-api.nix  | 33 ++++++++++++++++
 pkgs/development/tools/cachix/cachix.nix      | 39 +++++++++++++++++++
 pkgs/development/tools/cachix/default.nix     |  8 ++++
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/cachix/cachix-api.nix
 create mode 100644 pkgs/development/tools/cachix/cachix.nix
 create mode 100644 pkgs/development/tools/cachix/default.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e27348b94556..316efcd0d596 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1075,6 +1075,9 @@ self: super: {
   cborg = doJailbreak super.cborg;
   serialise = doJailbreak (dontCheck super.serialise);
 
+  # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
+  netrc = doJailbreak super.netrc;
+
   # https://github.com/phadej/tree-diff/issues/19
   tree-diff = doJailbreak super.tree-diff;
 
diff --git a/pkgs/development/tools/cachix/cachix-api.nix b/pkgs/development/tools/cachix/cachix-api.nix
new file mode 100644
index 000000000000..de8184308b27
--- /dev/null
+++ b/pkgs/development/tools/cachix/cachix-api.nix
@@ -0,0 +1,33 @@
+{ mkDerivation, aeson, base, base16-bytestring, bytestring, conduit
+, cookie, cryptonite, deepseq, exceptions, hspec, hspec-discover
+, http-api-data, http-media, lens, memory, protolude, resourcet
+, servant, servant-auth, servant-auth-server, servant-auth-swagger
+, servant-client, servant-swagger, servant-swagger-ui-core, stdenv
+, string-conv, swagger2, text, transformers
+}:
+mkDerivation {
+  pname = "cachix-api";
+  version = "0.2.0";
+  sha256 = "73f27484d3748fe02ce834549dd3a04c92110390f7d9adb4c391bad2ececbef2";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson base base16-bytestring bytestring conduit cookie cryptonite
+    deepseq exceptions http-api-data http-media lens memory resourcet
+    servant servant-auth servant-auth-server servant-auth-swagger
+    servant-client servant-swagger string-conv swagger2 text
+    transformers
+  ];
+  executableHaskellDepends = [ aeson base ];
+  testHaskellDepends = [
+    aeson base base16-bytestring bytestring conduit cookie cryptonite
+    hspec http-api-data http-media lens memory protolude servant
+    servant-auth servant-auth-server servant-auth-swagger
+    servant-swagger servant-swagger-ui-core string-conv swagger2 text
+    transformers
+  ];
+  testToolDepends = [ hspec-discover ];
+  homepage = "https://github.com/cachix/cachix#readme";
+  description = "Servant HTTP API specification for https://cachix.org";
+  license = stdenv.lib.licenses.asl20;
+}
diff --git a/pkgs/development/tools/cachix/cachix.nix b/pkgs/development/tools/cachix/cachix.nix
new file mode 100644
index 000000000000..0f5a354ec94e
--- /dev/null
+++ b/pkgs/development/tools/cachix/cachix.nix
@@ -0,0 +1,39 @@
+{ mkDerivation, async, base, base16-bytestring, base64-bytestring
+, bytestring, cachix-api, conduit, conduit-extra, cookie
+, cryptonite, data-default, dhall, directory, ed25519, filepath
+, fsnotify, here, hspec, hspec-discover, http-client
+, http-client-tls, http-conduit, http-types, lzma-conduit
+, megaparsec, memory, mmorph, netrc, optparse-applicative, process
+, protolude, retry, safe-exceptions, servant, servant-auth
+, servant-auth-client, servant-client, servant-client-core
+, servant-conduit, stdenv, temporary, text, unix, uri-bytestring
+, versions
+}:
+mkDerivation {
+  pname = "cachix";
+  version = "0.2.0";
+  sha256 = "16ba70af7f2ba4bc147ba84c34c9884bee589237a1d935f932c5e0b68157665a";
+  revision = "1";
+  editedCabalFile = "103ypqp0kclc1814q2ci5fi2jpfbxwmjqfsnkvwf3c1vr8cqplmh";
+  isLibrary = true;
+  isExecutable = true;
+  enableSeparateDataOutput = true;
+  libraryHaskellDepends = [
+    async base base16-bytestring base64-bytestring bytestring
+    cachix-api conduit conduit-extra cookie cryptonite data-default
+    dhall directory ed25519 filepath fsnotify here http-client
+    http-client-tls http-conduit http-types lzma-conduit megaparsec
+    memory mmorph netrc optparse-applicative process protolude retry
+    safe-exceptions servant servant-auth servant-auth-client
+    servant-client servant-client-core servant-conduit text unix
+    uri-bytestring versions
+  ];
+  executableHaskellDepends = [ base cachix-api ];
+  executableToolDepends = [ hspec-discover ];
+  testHaskellDepends = [
+    base cachix-api directory here hspec protolude temporary
+  ];
+  homepage = "https://github.com/cachix/cachix#readme";
+  description = "Command line client for Nix binary cache hosting https://cachix.org";
+  license = stdenv.lib.licenses.asl20;
+}
diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix
new file mode 100644
index 000000000000..94527c8a4b50
--- /dev/null
+++ b/pkgs/development/tools/cachix/default.nix
@@ -0,0 +1,8 @@
+{ haskellPackages, haskell }:
+
+(haskellPackages.override {
+  overrides = self: super: {
+    cachix = haskell.lib.justStaticExecutables (super.callPackage ./cachix.nix {});
+    cachix-api = super.callPackage ./cachix-api.nix {};
+  };
+}).cachix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f2efe9c082b..83498a3b02bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9506,7 +9506,7 @@ in
 
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
-  cachix = (haskell.lib.justStaticExecutables haskellPackages.cachix).overrideAttrs (drv: {
+  cachix = (callPackage ../development/tools/cachix { }).overrideAttrs (drv: {
     meta = drv.meta // {
       hydraPlatforms = stdenv.lib.platforms.unix;
     };