diff --git a/pkgs/development/tools/cachix/cachix-api.nix b/pkgs/development/tools/cachix/cachix-api.nix deleted file mode 100644 index de8184308b27..000000000000 --- a/pkgs/development/tools/cachix/cachix-api.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ 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 deleted file mode 100644 index 0f5a354ec94e..000000000000 --- a/pkgs/development/tools/cachix/cachix.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ 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 index 94527c8a4b50..895d6e4bec62 100644 --- a/pkgs/development/tools/cachix/default.nix +++ b/pkgs/development/tools/cachix/default.nix @@ -1,8 +1,3 @@ { haskellPackages, haskell }: -(haskellPackages.override { - overrides = self: super: { - cachix = haskell.lib.justStaticExecutables (super.callPackage ./cachix.nix {}); - cachix-api = super.callPackage ./cachix-api.nix {}; - }; -}).cachix +haskell.lib.justStaticExecutables haskellPackages.cachix