Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2019-01-27 16:36:40 +01:00
commit 35a2ace1ae

View File

@ -1,27 +1,27 @@
{ mkDerivation, aeson, async, attoparsec, base, blessings { mkDerivation, aeson, async, attoparsec, base, blessings
, bytestring, containers, data-default, fetchgit, filepath, lens , bytestring, containers, data-default, fetchgit, filepath
, lens-aeson, network, network-simple, network-simple-tls , hashable, lens, lens-aeson, network, network-simple
, pcre-heavy, pcre-light, process, random, stdenv, stringsearch , network-simple-tls, pcre-light, process, random, stdenv
, text, time, transformers, unagi-chan, unix, unordered-containers , string-conversions, stringsearch, text, time, transformers
, vector , unagi-chan, unix, unordered-containers, vector
}: }:
mkDerivation { mkDerivation {
pname = "reaktor2"; pname = "reaktor2";
version = "0.1.7"; version = "0.2.0";
src = fetchgit { src = fetchgit {
url = "https://cgit.krebsco.de/reaktor2"; url = "https://cgit.krebsco.de/reaktor2";
sha256 = "1ifjwn5dadlyhbdyym1i3g5vbsc7dyv7qzyprmcvx0qspr3rrk82"; sha256 = "1wls61d9z9zkvvfgq60clcph0800kpvymqw63dpsk0sp13zygpg9";
rev = "0395a9d9815d7d82469f0064738bef80ac87dbe3"; rev = "e9ca12a945b1d1c068e9c31050e264cb20690db4";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
executableHaskellDepends = [ executableHaskellDepends = [
aeson async attoparsec base blessings bytestring containers aeson async attoparsec base blessings bytestring containers
data-default filepath lens lens-aeson network network-simple data-default filepath hashable lens lens-aeson network
network-simple-tls pcre-heavy pcre-light process random network-simple network-simple-tls pcre-light process random
stringsearch text time transformers unagi-chan unix string-conversions stringsearch text time transformers unagi-chan
unordered-containers vector unix unordered-containers vector
]; ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
} }