cachix: 0.1.3 -> 0.2.0

This commit is contained in:
Domen Kožar 2019-03-05 10:59:51 +07:00
parent b257346c42
commit d45ba336b2
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
5 changed files with 84 additions and 1 deletions

View File

@ -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;

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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

View File

@ -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;
};