From d849c0e2e1236b22e298254e75f8d30a665af66f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 30 Oct 2016 11:41:20 -0400 Subject: [PATCH 001/274] Build support --- pkgs/build-support/fetchurl/mirrors.nix | 5 ++++ .../java-modules/build-maven-package.nix | 26 +++++++++++++++++++ pkgs/development/java-modules/m2install.nix | 21 +++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 4 files changed, 56 insertions(+) create mode 100644 pkgs/development/java-modules/build-maven-package.nix create mode 100644 pkgs/development/java-modules/m2install.nix diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 5ae5eb105e7..0304165828f 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -396,4 +396,9 @@ rec { https://archive.mozilla.org/pub/ ]; + # Maven Central + maven = [ + http://repo1.maven.org/maven2 + http://central.maven.org/maven2 + ]; } diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix new file mode 100644 index 00000000000..182740c552d --- /dev/null +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -0,0 +1,26 @@ +{ stdenv, maven, lib }: +{ mavenDeps, src, name, meta, m2Path, ... }: + +with builtins; +with lib; + +stdenv.mkDerivation rec { + inherit mavenDeps src name meta m2Path; + + flatDeps = flatten mavenDeps; + + propagatedBuildInput = [ maven ] ++ flatDeps; + + find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; + copy = ''cp -rs ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2''; + + buildPhase = '' + mkdir -p $out/m2/${m2Path} + ${optionalString (length flatDeps > 0) find} + ${optionalString (length flatDeps > 0) copy} + echo "\ + tmpm2file://$out/m2*\ + $out/m2" >> $out/m2/settings.xml + ${maven}/bin/mvn clean install -Dmaven.test.skip=true -gs $out/m2/settings.xml + ''; +} diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix new file mode 100644 index 00000000000..56ae8132c61 --- /dev/null +++ b/pkgs/development/java-modules/m2install.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: +{ version, baseName, package, sha512, type ? "jar" }: + +let + name = "${baseName}-${version}"; + m2Path = "${package}/${baseName}/${version}"; + m2File = "${name}.${type}"; + src = fetchurl rec { + inherit sha512; + url = "mirror://maven/${m2Path}/${m2File}"; + }; +in stdenv.mkDerivation rec { + inherit name m2Path m2File src; + + installPhase = '' + mkdir -p $out/m2/$m2Path + cp $src $out/m2/$m2Path/$m2File + ''; + + phases = "installPhase"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cb32f3ce4d..bd0bdc0b510 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9761,6 +9761,10 @@ in leaps = callPackage ../development/tools/leaps { }; + ### DEVELOPMENT / JAVA MODULES + + javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { }); + ### DEVELOPMENT / LISP MODULES asdf = callPackage ../development/lisp-modules/asdf { From 1f2e19b67cdb68a89fc99a70eff5b851e488ab97 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 30 Oct 2016 11:44:56 -0400 Subject: [PATCH 002/274] Partial junit_4_12 --- .../java-modules/apache/commons-cli.nix | 14 + .../java-modules/apache/commons-lang.nix | 14 + .../java-modules/beanshell/bsh.nix | 14 + .../java-modules/classworlds/classworlds.nix | 14 + .../java-modules/eclipse/aether-util.nix | 15 + .../java-modules/hamcrest/core.nix | 16 + .../java-modules/junit/default.nix | 33 ++ .../java-modules/maven/artifact-manager.nix | 14 + .../java-modules/maven/artifact.nix | 25 ++ .../maven/common-artifact-filters.nix | 14 + pkgs/development/java-modules/maven/core.nix | 14 + .../java-modules/maven/dependency-tree.nix | 14 + .../java-modules/maven/doxia-sink-api.nix | 14 + .../java-modules/maven/enforcer.nix | 25 ++ .../java-modules/maven/error-diagnostics.nix | 14 + pkgs/development/java-modules/maven/model.nix | 25 ++ .../java-modules/maven/monitor.nix | 14 + .../java-modules/maven/plugin-api.nix | 36 ++ .../java-modules/maven/plugin-descriptor.nix | 14 + .../maven/plugin-parameter-documenter.nix | 14 + .../java-modules/maven/plugin-registry.nix | 14 + .../java-modules/maven/profile.nix | 14 + .../java-modules/maven/project.nix | 14 + .../java-modules/maven/reporting-api.nix | 14 + .../maven/repository-metadata.nix | 14 + .../java-modules/maven/settings.nix | 14 + .../development/java-modules/mavenPlugins.nix | 113 ++++++ .../plexus/component-annotations.nix | 14 + .../java-modules/plexus/container-default.nix | 14 + pkgs/development/java-modules/plexus/i18n.nix | 14 + .../java-modules/plexus/interactivity-api.nix | 14 + .../development/java-modules/plexus/utils.nix | 47 +++ pkgs/development/java-modules/poms.nix | 331 ++++++++++++++++++ pkgs/top-level/java-packages.nix | 113 ++++++ 34 files changed, 1101 insertions(+) create mode 100644 pkgs/development/java-modules/apache/commons-cli.nix create mode 100644 pkgs/development/java-modules/apache/commons-lang.nix create mode 100644 pkgs/development/java-modules/beanshell/bsh.nix create mode 100644 pkgs/development/java-modules/classworlds/classworlds.nix create mode 100644 pkgs/development/java-modules/eclipse/aether-util.nix create mode 100644 pkgs/development/java-modules/hamcrest/core.nix create mode 100644 pkgs/development/java-modules/junit/default.nix create mode 100644 pkgs/development/java-modules/maven/artifact-manager.nix create mode 100644 pkgs/development/java-modules/maven/artifact.nix create mode 100644 pkgs/development/java-modules/maven/common-artifact-filters.nix create mode 100644 pkgs/development/java-modules/maven/core.nix create mode 100644 pkgs/development/java-modules/maven/dependency-tree.nix create mode 100644 pkgs/development/java-modules/maven/doxia-sink-api.nix create mode 100644 pkgs/development/java-modules/maven/enforcer.nix create mode 100644 pkgs/development/java-modules/maven/error-diagnostics.nix create mode 100644 pkgs/development/java-modules/maven/model.nix create mode 100644 pkgs/development/java-modules/maven/monitor.nix create mode 100644 pkgs/development/java-modules/maven/plugin-api.nix create mode 100644 pkgs/development/java-modules/maven/plugin-descriptor.nix create mode 100644 pkgs/development/java-modules/maven/plugin-parameter-documenter.nix create mode 100644 pkgs/development/java-modules/maven/plugin-registry.nix create mode 100644 pkgs/development/java-modules/maven/profile.nix create mode 100644 pkgs/development/java-modules/maven/project.nix create mode 100644 pkgs/development/java-modules/maven/reporting-api.nix create mode 100644 pkgs/development/java-modules/maven/repository-metadata.nix create mode 100644 pkgs/development/java-modules/maven/settings.nix create mode 100644 pkgs/development/java-modules/mavenPlugins.nix create mode 100644 pkgs/development/java-modules/plexus/component-annotations.nix create mode 100644 pkgs/development/java-modules/plexus/container-default.nix create mode 100644 pkgs/development/java-modules/plexus/i18n.nix create mode 100644 pkgs/development/java-modules/plexus/interactivity-api.nix create mode 100644 pkgs/development/java-modules/plexus/utils.nix create mode 100644 pkgs/development/java-modules/poms.nix create mode 100644 pkgs/top-level/java-packages.nix diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix new file mode 100644 index 00000000000..74087a04e0c --- /dev/null +++ b/pkgs/development/java-modules/apache/commons-cli.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + commonsCli_1_0 = map (obj: fetchMaven { + version = "1.0"; + baseName = "commons-cli"; + package = "/commons-cli"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1pm5ba95viabcgpjhsqw21iwis9ajn8hwpyc6rzs9frr5k62hs7lj8darxmmp21hf14mxrs37a8swayhagq6i6g8js4nl4r8mmwjlvp"; } + { type = "jar"; sha512 = "0ybdbpfzadkncwcmnzkscbp2fhmcsqmpy60qppz7s8hs00hgqy64jr4qpdyz5bj0l4bc434vn0pv4gzxzi7y1lhh7b2rk4zv1mgs3ff"; } + ]; +} diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix new file mode 100644 index 00000000000..eb60d19e818 --- /dev/null +++ b/pkgs/development/java-modules/apache/commons-lang.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + commonsLang_2_3 = map (obj: fetchMaven { + version = "2.3"; + baseName = "commons-lang"; + package = "/commons-lang"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "0i94xb3fgq0ig0aids9r1h1kblhlf762gsjxh422ra23saa4474q4iywgfk596bpcflngf2sarq8ch6lw09p0g43779d23b74bd939n"; } + { type = "jar"; sha512 = "1f30pryvd39m2yazflzy5l1h4l473dj8ccrd9v8z8lb6iassn4xc142f2snkzxlc7ncqsi6fbfd3zfxsy8afivmxmxds6mbsrxayqwk"; } + ]; +} diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix new file mode 100644 index 00000000000..e636fe557ec --- /dev/null +++ b/pkgs/development/java-modules/beanshell/bsh.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + bsh_2_0_b4 = map (obj: fetchMaven { + version = "2.0b4"; + baseName = "bsh"; + package = "/org/beanshell"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1xgl3zw2gaca7f09224k3bi22dqdcd589c5jqk7p87s6dlbaai8sivklbq225yxmcpmwsi98r0a6xlgxnxnhk3b0qplf1bj4qp17dx9"; } + { type = "jar"; sha512 = "1idcadxcphpqh2f6qjijd2gdcklcv9qmv1aalh2z5rk5vipqm89hm05lwjapw2gy5x5q1grzxraalnspbhacrrwm15np07580k6vki9"; } + ]; +} diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix new file mode 100644 index 00000000000..a177927d3d6 --- /dev/null +++ b/pkgs/development/java-modules/classworlds/classworlds.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + classworlds_1_1 = map (obj: fetchMaven { + version = "1.1"; + baseName = "classworlds"; + package = "/classworlds"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "202zfp93ly15q5iamjwy2vsrip8i87pmv5pqyxl9v7wvcmd4flyhlhkkx7hw9jy82dbzglrs2jklsm96dy22nv1njm5dw5kbzarhakq"; } + { type = "jar"; sha512 = "1cs8v7hhbgwfmlx4dm7r78mki5vk0gjn798qy4w1qzkz90hf9yl52srpjair2fg96qsmk22nd73r92vdmjji65l75ji3kfghzx9872x"; } + ]; +} diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix new file mode 100644 index 00000000000..33ba3d5edd7 --- /dev/null +++ b/pkgs/development/java-modules/eclipse/aether-util.nix @@ -0,0 +1,15 @@ +{ fetchMaven }: + +rec { + aetherUtil_0_9_0_M2 = map (obj: fetchMaven { + version = "0.9.0.M2"; + baseName = "aether-util"; + package = "/org/eclipse/aether"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1qh3vzdf33fffsry9256vbaskhp0xsw1d8s7c429a1hiyz8qi9p2sqsh2mqj5vrfj0mxri1nm68pv0nm9fhqzrwfy6f2sihl8rp7df1"; } + { type = "pom"; sha512 = "2a0z5r5avm7gfkabkha6h1b0gbnma725dqby9wz6lhhkwqhn3zmdr69a0ll6vfh1mv0ir4spcr02hi61xlng4lakdlmwllm0g5ixaiz"; } + ]; +} + diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix new file mode 100644 index 00000000000..1414dc1fe6b --- /dev/null +++ b/pkgs/development/java-modules/hamcrest/core.nix @@ -0,0 +1,16 @@ +{ fetchMaven }: + +rec { + # Ant build, just fetch the binary + hamcrestCore_1_3 = map (obj: fetchMaven { + version = "1.3"; + baseName = "hamcrest-core"; + package = "/org/hamcrest"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "14vx453pk5shchdn3sz17s5im1cq1vav19rwnybafnsq2blfn3d0xz01cf9h1gnzclivhc4wgf7vvs23wcr7iiy4nksakxcb9rswdz2"; } + { type = "pom"; sha512 = "3rn4bs9ixdnwg916qdkjjv9m17l0ym7zj6cxaf18304wlbshxcb1fpa11rnll9g76ap0f4z8r70z3snfj6kyf6sw9xf9xpq4n1796rg"; } + ]; +} + diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix new file mode 100644 index 00000000000..7325b07700f --- /dev/null +++ b/pkgs/development/java-modules/junit/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgs, mavenbuild }: + +with pkgs.javaPackages; + +rec { + junitGen = { mavenDeps, sha512, version }: mavenbuild rec { + inherit mavenDeps sha512 version; + + name = "junit-${version}"; + src = pkgs.fetchFromGitHub { + inherit sha512; + owner = "junit-team"; + repo = "junit4"; + rev = "r${version}"; + }; + m2Path = "/junit/junit/${version}"; + + meta = { + homepage = http://junit.org/junit4/; + description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks"; + license = stdenv.lib.licenses.epl10; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; + [ nequissimus ]; + }; + }; + + junit_4_12 = junitGen { + mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ] ++ mavenPlugins.mavenDefault; + sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9"; + version = "4.12"; + }; +} diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix new file mode 100644 index 00000000000..b46fb254b17 --- /dev/null +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenArtifactManager_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-artifact-manager"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; } + { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix new file mode 100644 index 00000000000..d0b528b916a --- /dev/null +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -0,0 +1,25 @@ +{ fetchMaven }: + +rec { + mavenArtifact_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-artifact"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "17g913m1zbrvarkwvmz5xx9nv7mrk2984rc9pkbc2laid7n1nb226g0262xyhcnc2s57av96337ag6jg2bq9p1kgx7gbd2z6gnvkkia"; } + { type = "pom"; sha512 = "0g0cbqihzxyaa1b0z9a7qb8lkhcm8bzxi7qnqaab2n2zaaql6jyy7cf4z4yzqw3yfj7ylqvydiwp32j2c7nqacyx0hmcydqkqg46kxv"; } + ]; + + mavenArtifact_3_0_3 = map (obj: fetchMaven { + version = "3.0.3"; + baseName = "maven-artifact"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0f842m7wi9ajvphgshnmsn8dppiwr326yp663gic45xzkpfvka118npl8xxqnr683dipvbnbrddim974qcpz4mgpypir0922803i3qv"; } + { type = "pom"; sha512 = "3wpambpgm68rap906gdvwlbywgjs57nkc8k05r8rx701800zbpwlrzc9b3ipxgjb7y6f2z1vi14yj9ia12wv7k8jn2aspf31pzp5plq"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix new file mode 100644 index 00000000000..4d46de674b5 --- /dev/null +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven { + version = "1.4"; + baseName = "maven-common-artifact-filters"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "21wyk4llwjyanlggy281f9n0sjshjqvd322lbhxmzn42cd9vmj0s6xih82jwqlkcxkypwymyj1gl7van55ibd98p1jjjvr93gs1cn14"; } + { type = "jar"; sha512 = "1bv4lp1a8sb79almnygiq0pmm0fdhy9pyakp6xhz91b4v1cqg03sb586yc4lg2934yv4jjbybqjbh4l0y3kgnanjbxdxdgxgyf14iif"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix new file mode 100644 index 00000000000..6aed7095ad2 --- /dev/null +++ b/pkgs/development/java-modules/maven/core.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenCore_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-core"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; } + { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix new file mode 100644 index 00000000000..cdd626e5848 --- /dev/null +++ b/pkgs/development/java-modules/maven/dependency-tree.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenDependencyTree_2_1 = map (obj: fetchMaven { + version = "2.1"; + baseName = "maven-dependency-tree"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "29ibiyc1x20yrnxgcpvvf3k0pcjq63l98lakk10gipmx8a7bqs6m7npcqhzq6a3xrrcnz4pp7mj9gkmcs1svhg3qj4778cdax5pfy39"; } + { type = "jar"; sha512 = "3mr5ph5yngfvqwvrbiwvs66d8gbhpjsp009q5hrarkg53kwlphy6rmvdkfzp4j5rz8dd4cirv7vf6nhhrpdnjy2fc8bhx2s61zissnd"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix new file mode 100644 index 00000000000..6acf39b480d --- /dev/null +++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenDoxiaSinkApi_1_0_alpha10 = map (obj: fetchMaven { + version = "1.0-alpha-10"; + baseName = "doxia-sink-api"; + package = "/org/apache/maven/doxia"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "31n980rx8m3sy6ia6izdjmc95pd8gvy31a1j933qznvs10flsf3gvmnywcyncf9y4pvaynddqjfvjpvf1qkxcw9jwjcmq7ka3325fi9"; } + { type = "jar"; sha512 = "1bgp929njkqvzv1q07drfncqagpkfw1ksi0cvwqq69ww2lbg3rmq2if11j7ldwn2rdvmfrr9qyhg34vwz13gfh7yylkw0il0q9h9hlj"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix new file mode 100644 index 00000000000..83037e6adee --- /dev/null +++ b/pkgs/development/java-modules/maven/enforcer.nix @@ -0,0 +1,25 @@ +{ fetchMaven }: + +rec { + mavenEnforcerApi_1_3_1 = map (obj: fetchMaven { + version = "1.3.1"; + baseName = "enforcer-api"; + package = "/org/apache/maven/enforcer"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "2bh75j9f1hf80yhikd2r014kq8pgf9b49w62w7v9772kwdsza84v527vph0ifldpk561aivz5v604a9rpw5zb03gkixr51qspmsg2hp"; } + { type = "jar"; sha512 = "2pi1df9brkrlqp36pvk8ccc308b2882nmb2c1pbp2vaf4v95wm529vyng5gv9012l6c293ciamaxiv019zv04hl3zsgpk0m5fg3qhs0"; } + ]; + + mavenEnforcerRules_1_3_1 = map (obj: fetchMaven { + version = "1.3.1"; + baseName = "enforcer-rules"; + package = "/org/apache/maven/enforcer"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "16i11v6rlym87zvq3x0nn7m8g5w3vyf3g097cz79a3hjmzf3zk12837wi007697nr5dfd3sq9r9cgxmqw77y6cyphaic71hmhv4jx7c"; } + { type = "jar"; sha512 = "33xp9dgdml15bf8dpw4b61wfqnkypixd697q60lan3hvv10bs33jfw8xxsj2pl2l11hca6whk2c1wdddc913s88r13zzaghgizwsx55"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix new file mode 100644 index 00000000000..22ac264bdd1 --- /dev/null +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenErrorDiagnostics_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-error-diagnostics"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; } + { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix new file mode 100644 index 00000000000..fa3abf7c4d2 --- /dev/null +++ b/pkgs/development/java-modules/maven/model.nix @@ -0,0 +1,25 @@ +{ fetchMaven }: + +rec { + mavenModel_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-model"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "14pxgdcim20x9lisf510nazzlcjxv9fpqabkdn0d86qa7d9270m4fmya5crasx2np9h0gxl407d77vcjf99fdxizg7i32w35yljqp3z"; } + { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; } + ]; + + mavenModel_3_0_3 = map (obj: fetchMaven { + version = "3.0.3"; + baseName = "maven-model"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "13b339n0iibvy9x1d34b6gsnlz2s26ap866nhm4wyrlb0hkyb4zf7xbvc8aigr9zzzc4msn3yi98ylgsbinxx8dkbs89x1amnd7v1nr"; } + { type = "pom"; sha512 = "38dbv2z16h1wq16pxx5nrpndpkmnmj6wxsa4x13hsm7skmfwxdr51ddjddc4qlqk9dfnny0yv3lf009k0pfs06hfn0xiv85ki5y1hfg"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix new file mode 100644 index 00000000000..1304304257a --- /dev/null +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenMonitor_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-monitor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; } + { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix new file mode 100644 index 00000000000..56069bf1970 --- /dev/null +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -0,0 +1,36 @@ +{ fetchMaven }: + +rec { + mavenPluginApi_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-plugin-api"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "3926imf3d59530ldz9hajjq6xkb5mb1llx7br0025p8c1xfhgr4hqm6dripi0yd9f53sbdxhla5ly68q2vsbzbklpldrvrbz6b5wrql"; } + { type = "jar"; sha512 = "34fb0yw3z7bxlxxs8wmv59g351jkfp16ljq5zmyksq54kz2wvkv39w7bcnvlkbdwaggm7cd2jr9s4y4lynkblp8ydf9jbq8awwr7c00"; } + ]; + + mavenPluginApi_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-plugin-api"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "23qj23k049jz4mp77h2wj4mnjqszb99l4xvxas93cpnbdl51a5s0d0rsg60a8zg0ic04n6fr8nig0vvmmcsggx93a96w4p3na97q30n"; } + { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; } + ]; + + mavenPluginApi_3_0_3 = map (obj: fetchMaven { + version = "3.0.3"; + baseName = "maven-plugin-api"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "17zyw3j4zbg1hhj18i4q1f0r8gdxl3q9x5ksyqlyr0mrw2sadc6lvbbhyp3l7vsbddl4bgdx36gwvjp5d97gbmk1nbpi1vabadfhq76"; } + { type = "jar"; sha512 = "0rk2nzkwcrkfy3vs0zl0l2lxp3w4hkwxrypisbivv5al7sc8lbzls6jgpp3h5gx9kk4scjj24qf5vyimnbadj63rvqffg581fs2zgl9"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix new file mode 100644 index 00000000000..35b829a8578 --- /dev/null +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenPluginDescriptor_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-plugin-descriptor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; } + { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix new file mode 100644 index 00000000000..17ed70bfa9f --- /dev/null +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenPluginParameterDocumenter_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-plugin-parameter-documenter"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; } + { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix new file mode 100644 index 00000000000..baccc1aeb76 --- /dev/null +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenPluginRegistry_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-plugin-registry"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; } + { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix new file mode 100644 index 00000000000..674f35a2ef9 --- /dev/null +++ b/pkgs/development/java-modules/maven/profile.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenProfile_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-profile"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; } + { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix new file mode 100644 index 00000000000..0d88850fb5d --- /dev/null +++ b/pkgs/development/java-modules/maven/project.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenProject_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-project"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0laxsz9z48zvx27m395djfl9121jkr7amiv8n07z9nkz9i60wjl52bb7cw6hp6090ba098g8azqpnz8l5i0yj255phy1j6s92ci1i7c"; } + { type = "pom"; sha512 = "047a0a2bd5fkmg70gzhdiwiwq5dmr84pz6jq9yi5fz44y57ndp7nb72fnkr0p0qcwmry3gj03hk9p2xr4ph53bl1x68j22fnv0f9krq"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix new file mode 100644 index 00000000000..ea808848911 --- /dev/null +++ b/pkgs/development/java-modules/maven/reporting-api.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenReportingApi_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-reporting-api"; + package = "/org/apache/maven/reporting"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0x7j7k3xbxps80swyp4ff1sw4rwrhlxsx80kyh0sj0i9jz50x18p1rba10gx2fqd4l29zri77nlm4qza5yrf61s68xby2zr2bygyc9r"; } + { type = "pom"; sha512 = "054v1p9h0141pahs52pg8wb0x4jghm5222yns6mf4dbc9gpy7x9j2b0z2lv9q3slx98378s4zakx4kbk5ca9ldlm8sz9y10fpqm35s6"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix new file mode 100644 index 00000000000..125788c54f9 --- /dev/null +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenRepositoryMetadata_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-repository-metadata"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; } + { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix new file mode 100644 index 00000000000..73d707144bd --- /dev/null +++ b/pkgs/development/java-modules/maven/settings.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenSettings_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-settings"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; } + { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; } + ]; +} diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix new file mode 100644 index 00000000000..17d4c86ba99 --- /dev/null +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -0,0 +1,113 @@ +{ pkgs, stdenv, lib, maven, fetchurl }: + +with pkgs.javaPackages; + +let + mavenbuild = pkgs.callPackage ./build-maven-package.nix { }; + fetchMaven = pkgs.callPackage ./m2install.nix { }; + poms = import ./poms.nix { inherit fetchMaven; }; +in rec { + inherit mavenbuild fetchMaven poms; + + # Standard plugins used by pretty much every Maven build + mavenDefault = lib.flatten [ aetherUtil_0_9_0_M2 bsh_2_0_b4 classworlds_1_1 commonsCli_1_0 commonsLang_2_3 mavenArtifact_2_0_9 mavenArtifact_3_0_3 mavenArtifactManager_2_0_9 mavenClean_2_5 mavenCommonArtifactFilters_1_4 mavenCompiler_3_1 mavenCore_2_0_9 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcer_1_3_1 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_9 mavenInstall_2_4 mavenJar_2_4 mavenModel_2_0_9 mavenModel_3_0_3 mavenMonitor_2_0_9 mavenPluginApi_2_0_6 mavenPluginApi_2_0_9 mavenPluginApi_3_0_3 mavenPluginDescriptor_2_0_9 mavenPluginParameterDocumenter_2_0_9 mavenPluginRegistry_2_0_9 mavenProfile_2_0_9 mavenProject_2_0_9 mavenReplacer_1_5_3 mavenReportingApi_2_0_9 mavenRepositoryMetadata_2_0_9 mavenResources_2_6 mavenSettings_2_0_9 mavenSurefire_2_17 plexusComponentAnnotations_1_5_5 plexusContainerDefault_1_0_alpha9_stable1 plexusI18n_1_0_beta6 plexusInteractivityApi_1_0_alpha4 plexusUtils_1_5_8 plexusUtils_2_0_6 plexusUtils_3_0 ] ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 apache_10 apache_11 apache_13 apache_3 apache_4 apache_6 beanshell_2_0_b4 codehausParent_4 doxia_1_0_alpha10 doxia_1_0 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_6 maven_2_0_9 maven_3_0_3 mavenParent_15 mavenParent_21 mavenParent_22 mavenParent_23 mavenParent_5 mavenParent_6 mavenParent_8 mavenPlugins_22 mavenPlugins_23 mavenPlugins_24 mavenReporting_2_0_9 mavenSharedComponents_17 mavenSharedComponents_19 mojoParent_32 plexus_1_0_4 plexus_2_0_2 plexus_2_0_7 plexusComponents_1_1_4 plexusContainers_1_0_3 plexusContainers_1_5_5 sonatypeForgeParent_5 sonatypeParent_7 sonatypeSpiceParent_16 surefire_2_17 ]); + + animalSniffer_1_11 = map (obj: fetchMaven { + version = "1.11"; + baseName = "animal-sniffer-maven-plugin"; + package = "/org/codehaus/mojo"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "224y5klr8pmm4g3k1qcqrbsjdng1nc9rfzlrk5x50q3d8pn0pj7jr1wg58997m217qimx4pwgcdbgl9niaw0xg136p76kd4hschbxda"; } + { type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; } + ]; + + mavenClean_2_5 = map (obj: fetchMaven rec { + version = "2.5"; + baseName = "maven-clean-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1dc1jd65pz1wl0hr89a8v4g8kd2hcixcdlpa102ffm03mmddc1862whbj9hppx3i3297rahrwl81cph3cdc866fbhbgaj7wld2649n7"; } + { type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; } + ]; + + mavenCompiler_3_1 = map (obj: fetchMaven rec { + version = "3.1"; + baseName = "maven-compiler-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1dqav3mb4ppg9l10qw04galjmf7yhlyzdna5ldpp3pmpsqglb8m2ab1q324ansz29dbp014w9c7na703jk7qzrja1ilxj0w71rpmsd5"; } + { type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; } + ]; + + mavenEnforcer_1_3_1 = map (obj: fetchMaven rec { + version = "1.3.1"; + baseName = "maven-enforcer-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "0w47gx4ksksnl9siq954g2zvx8gx0qa6q5kp91qyyk88c65mfqjjm19613h3dhfmjq9f4rl8b1qhrq35gy7l90aplnibcimrpm6w6nk"; } + { type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; } + ]; + + mavenInstall_2_4 = map (obj: fetchMaven rec { + version = "2.4"; + baseName = "maven-install-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1s5isapjz7mp9cl0jvk8nd1amrasdk257zbil76yabd1h89q4504y01482lxh7sp7x4mcqzj00i6517qcfdzf6w99cnd8dxwgkwqq06"; } + { type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; } + ]; + + mavenJar_2_4 = map (obj: fetchMaven rec { + version = "2.4"; + baseName = "maven-jar-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "12pj3lg7gf0c9hisasrks27b3a0ibvmlbgwbx7p1dcp0as40xwffrx57am7xpqv5bzwl5plh7xxd7s14yyvk8dybjhlj7shqmgn973r"; } + { type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; } + ]; + + mavenReplacer_1_5_3 = map (obj: fetchMaven rec { + version = "1.5.3"; + baseName = "replacer"; + package = "/com/google/code/maven-replacer-plugin"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "08vz72v426hd8bzpz2wd003r4kz7rn5syva5picppgwdj69q8xm4dj78mx39ywsgzv2x8jd3w3jpc23pgr07dqj5h2kyj44147lkhsp"; } + { type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; } + ]; + + mavenResources_2_6 = map (obj: fetchMaven rec { + version = "2.6"; + baseName = "maven-resources-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "3rki0dhs3y7w9vbvwf2i7hmq9vismcfq79cdzd3qfs9bva4qxikx939idg8jmwnwaqww4q3wmgwg5vx3n910m8m2xr83x6y0dm62vbk"; } + { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; } + ]; + + mavenSurefire_2_17 = map (obj: fetchMaven rec { + version = "2.17"; + baseName = "maven-surefire-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "367j67yy8jyq0k7ycnf9ixjy0rl2xb7cz0hwvh9rcbxkbr687bwam2gss0zdsr44q2ndk5hlcq56hhngp055194p90hkcvgr343ng6y"; } + { type = "jar"; sha512 = "3vhs3djga2ni3bsldn7jml8ya3vgvqaakiybj9y77q8z35xcnf34hsxkmlpm6mbyl5afcv2ij6syas0zppshqbp64ibx7bsqnfi0zbl"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix new file mode 100644 index 00000000000..949238001be --- /dev/null +++ b/pkgs/development/java-modules/plexus/component-annotations.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven { + version = "1.5.5"; + baseName = "plexus-component-annotations"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2r0dzjs65hzllvm7kizis0lmx4sp3967c1918181y0isnlp1fsxg8sakb2qnfn748xnnxgh7h5fk04az999isd8qs1p85cgi2waz91f"; } + { type = "pom"; sha512 = "1yx9dl3mq8wx3w4ksq0z1x84kry1l1agdg3ssnbjwxlh96hjxki88j89iyfwbwwia40113b62r8168s0lhgzca3w7kbdii3kldgbz6y"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix new file mode 100644 index 00000000000..a720c06a186 --- /dev/null +++ b/pkgs/development/java-modules/plexus/container-default.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusContainerDefault_1_0_alpha9_stable1 = map (obj: fetchMaven { + version = "1.0-alpha-9-stable-1"; + baseName = "plexus-container-default"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1dpzdijx7xb3kgv2ybias3shzvpsq82w6x1ig5gdkg0i47m6a1ld53bi3gjczdpn88xparp80jkqlacjb65764v05ps6zg0v3vr1dkw"; } + { type = "pom"; sha512 = "1gnm9ivwrkr3aqpnmdl34hkx53189wxj9acp2fms8inhznrxqcyyk355gpgzwvs9qpgdis1q88mj1fy3x1v3ffa3b6wi758p95q79jc"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix new file mode 100644 index 00000000000..7af0cd17de8 --- /dev/null +++ b/pkgs/development/java-modules/plexus/i18n.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusI18n_1_0_beta6 = map (obj: fetchMaven { + version = "1.0-beta-6"; + baseName = "plexus-i18n"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "28j0h3qd2xpddcs9wxr30235a8l1jlqwj7mhbvdhqcn8ck2bbp7dx1bl9p8mzl1v6lgzqi12ga6lccs2axadmz0w7fscvzmfh2v8mvk"; } + { type = "pom"; sha512 = "1zv1v86vqzmk03mvl1i74wqk5s2b0wgr6qksdnjp7msmm8k27ilbgsdf9nf9wfc84s4kw4xwwkg954x192klwmv16kslc6xqjbxl2gk"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix new file mode 100644 index 00000000000..9d62aec70f4 --- /dev/null +++ b/pkgs/development/java-modules/plexus/interactivity-api.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven { + version = "1.0-alpha-4"; + baseName = "plexus-interactivity-api"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2zy33hz2g0mgb2ryjbgjrf55bmmglkbsmh03wx29d4cwgcd83i1wb211c1wxdnnf7a8cx6ryfhx1fxwq379m4793apa9aix8px5sqj2"; } + { type = "pom"; sha512 = "27890lj546q9rapgzks8dkdc5d2lbsr1rgbhl9vxkr7hpqci0m2q6g7zpl94vk50hx4bb52p24j0x6dqsyd6ijnadbi1dysfnb6jm6f"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix new file mode 100644 index 00000000000..672a43455c9 --- /dev/null +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -0,0 +1,47 @@ +{ fetchMaven }: + +rec { + plexusUtils_1_1 = map (obj: fetchMaven { + version = "1.1"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "36k6grn4as4ka3diizwvybcfsn4spqqmqxvsaf66iq1zi2vxj3rsfr4xq6isv3p8f09wnnv9jm9xqqz4z0n3ah5mi8z1p5zhskcm5fs"; } + { type = "pom"; sha512 = "0vbzdfsdcc4cq7hdqzb1vdfxp23vnavq7z4qmmlb4d4fiqj5wqdgagrs43gl7yzca2azpyj3kyxgaipimi7gck07jcsz0pzljkplk4w"; } + ]; + + plexusUtils_1_5_8 = map (obj: fetchMaven { + version = "1.5.8"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0nx0l29lmphylkmnacwj6n1spdxxaqn1jr5vg4pcil9y2p08bzyn715bhwgazg3sa94ynzi38lsmf60y00prv3cy2zgj0smg5psq3z5"; } + { type = "pom"; sha512 = "06z4gkq3bh2pwyj8pvaly9fihd8gbgcqp3jxl05vkj2rcdb4jw3lw3hwn8f8ggqi17i2fdm8cbndkqgr9vdgiz45p8f1nx8kjlqikbi"; } + ]; + + plexusUtils_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3n0g1xhjkjm0m3ch5wm34vxvldw889p401rlwqrlzm6nh53h36plq955v2vv30gjdgp7n54lpr4pb374fxz6wbzj385kphmsgxbsaxc"; } + { type = "pom"; sha512 = "22g2dlbgc557k126hd0nfaf6n76vwa19nnd0ga8ywdx5pnai63x9806d7dhvjm778rmgpxlrj65y8if36q0zkbg153i007cxg36indj"; } + ]; + + plexusUtils_3_0 = map (obj: fetchMaven { + version = "3.0"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "16m1khf9fafb9f79rbz93qgc35d8605v1qbs4ywnj4sk00d00d6n1649cc9rv593r8ghwd0rkz345z7wb00fagdr9af5h8h5w5blsa1"; } + { type = "pom"; sha512 = "123fsmm1jvy571yl1s3wp7yd5k52nfjqxzqpzx2940rsigm35rw2mx1g4bvr3wx0gv5bqlfmqj5cwdhhxdq5vzrax8z5vbmdg5vb77r"; } + ]; +} diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix new file mode 100644 index 00000000000..39dc9528140 --- /dev/null +++ b/pkgs/development/java-modules/poms.nix @@ -0,0 +1,331 @@ +{ fetchMaven }: + +rec { + aether_0_9_0_M2 = fetchMaven { + version = "0.9.0.M2"; + baseName = "aether"; + package = "/org/eclipse/aether"; + sha512 = "0ampl2jkkc1f5cbigmi1b5nnxhb9qqzz0nyfb5a2vzbw3ri7ry8dj6xgjznlpxib46zxgaxcsvhxq2yx6a9i8chnzvgghccwpl808yi"; + type = "pom"; + }; + + animalSnifferParent_1_11 = fetchMaven { + version = "1.11"; + baseName = "animal-sniffer-parent"; + package = "/org/codehaus/mojo"; + sha512 = "3w9l3b4qxzmlwmaqppn1d794ycqf5piilv44fc74jccbgahdsq1as8dvyknnj2610yklwxx3146s7f0c3ms8y93alv02wybjwk5fd07"; + type = "pom"; + }; + + apache_3 = fetchMaven { + version = "3"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "3vvqxycj7zxa9dfxa6f8i2azdvxc7ci68fk3nlkjvhsglmwr39wf6cwgj6qqlrw3mabzs714lgz0wdacsidncadxzfw774ck20dq1rf"; + type = "pom"; + }; + + apache_4 = fetchMaven { + version = "4"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6"; + type = "pom"; + }; + + apache_6 = fetchMaven { + version = "6"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "2nvwk7fhiqcbr4vrwl0d3g4wz25vll24ga9kyc89fzq6b9nr6bqfphrm5a73kdih97l5cqlszw8xc847viw2ss1mwabn590f01ykhj0"; + type = "pom"; + }; + + apache_10 = fetchMaven { + version = "10"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "0kmva6f2q5rq7rk9ljwn3rxa4w2j7sjkxsmvambzqpj61cagdnq4vj9jk0xxx8448kqckdh5w2xkr5lr33sgfl67jy9l5h2s6h13v6m"; + type = "pom"; + }; + + apache_11 = fetchMaven { + version = "11"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "09v6sghdaxinrk3pnpnc36x24z62gqn65v25q83mc0q6n49l0xir55xk21qzc8kc6hrdr9khnr7jxkqz207cyv6wky6sy7c3pqg0na0"; + type = "pom"; + }; + + apache_13 = fetchMaven { + version = "13"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "0sf86l1457wwp8czg32xhh96l5nlw8v84lbi59nfdxxzcrsn8b1ysgwda3r1ck0d86c5gjmh3qg7kbwlrspwa71w9zn9sby3bszj99v"; + type = "pom"; + }; + + beanshell_2_0_b4 = fetchMaven { + version = "2.0b4"; + baseName = "beanshell"; + package = "/org/beanshell"; + sha512 = "2xwgqmfwli40lvlgjx00ki5zm1290jhjvqg7wnq869kxkw9iam239zxb0jz46jcpbgy10qg6sd86cjw5g38njywcz33501f6byd0n3w"; + type = "pom"; + }; + + codehausParent_4 = fetchMaven { + version = "4"; + baseName = "codehaus-parent"; + package = "/org/codehaus"; + sha512 = "11dacs4155xc3rn3crdayg1yp15abw81lbk6qwi7207009rnyk1kxvs56am9pllkybgja53ri0k084k2ppp4dlhxrg6w3zccbafxlgp"; + type = "pom"; + }; + + doxia_1_0_alpha10 = fetchMaven { + version = "1.0-alpha-10"; + baseName = "doxia"; + package = "/org/apache/maven/doxia"; + sha512 = "3by91czdkjn4myc6xwzap37ydmhvic4myr8p2zflnpawrph00jkz9pivd84k2qykvmc5gxzbmklf1inwvkq1f5bsyhh440mlvsfsn1s"; + type = "pom"; + }; + + doxia_1_0 = fetchMaven { + version = "1.0"; + baseName = "doxia"; + package = "/org/apache/maven/doxia"; + sha512 = "3z04h87dwn5panpr68ajzflw5n4wgi98isl5snz6vrd2vz9744fdqggmn6698wljw9h4pzkvjyrxf9b7w4km6w7kma28akvn951vw99"; + type = "pom"; + }; + + enforcer_1_3_1 = fetchMaven { + version = "1.3.1"; + baseName = "enforcer"; + package = "/org/apache/maven/enforcer"; + sha512 = "1m84z5x2gxlbj9bl2jrfzh26pl7nz1d79sv72clp565z4lr2r1abih2c7aigbd95zik948dqrbh2vzm7vp1iv0d23vk89rx4nmfg0rv"; + type = "pom"; + }; + + hamcrestParent_1_3 = fetchMaven { + version = "1.3"; + baseName = "hamcrest-parent"; + package = "/org/hamcrest"; + sha512 = "1da3ivp9n1h3hl35vhgd7avi4xh8p0802qj7xrk93gbz01s2av28p6ycdwiwp7kja0151wm5jvbgpnkxd8azqwkh7dh83w22k7jpwh3"; + type = "pom"; + }; + + maven_2_0_6 = fetchMaven { + version = "2.0.6"; + baseName = "maven"; + package = "/org/apache/maven"; + sha512 = "2k58pvcrdc52zsq6id4vl8a45srxllm2m49namqkzix4356haphk3i06px9jcc2cmkqw7bcpqh5xvvmkds5vhp2b9y9b0i2lcfgx8jw"; + type = "pom"; + }; + + maven_2_0_9 = fetchMaven { + version = "2.0.9"; + baseName = "maven"; + package = "/org/apache/maven"; + sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0"; + type = "pom"; + }; + + maven_3_0_3 = fetchMaven { + version = "3.0.3"; + baseName = "maven"; + package = "/org/apache/maven"; + sha512 = "397qqkh9qd2aj346v4nvxrhaqz6k75l5xnm1xcqd0d4mmxg0p7jlz54yzkshqli2w5df9f7p8pavpkiw5xkl8ipxmp87vfcanvkx4x4"; + type = "pom"; + }; + + mavenParent_5 = fetchMaven { + version = "5"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "1810h5ziij9awpf2c6sgqlwd93dd3c54rxbnjxar97idw2zkmwqfxvxi74qjcpbqqam3ypxb893k3958jmhbrzmwhwbkhxyyiqgjsx0"; + type = "pom"; + }; + + mavenParent_6 = fetchMaven { + version = "6"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "2z9rkv875yx64mpbf1mgyb3hcxqbhr0ndczwqlmkgd05a679d4vyi92fndaz1bcfwc5bmmxf4s6zrg58swv05j2j9d6vqd2b0x385dq"; + type = "pom"; + }; + + mavenParent_8 = fetchMaven { + version = "8"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp"; + type = "pom"; + }; + + mavenParent_15 = fetchMaven { + version = "15"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "390z5v0nygsw075fa5jzl5baxb0bripiiy6arqk550zlg8dw8mcg6cyscwnh3zw4gxyr1qbcy0v8wsj375xc65i2agkzg1qbv5z6xxp"; + type = "pom"; + }; + + mavenParent_21 = fetchMaven { + version = "21"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "2dph51qjkmh9sixd12rgxhrvl3w5r7nmr4n3ra4y1lifml6h0md0indj3qw4lxm0db811p3hxf2f9l0gf6w4q5ypjp20lk9ia2xm5s0"; + type = "pom"; + }; + + mavenParent_22 = fetchMaven { + version = "22"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "112xv5inpan05vkm12g2lpz37pgga1nm8rar2bqhibvwljg4yv1myx8z99g0nkd3gzbgw5098aagm006w6bnmwsibwd1js8is5d4r88"; + type = "pom"; + }; + + mavenParent_23 = fetchMaven { + version = "23"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "3c6ydqi3sf5aq3aj42kxgrjpcf8wpl0rf6hmr6vkas04w0h4dyvjb78ipyxsqzqgzjm6cmdfhxzx8hjb2lwvy3ipf1x39j6cj7dwdy8"; + type = "pom"; + }; + + mavenPlugins_22 = fetchMaven { + version = "22"; + baseName = "maven-plugins"; + package = "/org/apache/maven/plugins"; + sha512 = "14xy4s69dvqllkspc5b8q1gdbi0wn494ghwcdfcvjzvgczjhhxbr1h698amv3zmg59gb7liz77ws4vmcar8j9lazywcv13cy1myiywa"; + type = "pom"; + }; + + mavenPlugins_23 = fetchMaven { + version = "23"; + baseName = "maven-plugins"; + package = "/org/apache/maven/plugins"; + sha512 = "1vh7izahb4sskja66hqrygv1r8iwpl97kp65yx6z3fnm761brag89fdcl4jl9hypvm57alf283gvq9rsy5kqnqcdki20k5vw26y1b1a"; + type = "pom"; + }; + + mavenPlugins_24 = fetchMaven { + version = "24"; + baseName = "maven-plugins"; + package = "/org/apache/maven/plugins"; + sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs"; + type = "pom"; + }; + + mavenReporting_2_0_9 = fetchMaven { + version = "2.0.9"; + baseName = "maven-reporting"; + package = "/org/apache/maven/reporting"; + sha512 = "0cg49pq6rvk7c84xwnpq2p47b7y973sy9qfgzcq06bnrqm6cj26h8k7d9kpp3q3rd2hlw10db4sjfx0crlai27cbbz41i5m22lq21s5"; + type = "pom"; + }; + + mavenSharedComponents_17 = fetchMaven { + version = "17"; + baseName = "maven-shared-components"; + package = "/org/apache/maven/shared"; + sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy"; + type = "pom"; + }; + + mavenSharedComponents_19 = fetchMaven { + version = "19"; + baseName = "maven-shared-components"; + package = "/org/apache/maven/shared"; + sha512 = "1na6rh2mlwq6yrg7jxxnkcjj4ki0lqcihwiq2cy2ygsd6q0z8fn755frrd1j1jvd5dnh8jxjqp1m5mpwwv13hxhy8lmq95a5pp2a2qh"; + type = "pom"; + }; + + mojoParent_32 = fetchMaven { + version = "32"; + baseName = "mojo-parent"; + package = "/org/codehaus/mojo"; + sha512 = "15pzaqpdcr8c2w2b2ms3qc5d3r0flmzqav6h45nmg1l8nv7529lp6dkilhkwqag1i94vh8dvqnkxm475j9v2hxmz981azrvz7984z8w"; + type = "pom"; + }; + + plexus_1_0_4 = fetchMaven { + version = "1.0.4"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "22zsqss9aws73zvgqaz1brnvhk8bqn0flzd644nikprbb9dh1jyv1jig7xaxj942wq1w8h6ybx6b3v1ysfr8kw1z70sb5yrb4zd4kkm"; + type = "pom"; + }; + + plexus_2_0_2 = fetchMaven { + version = "2.0.2"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "095kxnh9238wlnxsbsl7wj3zsp2ijwx8p8bvbmsvj3iacw9fsvddv263j485zfjf4ipvp5dwqc3sc8mqkwbhx1qj7k1x1hj14nl6r8z"; + type = "pom"; + }; + + plexus_2_0_7 = fetchMaven { + version = "2.0.7"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "2ddbjp60y8g7n56hya5qa59f980a8sdj0d1dicv3na3pbc6k4wgdrix78lgg32sp4fzmxl7fyzw9gy3z2vpzf65zkj3c9yh030jcysr"; + type = "pom"; + }; + + plexusComponents_1_1_4 = fetchMaven { + version = "1.1.4"; + baseName = "plexus-components"; + package = "/org/codehaus/plexus"; + sha512 = "02kdl9z8nz26h4qf9mrdm8s1y2gy1f57n825yy0y3qifavlv51k2yxza7mjsdl1dwrq84c4qlj79iqlisnhrppfy0ncbbblnbir1yln"; + type = "pom"; + }; + + plexusContainers_1_0_3 = fetchMaven { + version = "1.0.3"; + baseName = "plexus-containers"; + package = "/org/codehaus/plexus"; + sha512 = "39sw2lxlrgbj1zlf67qz14j53sxd45p1qmna5cfizqikrwiqrnb6xwdxr2rsp3h2kadwwpz6id2ls6x3hr93znkad404rg4lg11v9nj"; + type = "pom"; + }; + + plexusContainers_1_5_5 = fetchMaven { + version = "1.5.5"; + baseName = "plexus-containers"; + package = "/org/codehaus/plexus"; + sha512 = "1dzg3ry73scisq02p1c96rn04rvdpyf9v6cbvvmy6hvcaw11y8mmjwjnlayljhr9za5hhq5bwv2vssmp683v3qjr5750f9aa62jxw0w"; + type = "pom"; + }; + + sonatypeForgeParent_5 = fetchMaven { + version = "5"; + baseName = "forge-parent"; + package = "/org/sonatype/forge"; + sha512 = "1l3nll0i5cpf2rh5f4gqriwy2737n9sccr605nx1swn1qafbxbvvs4jl7argdzz0mkzrr8sir7vnksm9a273vrdica9l35nxivm6vrx"; + type = "pom"; + }; + + sonatypeParent_7 = fetchMaven { + version = "7"; + baseName = "oss-parent"; + package = "/org/sonatype/oss"; + sha512 = "3xk0q7y2kdarr3l42dqjzq9qz1r840abqw9zhvl4gpc8jw5xcbqd781fp8z41i3hrkyaf740f2kppji9l77ci7f759d5s9yg4grbc33"; + type = "pom"; + }; + + sonatypeSpiceParent_16 = fetchMaven { + version = "16"; + baseName = "spice-parent"; + package = "/org/sonatype/spice"; + sha512 = "0awfi8vf4xc5c9510sas7xqlik4g8ljivay372cksvlcwlgyrgliikak0xxbxj72df5b9jzc9fzvjxd9rlllnnlnm4zllw5p2hakb0g"; + type = "pom"; + }; + + surefire_2_17 = fetchMaven { + version = "2.17"; + baseName = "surefire"; + package = "/org/apache/maven/surefire"; + sha512 = "3yraw37xwayyrvwa62y6li3wbzrha08j389psz16j1dawxmg78zlm2x1jmgz3nzdb60n9kk143606bgs3vrf7ri9d5pwkg9lvw7hk92"; + type = "pom"; + }; +} diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix new file mode 100644 index 00000000000..760dd01e732 --- /dev/null +++ b/pkgs/top-level/java-packages.nix @@ -0,0 +1,113 @@ +{ pkgs, stdenv, maven }: + +with pkgs; + +let + mavenbuild = callPackage ../development/java-modules/build-maven-package.nix { }; + fetchMaven = callPackage ../development/java-modules/m2install.nix { }; +in { + inherit mavenbuild fetchMaven; + + mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { }); + + inherit (callPackage ../development/java-modules/eclipse/aether-util.nix { inherit fetchMaven; }) + aetherUtil_0_9_0_M2; + + inherit (callPackage ../development/java-modules/beanshell/bsh.nix { inherit fetchMaven; }) + bsh_2_0_b4; + + inherit (callPackage ../development/java-modules/classworlds/classworlds.nix { inherit fetchMaven; }) + classworlds_1_1; + + inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; }) + commonsCli_1_0; + + inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; }) + commonsLang_2_3; + + inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; }) + hamcrestCore_1_3; + + inherit (callPackage ../development/java-modules/junit { inherit mavenbuild; }) + junit_4_12; + + inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; }) + mavenArtifact_2_0_9 + mavenArtifact_3_0_3; + + inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; }) + mavenArtifactManager_2_0_9; + + inherit (callPackage ../development/java-modules/maven/common-artifact-filters.nix { inherit fetchMaven; }) + mavenCommonArtifactFilters_1_4; + + inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; }) + mavenCore_2_0_9; + + inherit (callPackage ../development/java-modules/maven/dependency-tree.nix { inherit fetchMaven; }) + mavenDependencyTree_2_1; + + inherit (callPackage ../development/java-modules/maven/doxia-sink-api.nix { inherit fetchMaven; }) + mavenDoxiaSinkApi_1_0_alpha10; + + inherit (callPackage ../development/java-modules/maven/enforcer.nix { inherit fetchMaven; }) + mavenEnforcerApi_1_3_1 + mavenEnforcerRules_1_3_1; + + inherit (callPackage ../development/java-modules/maven/error-diagnostics.nix { inherit fetchMaven; }) + mavenErrorDiagnostics_2_0_9; + + inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; }) + mavenModel_2_0_9 + mavenModel_3_0_3; + + inherit (callPackage ../development/java-modules/maven/monitor.nix { inherit fetchMaven; }) + mavenMonitor_2_0_9; + + inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; }) + mavenPluginApi_2_0_6 + mavenPluginApi_2_0_9 + mavenPluginApi_3_0_3; + + inherit (callPackage ../development/java-modules/maven/plugin-descriptor.nix { inherit fetchMaven; }) + mavenPluginDescriptor_2_0_9; + + inherit (callPackage ../development/java-modules/maven/plugin-parameter-documenter.nix { inherit fetchMaven; }) + mavenPluginParameterDocumenter_2_0_9; + + inherit (callPackage ../development/java-modules/maven/plugin-registry.nix { inherit fetchMaven; }) + mavenPluginRegistry_2_0_9; + + inherit (callPackage ../development/java-modules/maven/profile.nix { inherit fetchMaven; }) + mavenProfile_2_0_9; + + inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; }) + mavenProject_2_0_9; + + inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; }) + mavenReportingApi_2_0_9; + + inherit (callPackage ../development/java-modules/maven/repository-metadata.nix { inherit fetchMaven; }) + mavenRepositoryMetadata_2_0_9; + + inherit (callPackage ../development/java-modules/maven/settings.nix { inherit fetchMaven; }) + mavenSettings_2_0_9; + + inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; }) + plexusComponentAnnotations_1_5_5; + + inherit (callPackage ../development/java-modules/plexus/container-default.nix { inherit fetchMaven; }) + plexusContainerDefault_1_0_alpha9_stable1; + + inherit (callPackage ../development/java-modules/plexus/i18n.nix { inherit fetchMaven; }) + plexusI18n_1_0_beta6; + + inherit (callPackage ../development/java-modules/plexus/interactivity-api.nix { inherit fetchMaven; }) + plexusInteractivityApi_1_0_alpha4; + + inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; }) + plexusUtils_1_1 + plexusUtils_1_5_8 + plexusUtils_2_0_6 + plexusUtils_3_0; +} From 38e762c6d1f145cf5a2eecec17f1db0c27ddc3a4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Oct 2016 09:38:28 -0400 Subject: [PATCH 003/274] Partial maven-hello --- .../java-modules/build-maven-package.nix | 4 +- .../java-modules/findbugs/jsr305.nix | 15 ++ .../java-modules/junit/default.nix | 15 +- .../java-modules/maven-hello/default.nix | 33 ++++ .../java-modules/maven/archiver.nix | 14 ++ .../java-modules/maven/artifact-manager.nix | 22 +++ .../java-modules/maven/artifact.nix | 11 ++ .../maven/common-artifact-filters.nix | 11 ++ pkgs/development/java-modules/maven/core.nix | 22 +++ .../java-modules/maven/doxia-sink-api.nix | 11 ++ .../java-modules/maven/error-diagnostics.nix | 22 +++ .../java-modules/maven/filtering.nix | 14 ++ pkgs/development/java-modules/maven/model.nix | 22 +++ .../java-modules/maven/monitor.nix | 22 +++ .../java-modules/maven/plugin-annotations.nix | 14 ++ .../java-modules/maven/plugin-api.nix | 11 ++ .../java-modules/maven/plugin-descriptor.nix | 22 +++ .../maven/plugin-parameter-documenter.nix | 22 +++ .../java-modules/maven/plugin-registry.nix | 22 +++ .../java-modules/maven/profile.nix | 22 +++ .../java-modules/maven/project.nix | 11 ++ .../java-modules/maven/reporting-api.nix | 11 ++ .../maven/repository-metadata.nix | 22 +++ .../java-modules/maven/settings.nix | 22 +++ .../java-modules/maven/shared-incremental.nix | 14 ++ .../java-modules/maven/shared-utils.nix | 14 ++ .../java-modules/maven/surefire-api.nix | 14 ++ .../java-modules/maven/surefire-booter.nix | 14 ++ .../java-modules/maven/surefire-common.nix | 14 ++ .../java-modules/maven/toolchain.nix | 25 +++ .../development/java-modules/mavenPlugins.nix | 141 ++++++++++++++- .../java-modules/plexus/build-api.nix | 14 ++ .../java-modules/plexus/compiler-api.nix | 14 ++ .../java-modules/plexus/interpolation.nix | 14 ++ .../development/java-modules/plexus/utils.nix | 22 +++ pkgs/development/java-modules/poms.nix | 160 ++++++++++++++++++ pkgs/top-level/java-packages.nix | 96 +++++++++-- 37 files changed, 956 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/java-modules/findbugs/jsr305.nix create mode 100644 pkgs/development/java-modules/maven-hello/default.nix create mode 100644 pkgs/development/java-modules/maven/archiver.nix create mode 100644 pkgs/development/java-modules/maven/filtering.nix create mode 100644 pkgs/development/java-modules/maven/plugin-annotations.nix create mode 100644 pkgs/development/java-modules/maven/shared-incremental.nix create mode 100644 pkgs/development/java-modules/maven/shared-utils.nix create mode 100644 pkgs/development/java-modules/maven/surefire-api.nix create mode 100644 pkgs/development/java-modules/maven/surefire-booter.nix create mode 100644 pkgs/development/java-modules/maven/surefire-common.nix create mode 100644 pkgs/development/java-modules/maven/toolchain.nix create mode 100644 pkgs/development/java-modules/plexus/build-api.nix create mode 100644 pkgs/development/java-modules/plexus/compiler-api.nix create mode 100644 pkgs/development/java-modules/plexus/interpolation.nix diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 182740c552d..499a48b2228 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,4 +1,4 @@ -{ stdenv, maven, lib }: +{ stdenv, maven, lib, pkgs }: { mavenDeps, src, name, meta, m2Path, ... }: with builtins; @@ -7,7 +7,7 @@ with lib; stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; - flatDeps = flatten mavenDeps; + flatDeps = unique (flatten (mavenDeps ++ pkgs.javaPackages.mavenPlugins.mavenMinimal)); propagatedBuildInput = [ maven ] ++ flatDeps; diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix new file mode 100644 index 00000000000..466ce247633 --- /dev/null +++ b/pkgs/development/java-modules/findbugs/jsr305.nix @@ -0,0 +1,15 @@ +{ fetchMaven }: + +rec { + findbugsJsr305_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "jsr305"; + package = "/com/google/code/findbugs"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "33flq50603n496c90981a0gsv30pgk6cnf859vdj6c8n4iq973prq847z5q8ld64j3rdmakxy9rsp49w7pddfd0v0i9n97rkr435f5k"; } + { type = "pom"; sha512 = "2iavm6d9nmy4g2i6y7q4l68bpjpncng1qfhbxdj44l3nqi7ixcjw0y38ymial7g2z0r1kd9qydr5lawjspr0fbzpjkcln2q7gsf0hfw"; } + ]; +} + diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 7325b07700f..ebb614bb703 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, mavenbuild }: +{ stdenv, pkgs, mavenbuild, fetchMaven }: with pkgs.javaPackages; @@ -25,8 +25,19 @@ rec { }; }; + junit_3_8_1 = map (obj: fetchMaven { + version = "3.8.1"; + baseName = "junit"; + package = "/junit"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "2b368057s8i61il387fqvznn70r9ndm815r681fn9i5afs1qgkw7i1d6vsn3pv2bbif1kmhb7qzcc574m3xcwc8a2mqw44b4bbxsfyl"; } + { type = "jar"; sha512 = "25yk0lzwk46r867nhrw4hg7cvz28wb8ln9nw1dqrb6zarifl54p4h1mcz90vmih405bsk96g0qb6hn1h4df0fas3f5kma9vxfjryvwf"; } + ]; + junit_4_12 = junitGen { - mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ] ++ mavenPlugins.mavenDefault; + mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ]; sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9"; version = "4.12"; }; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix new file mode 100644 index 00000000000..feb3146ffd6 --- /dev/null +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgs, mavenbuild }: + +with pkgs.javaPackages; + +rec { + mavenHelloRec = { mavenDeps, sha512, version }: mavenbuild rec { + inherit mavenDeps sha512 version; + + name = "maven-hello-${version}"; + src = pkgs.fetchFromGitHub { + inherit sha512; + owner = "NeQuissimus"; + repo = "maven-hello"; + rev = "v${version}"; + }; + m2Path = "/com/nequissimus/maven-hello/${version}"; + + meta = { + homepage = http://github.com/NeQuissimus/maven-hello/; + description = "Maven Hello World"; + license = stdenv.lib.licenses.unlicense; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; + [ nequissimus ]; + }; + }; + + mavenHello_1_0 = mavenHelloRec { + mavenDeps = []; + sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2"; + version = "1.0"; + }; +} diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix new file mode 100644 index 00000000000..790e7894bff --- /dev/null +++ b/pkgs/development/java-modules/maven/archiver.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenArchiver_2_5 = map (obj: fetchMaven { + version = "2.5"; + baseName = "maven-archiver"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3kkv5kf3k5in69aplawkr0cr2cviyjgf8k6r6qvgxk53i3jmh7qylzrwkrd9bxclkjkgyg77cffxm48qhxm9pyqncdbwjldsmmdfb4f"; } + { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix index b46fb254b17..7f0a9226e87 100644 --- a/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenArtifactManager_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-artifact-manager"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1alp2iahaaf39yd3xp8817sz93nhz53flkkv5dx87vybsizpykb1g7jn6bnx0cbqqr9k5pi27z8mbkmry05vwqc6jyic1pyvzy1y3vn"; } + { type = "pom"; sha512 = "3pvj8gpcg57akalj4574k4mzw2skgm0w69bdvh0ivyd8skgdrf5gwxf57hl5rbgsdpr82m2za7yvi63fw82k7v84sib904fs639r3pf"; } + ]; + mavenArtifactManager_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-artifact-manager"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; } { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; } ]; + + mavenArtifactManager_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-artifact-manager"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; } + { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; } + ]; } diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix index d0b528b916a..12876f53d5a 100644 --- a/pkgs/development/java-modules/maven/artifact.nix +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenArtifact_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-artifact"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3kkv5kf3k5in69aplawkr0cr2cviyjgf8k6r6qvgxk53i3jmh7qylzrwkrd9bxclkjkgyg77cffxm48qhxm9pyqncdbwjldsmmdfb4f"; } + { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; } + ]; + mavenArtifact_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-artifact"; diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix index 4d46de674b5..e0ee7e6a59e 100644 --- a/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven { + version = "1.3"; + baseName = "maven-common-artifact-filters"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "21wyk4llwjyanlggy281f9n0sjshjqvd322lbhxmzn42cd9vmj0s6xih82jwqlkcxkypwymyj1gl7van55ibd98p1jjjvr93gs1cn14"; } + { type = "jar"; sha512 = "1bv4lp1a8sb79almnygiq0pmm0fdhy9pyakp6xhz91b4v1cqg03sb586yc4lg2934yv4jjbybqjbh4l0y3kgnanjbxdxdgxgyf14iif"; } + ]; + mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven { version = "1.4"; baseName = "maven-common-artifact-filters"; diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix index 6aed7095ad2..7f186503d31 100644 --- a/pkgs/development/java-modules/maven/core.nix +++ b/pkgs/development/java-modules/maven/core.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenCore_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-core"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "2q4s5y8bpa73a10r4m9qgzfsczcap147p5gcc9inm5fx9x32sbr7zqw6xj7igsyjb9qsqpp3v727xv3ng57gczdqs1dazljqrgk9jal"; } + { type = "jar"; sha512 = "2ar2qvhig92gifm4zhd7mzcm0c7cnlyvd3d089a7chlvxhrxyhf08xxpd8sxa525sa413v2d762yx2mbhnkf564i1zw4gg7cdjl5z47"; } + ]; + mavenCore_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-core"; @@ -11,4 +22,15 @@ rec { { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; } { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; } ]; + + mavenCore_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-core"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; } + { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; } + ]; } diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix index 6acf39b480d..7454f7bbc96 100644 --- a/pkgs/development/java-modules/maven/doxia-sink-api.nix +++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven { + version = "1.0-alpha-7"; + baseName = "doxia-sink-api"; + package = "/org/apache/maven/doxia"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "3lb710zyldqysy19cgsan6mb5yrxx07vphddasq4kv1z9p5l4mpx9jq8fdhcxm4bgrfpdxkrdy2z4h2w8kc3gp2dk5g515x854jhqar"; } + { type = "jar"; sha512 = "0q2vn7yyl8qvsifb629jh3hmaa5pkj5y22zy7qbji1xmn28qp0n1skfvlmpn0m8djwzmayw6xjbxhxvspzc9a14n3nkmjzmr5yz053a"; } + ]; + mavenDoxiaSinkApi_1_0_alpha10 = map (obj: fetchMaven { version = "1.0-alpha-10"; baseName = "doxia-sink-api"; diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix index 22ac264bdd1..c8993f1f0c9 100644 --- a/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-error-diagnostics"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2rpzlgi1hyiq1qmfn9fdr3317mq990y67zb0jvyah7sgr5x969l984cfigwdcw0m7i4kpg5157myq4cps3d9pz81h4wx4plwwpkyp2v"; } + { type = "pom"; sha512 = "3r8r5sw3zbyms1yk1811cxh2a6p86lhg8aa9b6whn97mx3gmy9zy2nhsadgnxw1hbc2y6l1pk3xs2q73hmvag1bapks5bm7higmgdpg"; } + ]; + mavenErrorDiagnostics_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-error-diagnostics"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; } { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; } ]; + + mavenErrorDiagnostics_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-error-diagnostics"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; } + { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; } + ]; } diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix new file mode 100644 index 00000000000..5851a3db195 --- /dev/null +++ b/pkgs/development/java-modules/maven/filtering.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenFiltering_1_1 = map (obj: fetchMaven { + version = "1.1"; + baseName = "maven-filtering"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "022n451vgprms5rp26iynlg7yn7p1l71d5sd5r177dmw0250pvrr5gvjrriq8fis2rxbdhr42zl1xm2mmzlg6sj55izzy03dwryhydn"; } + { type = "jar"; sha512 = "33ing5r916n71skj75cikhrapns28l6ryxw9q3yn5hyqzsbj2yk7lzss87ardg9j3wkmb4rpj9mkb63w0fljwjfpbja6qmzxrybj5rp"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix index fa3abf7c4d2..34832c371d5 100644 --- a/pkgs/development/java-modules/maven/model.nix +++ b/pkgs/development/java-modules/maven/model.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenModel_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-model"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0v4fzp4p71zjdxbf0lwjifydrxh9ag2c6pqc4n07hnr2rvcsx8n1rhb46ifaq6ycxps64fjnwkn29i5wlfqy9yfdh8gjs6i2sy523nv"; } + { type = "pom"; sha512 = "1r5bk36120534ngqkh8rbxi0q0allkaqy6yxvs6s5vwjq0gvm12snp6y6vxvh5p4bljpfms7r4ljglgnnfdrl8l8vmrj0af201gnv3m"; } + ]; + mavenModel_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-model"; @@ -12,6 +23,17 @@ rec { { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; } ]; + mavenModel_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-model"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "14pxgdcim20x9lisf510nazzlcjxv9fpqabkdn0d86qa7d9270m4fmya5crasx2np9h0gxl407d77vcjf99fdxizg7i32w35yljqp3z"; } + { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; } + ]; + mavenModel_3_0_3 = map (obj: fetchMaven { version = "3.0.3"; baseName = "maven-model"; diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix index 1304304257a..f127efba210 100644 --- a/pkgs/development/java-modules/maven/monitor.nix +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenMonitor_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-monitor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3ssw8r9qdhbvi21y8lqz39aml2l9pzw4g26hvlh3rbshvhhgsm672jl1pv8z5pbs73w7px6dnz1yhcf7l5df53apfzq0fggrw9fsnhz"; } + { type = "pom"; sha512 = "2wdvc5r3bsrml3w6nbym9flyj3ryj308bbfmns156p9pincc73pppad5cgyv4wrwjnmwp6qfbjsz90k6481v4li88a78nmc8lhmhylr"; } + ]; + mavenMonitor_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-monitor"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; } { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; } ]; + + mavenMonitor_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-monitor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; } + { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; } + ]; } diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix new file mode 100644 index 00000000000..da7d52242a3 --- /dev/null +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenPluginAnnotations = map (obj: fetchMaven { + version = "3.1"; + baseName = "maven-plugin-annotations"; + package = "/org/apache/maven/plugin-tools"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "17zyw3j4zbg1hhj18i4q1f0r8gdxl3q9x5ksyqlyr0mrw2sadc6lvbbhyp3l7vsbddl4bgdx36gwvjp5d97gbmk1nbpi1vabadfhq76"; } + { type = "jar"; sha512 = "0rk2nzkwcrkfy3vs0zl0l2lxp3w4hkwxrypisbivv5al7sc8lbzls6jgpp3h5gx9kk4scjj24qf5vyimnbadj63rvqffg581fs2zgl9"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix index 56069bf1970..ed791a86955 100644 --- a/pkgs/development/java-modules/maven/plugin-api.nix +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -23,6 +23,17 @@ rec { { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; } ]; + mavenPluginApi_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-plugin-api"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "23qj23k049jz4mp77h2wj4mnjqszb99l4xvxas93cpnbdl51a5s0d0rsg60a8zg0ic04n6fr8nig0vvmmcsggx93a96w4p3na97q30n"; } + { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; } + ]; + mavenPluginApi_3_0_3 = map (obj: fetchMaven { version = "3.0.3"; baseName = "maven-plugin-api"; diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix index 35b829a8578..397a7610cfe 100644 --- a/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-plugin-descriptor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0f23srb1clkmvq05rcmv8gn7lifaw5f1i2vqyn2cfnhgcmp9i32xsbhqpx9y0rqlv6497x80dck7xylp22d3hnqkpm3pxgws9wsz7sm"; } + { type = "pom"; sha512 = "10hra81gs8swq00k4rw3ip8wr9gl4d7vd3621ga4298b466wic7sbb9fy9ifw22q49ia7hkigqi4ha73q7kmrl7ihnb9iv4vil02yj6"; } + ]; + mavenPluginDescriptor_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-plugin-descriptor"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; } { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; } ]; + + mavenPluginDescriptor_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-plugin-descriptor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; } + { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; } + ]; } diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index 17ed70bfa9f..3fd437441a3 100644 --- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-plugin-parameter-documenter"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "11yxhw6pn6np1a828ww6iq4gcg6i6l6wlr6pwx3kd0fh4cavd93rfh2khvydfsz0cw40m1kbqglnwdqbdc9d5akhwpnvhkfwsqvl8li"; } + { type = "pom"; sha512 = "0g62n2g7jcknzgnpl46fsdn9yndjv09fwijahlnmc1gh9w2v0rxyq42p133vgv13jc5wzfqyrf7mh3fq7p0w9mfbharaz92flh2caik"; } + ]; + mavenPluginParameterDocumenter_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-plugin-parameter-documenter"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; } { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; } ]; + + mavenPluginParameterDocumenter_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-plugin-parameter-documenter"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; } + { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; } + ]; } diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix index baccc1aeb76..7191a377a33 100644 --- a/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenPluginRegistry_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-plugin-registry"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1d9134rarw653dgn1q80dahjpkl82sfrznkhdb6s8zy6d31bbr4ry6w362r7a2p54ijx2vw3rl0jmh805p3imlf1cgra1m7pihh2b63"; } + { type = "pom"; sha512 = "0b85gmdgwwxdw4czs7383ivssp5n8nxr5vxnj8agjlx6yclxpbbw7n192c4p1hba8as1md52c08cxilibjiiahlv83bmzyh2hb0vdm3"; } + ]; + mavenPluginRegistry_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-plugin-registry"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; } { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; } ]; + + mavenPluginRegistry_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-plugin-registry"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; } + { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; } + ]; } diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix index 674f35a2ef9..bcaae06b1f9 100644 --- a/pkgs/development/java-modules/maven/profile.nix +++ b/pkgs/development/java-modules/maven/profile.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenProfile_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-profile"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3wng0csnn4v3y2gndazg46hqriz27kkb977xzw5wr8anyharlz2ancl38zyfjf5vm18irqn8cxqklhzd3x1h0h6rlvz5z1wrrivr5kl"; } + { type = "pom"; sha512 = "063vbh2miyfvrp90hs5cff5r8cj573zysjvd79lnz7zsah3ddbg6sbv09nb0pjy76pbqgrh913dziqk12l13kwngcgpq8v38v92vh63"; } + ]; + mavenProfile_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-profile"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; } { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; } ]; + + mavenProfile_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-profile"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; } + { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; } + ]; } diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index 0d88850fb5d..142a311feed 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenProject_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-project"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "12k56956ad8r5fpz5ilxy1i2msg4vnpcyqc7zq9b5ncqx890bcnl9xl5f5y0bkj6l6688z6vrwi28rgj35a77x3wiwcvhgrgxyfy53a"; } + { type = "pom"; sha512 = "13z607rjazzrs3rjw6hlhpw6jip85lgdkvnkm1j17wsbhywa53x45ydyg1hzrcax8xr5zxn7mkrryp4wwwm4ihhsaz3nq8bh12yrh8p"; } + ]; + mavenProject_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-project"; diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix index ea808848911..36818dc57e0 100644 --- a/pkgs/development/java-modules/maven/reporting-api.nix +++ b/pkgs/development/java-modules/maven/reporting-api.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenReportingApi_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-reporting-api"; + package = "/org/apache/maven/reporting"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "236xqa5bqih3lkfwdmfsb4wgkn8mllnzpnr4dhzch2jlhcsvl4fm1zmawk1njd8ibq9dyfg3n41a6hc8ydndh0ffxdm1mjnch9bv1da"; } + { type = "pom"; sha512 = "3vlfls0g1bjrjpgzv6zlfglr1gxwm9m6zm88m9ij8ap934cxrzqj7pkqyx0s2vc8j700xgrwj57ahmfdrdi4v1arav1m1790plbip3y"; } + ]; + mavenReportingApi_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-reporting-api"; diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix index 125788c54f9..7e29ada0512 100644 --- a/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-repository-metadata"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3qh52jisq2facab5nw35pazf99z1yn8pfklvy8hcczd4dab1pj115jimfhpx48mmlaydaw50m006imfvlivxnadfxfk3887acmhp7bv"; } + { type = "pom"; sha512 = "2sg2n3wxfanhf4jgmp2q9lh2hsnch54mzgh1clna2ywnnwh88cn37c9m9b6a0qgdc1m7yzlfg8r3k77ypfa3aa7hr3f9b2hi2k4pb0c"; } + ]; + mavenRepositoryMetadata_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-repository-metadata"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; } { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; } ]; + + mavenRepositoryMetadata_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-repository-metadata"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; } + { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; } + ]; } diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix index 73d707144bd..19f0a1ae24d 100644 --- a/pkgs/development/java-modules/maven/settings.nix +++ b/pkgs/development/java-modules/maven/settings.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenSettings_2_0_6 = map (obj: fetchMaven { + version = "2.0.6"; + baseName = "maven-settings"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3yvxlk0d40p1i0vwf4ba6k45kikcvip1vvr86k6cnhs86gfy6w1b4kw4hc6p23i978cgcl19g79m0l40nsxpav9hc07573k47ammclv"; } + { type = "pom"; sha512 = "03cz2z90h9c3lssl53glbpz9hflsgb3a14i4xr5p7lpm993c07zn7xp2f6sjcdq7b774spbiww0alll9cz2vs8m7pvvwnbxk0s09d7l"; } + ]; + mavenSettings_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-settings"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; } { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; } ]; + + mavenSettings_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-settings"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; } + { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; } + ]; } diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix new file mode 100644 index 00000000000..2d4ec372be4 --- /dev/null +++ b/pkgs/development/java-modules/maven/shared-incremental.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenSharedIncremental_1_1 = map (obj: fetchMaven { + version = "1.1"; + baseName = "maven-shared-incremental"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1g2gsk3s5v5dg6y81a2046aqf5v19jn6i0jwha78xi3gyx7ajgxkdn2wswf9gdxxvc44qk6lzn33bl3pk3vl1b84h2hdxz7yyhajbfr"; } + { type = "pom"; sha512 = "2fqj1p1059v462casy2mzj1bg8mawb5lihx5430px9440vyl1iggqg598r6798162m8c7ilav3x71x763rchhskpqakfkvydkjhrjfr"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix new file mode 100644 index 00000000000..9b56075383d --- /dev/null +++ b/pkgs/development/java-modules/maven/shared-utils.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenSharedUtils_0_1 = map (obj: fetchMaven { + version = "0.1"; + baseName = "maven-shared-utils"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; } + { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix new file mode 100644 index 00000000000..b696beae4c4 --- /dev/null +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { + version = "2.12.4"; + baseName = "maven-surefire-booter"; + package = "/org/apache/maven/surefire"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; } + { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix new file mode 100644 index 00000000000..b696beae4c4 --- /dev/null +++ b/pkgs/development/java-modules/maven/surefire-booter.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { + version = "2.12.4"; + baseName = "maven-surefire-booter"; + package = "/org/apache/maven/surefire"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; } + { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix new file mode 100644 index 00000000000..0d1bd53721c --- /dev/null +++ b/pkgs/development/java-modules/maven/surefire-common.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenSurefireCommon_2_12_4 = map (obj: fetchMaven { + version = "2.12.4"; + baseName = "maven-surefire-common"; + package = "/org/apache/maven/surefire"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; } + { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix new file mode 100644 index 00000000000..14e6866ee32 --- /dev/null +++ b/pkgs/development/java-modules/maven/toolchain.nix @@ -0,0 +1,25 @@ +{ fetchMaven }: + +rec { + mavenToolchain_1_0 = map (obj: fetchMaven { + version = "1.0"; + baseName = "maven-toolchain"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "34kxv3l3676ddrsj2k02f9fmphcq16avafka950d5dclrcx7w37wgxx3gcf6zfixfx9zlbb7annsa05y8f0rx97g13rkqdfdj1wknky"; } + { type = "pom"; sha512 = "0arkdm0bii7cm0g8qzzfih1jk9j7myn8w2ccr6j01wsj08gv7cbjr5k9jx1iwy1vzvhhsmsj6grq678zsgbvh4msn1s44i744x4fhvy"; } + ]; + + mavenToolchain_2_0_9 = map (obj: fetchMaven { + version = "2.0.9"; + baseName = "maven-toolchain"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "34kxv3l3676ddrsj2k02f9fmphcq16avafka950d5dclrcx7w37wgxx3gcf6zfixfx9zlbb7annsa05y8f0rx97g13rkqdfdj1wknky"; } + { type = "pom"; sha512 = "0arkdm0bii7cm0g8qzzfih1jk9j7myn8w2ccr6j01wsj08gv7cbjr5k9jx1iwy1vzvhhsmsj6grq678zsgbvh4msn1s44i744x4fhvy"; } + ]; +} diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index 17d4c86ba99..15be1594117 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -9,8 +9,134 @@ let in rec { inherit mavenbuild fetchMaven poms; - # Standard plugins used by pretty much every Maven build - mavenDefault = lib.flatten [ aetherUtil_0_9_0_M2 bsh_2_0_b4 classworlds_1_1 commonsCli_1_0 commonsLang_2_3 mavenArtifact_2_0_9 mavenArtifact_3_0_3 mavenArtifactManager_2_0_9 mavenClean_2_5 mavenCommonArtifactFilters_1_4 mavenCompiler_3_1 mavenCore_2_0_9 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcer_1_3_1 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_9 mavenInstall_2_4 mavenJar_2_4 mavenModel_2_0_9 mavenModel_3_0_3 mavenMonitor_2_0_9 mavenPluginApi_2_0_6 mavenPluginApi_2_0_9 mavenPluginApi_3_0_3 mavenPluginDescriptor_2_0_9 mavenPluginParameterDocumenter_2_0_9 mavenPluginRegistry_2_0_9 mavenProfile_2_0_9 mavenProject_2_0_9 mavenReplacer_1_5_3 mavenReportingApi_2_0_9 mavenRepositoryMetadata_2_0_9 mavenResources_2_6 mavenSettings_2_0_9 mavenSurefire_2_17 plexusComponentAnnotations_1_5_5 plexusContainerDefault_1_0_alpha9_stable1 plexusI18n_1_0_beta6 plexusInteractivityApi_1_0_alpha4 plexusUtils_1_5_8 plexusUtils_2_0_6 plexusUtils_3_0 ] ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 apache_10 apache_11 apache_13 apache_3 apache_4 apache_6 beanshell_2_0_b4 codehausParent_4 doxia_1_0_alpha10 doxia_1_0 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_6 maven_2_0_9 maven_3_0_3 mavenParent_15 mavenParent_21 mavenParent_22 mavenParent_23 mavenParent_5 mavenParent_6 mavenParent_8 mavenPlugins_22 mavenPlugins_23 mavenPlugins_24 mavenReporting_2_0_9 mavenSharedComponents_17 mavenSharedComponents_19 mojoParent_32 plexus_1_0_4 plexus_2_0_2 plexus_2_0_7 plexusComponents_1_1_4 plexusContainers_1_0_3 plexusContainers_1_5_5 sonatypeForgeParent_5 sonatypeParent_7 sonatypeSpiceParent_16 surefire_2_17 ]); + # "Minimal" + mavenMinimal = lib.flatten +[ +classworlds_1_1 +commonsCli_1_0 +findbugsJsr305_2_0_1 +junit_3_8_1 +mavenArchiver_2_5 +mavenArtifact_2_0_6 +mavenArtifact_2_0_9 +mavenArtifactManager_2_0_6 +mavenArtifactManager_2_0_9 +mavenArtifactManager_2_2_1 +mavenClean_2_5 +mavenCompiler_3_1 +mavenCore_2_0_6 +mavenCore_2_0_9 +mavenCore_2_2_1 +mavenDoxiaSinkApi_1_0_alpha7 +mavenErrorDiagnostics_2_0_6 +mavenErrorDiagnostics_2_0_9 +mavenErrorDiagnostics_2_2_1 +mavenFiltering_1_1 +mavenInstall_2_4 +mavenJar_2_4 +mavenModel_2_0_6 +mavenModel_2_0_9 +mavenModel_2_2_1 +mavenMonitor_2_0_6 +mavenMonitor_2_0_9 +mavenMonitor_2_2_1 +mavenPluginDescriptor_2_0_6 +mavenPluginDescriptor_2_0_9 +mavenPluginDescriptor_2_2_1 +mavenPluginParameterDocumenter_2_0_6 +mavenPluginParameterDocumenter_2_0_9 +mavenPluginParameterDocumenter_2_2_1 +mavenProfile_2_0_6 +mavenProfile_2_0_9 +mavenProfile_2_2_1 +mavenProject_2_0_6 +mavenProject_2_0_9 +mavenPluginAnnotations_3_1 +mavenPluginApi_2_0_6 +mavenPluginApi_2_0_9 +mavenPluginApi_2_2_1 +mavenPluginRegistry_2_0_6 +mavenPluginRegistry_2_0_9 +mavenPluginRegistry_2_2_1 +mavenReportingApi_2_0_6 +mavenReportingApi_2_0_9 +mavenRepositoryMetadata_2_0_6 +mavenRepositoryMetadata_2_0_9 +mavenRepositoryMetadata_2_2_1 +mavenResources_2_6 +mavenSettings_2_0_6 +mavenSettings_2_0_9 +mavenSettings_2_2_1 +mavenSharedIncremental_1_1 +mavenSharedUtils_0_1 +mavenSurefire_2_12_4 +mavenSurefireApi_2_12_4 +mavenSurefireBooter_2_12_4 +mavenSurefireCommon_2_12_4 +mavenToolchain_1_0 +mavenToolchain_2_0_9 +plexusBuildApi_0_0_4 +plexusCompilerApi_2_2 +plexusContainerDefault_1_0_alpha9_stable1 +plexusInteractivityApi_1_0_alpha4 +plexusInterpolation_1_13 +plexusUtils_1_5_1 +plexusUtils_2_0_5 +plexusUtils_3_0 +] +++ +(with +poms; +[ +apache_3 +apache_4 +apache_5 +apache_6 +apache_9 +apache_10 +apache_11 +apache_13 +doxia_1_0_alpha7 +maven_2_0_6 +maven_2_0_9 +maven_2_2_1 +mavenParent_5 +mavenParent_8 +mavenParent_11 +mavenParent_13 +mavenParent_21 +mavenParent_22 +mavenParent_23 +mavenPlugins_22 +mavenPlugins_23 +mavenPlugins_24 +mavenPluginTools_3_1 +mavenReporting_2_0_6 +mavenReporting_2_0_9 +mavenSharedComponents_12 +mavenSharedComponents_17 +mavenSharedComponents_18 +mavenSharedComponents_19 +plexus_1_0_4 +plexus_1_0_11 +plexus_2_0_3 +plexus_2_0_6 +plexus_2_0_7 +plexus_3_3_1 +plexusCompiler_2_2 +plexusComponents_1_1_15 +plexusComponents_1_3_1 +plexusComponentAnnotations_1_5_5 +plexusContainers_1_0_3 +plexusContainers_1_5_5 +sonatypeForgeParent_3 +sonatypeForgeParent_5 +sonatypeForgeParent_10 +sonatypeSpiceParent_10 +sonatypeSpiceParent_16 +sonatypeSpiceParent_17 +surefire_2_12_4 +]); animalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; @@ -100,6 +226,17 @@ in rec { { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; } ]; + mavenSurefire_2_12_4 = map (obj: fetchMaven rec { + version = "2.12.4"; + baseName = "maven-surefire-plugin"; + package = "/org/apache/maven/plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "3qkzmh5fk3s7y3qy91qck1nc0yadwsizxy61wp410dspsd73cchqll7vjl11cj6k5kywjxsl9dihy2gp949nh8380lbvs11g83wrgmv"; } + { type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; } + ]; + mavenSurefire_2_17 = map (obj: fetchMaven rec { version = "2.17"; baseName = "maven-surefire-plugin"; diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix new file mode 100644 index 00000000000..2425a6f12ba --- /dev/null +++ b/pkgs/development/java-modules/plexus/build-api.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusBuildApi_0_0_4 = map (obj: fetchMaven { + version = "0.0.4"; + baseName = "plexus-build-api"; + package = "/org/sonatype/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0ihr946rd2cwc1qsi8g104vpyz1ml5ypl3374z3rhlmm4i0xgn6vsa9sg8bnh1848klhxsp11i0gm4adg6lzk3s88mqm5b4wlbsdvv2"; } + { type = "pom"; sha512 = "1135ca387fvzjb04j8z93jmy61zpi2w7a6c6rq9xxk33xz9nxzzwvca7k40j6jsj0bmjbswrpdck7qh2921rn3j4vfsihbi9g7mb31r"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix new file mode 100644 index 00000000000..2ef5d3cdab1 --- /dev/null +++ b/pkgs/development/java-modules/plexus/compiler-api.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusCompilerApi_2_2 = map (obj: fetchMaven { + version = "2.2"; + baseName = "plexus-compiler-api"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3by7icjfiymp7g2v1ci5dqwml6ibzh2njyg2w43kvaz3ydcxkzmfg5s97wsdqjsii7vdgqyhr16ydsn6mr90wbjvsi6wasaq1rqa812"; } + { type = "pom"; sha512 = "0pdl78hp921lgkfya54wl8hxgm1c5474j1p921q5ix1knx1rlr4klpjwx212wy2m7b6bxq0bkf8n66mqjr72rh2rh308qij00ymrga8"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix new file mode 100644 index 00000000000..17660f0804c --- /dev/null +++ b/pkgs/development/java-modules/plexus/interpolation.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusInterpolation_1_13 = map (obj: fetchMaven { + version = "1.13"; + baseName = "plexus-interpolation"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0sm1kaxsvn8007br7nr9ncjppmfkp8nzr6ipwwx86idai9bqcsm4kh2scxf893s4jf2ii7f5106dd5w4h7bw67csalhqqzi1zpndbk4"; } + { type = "pom"; sha512 = "3hlv9l82yxjbnaf2vqq6p3w38jq2id15a2yjg6wj810fl2286zz5ci3g3x7x0z0xdrxrrfvswns92v25197vpg0dki113lwdbw4bsvr"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index 672a43455c9..17dc1acdf1f 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -12,6 +12,17 @@ rec { { type = "pom"; sha512 = "0vbzdfsdcc4cq7hdqzb1vdfxp23vnavq7z4qmmlb4d4fiqj5wqdgagrs43gl7yzca2azpyj3kyxgaipimi7gck07jcsz0pzljkplk4w"; } ]; + plexusUtils_1_5_1 = map (obj: fetchMaven { + version = "1.5.1"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "00vf59sg0wa4kip1m365xh3ngggvnr7avkf1mwsljyag5h8pb4fhpba550ka2mbpp10z8d7mjhj3wxinvf19m2bmrjmqvdxiwraa5jh"; } + { type = "pom"; sha512 = "161cdrgjrw2cab4lf189hwa4s1lh42fsahjcjkir696sx0m9bmmxgjbhwxl1l8kpaxn5p6jf701bx16gry393pws636vy59nvnnx1sw"; } + ]; + plexusUtils_1_5_8 = map (obj: fetchMaven { version = "1.5.8"; baseName = "plexus-utils"; @@ -23,6 +34,17 @@ rec { { type = "pom"; sha512 = "06z4gkq3bh2pwyj8pvaly9fihd8gbgcqp3jxl05vkj2rcdb4jw3lw3hwn8f8ggqi17i2fdm8cbndkqgr9vdgiz45p8f1nx8kjlqikbi"; } ]; + plexusUtils_2_0_5 = map (obj: fetchMaven { + version = "2.0.5"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3g72mxvlsf18hl1vn9sq4i13nlpd66fkn2l8d96883f4n638sx031f8cnx6f08my3rfc67pypy4lsiagx2rj2x5ccqp9g9kzvbh4i5w"; } + { type = "pom"; sha512 = "2rkkshqf3ahjijvr64ndzh10iksbz7pj0618drvg9iklnpv6i6y904fi31xjg7vxb3fy17k3mvi49pr2jxznbf1c8ndwbyawlvmw9j7"; } + ]; + plexusUtils_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "plexus-utils"; diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 39dc9528140..3e5ef87223f 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -33,6 +33,14 @@ rec { type = "pom"; }; + apache_5 = fetchMaven { + version = "5"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6"; + type = "pom"; + }; + apache_6 = fetchMaven { version = "6"; baseName = "apache"; @@ -41,6 +49,14 @@ rec { type = "pom"; }; + apache_9 = fetchMaven { + version = "9"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6"; + type = "pom"; + }; + apache_10 = fetchMaven { version = "10"; baseName = "apache"; @@ -81,6 +97,14 @@ rec { type = "pom"; }; + doxia_1_0_alpha7 = fetchMaven { + version = "1.0-alpha-7"; + baseName = "doxia"; + package = "/org/apache/maven/doxia"; + sha512 = "0fg3l7dyi0c7r1h9rzjn23gv57kc67jpzlcji6yh4nawp3byfbz1rq8wnbj3av3wd29v9h2ff34p06ia9wxbs8q3kz4xy31w7sw7fxg"; + type = "pom"; + }; + doxia_1_0_alpha10 = fetchMaven { version = "1.0-alpha-10"; baseName = "doxia"; @@ -129,6 +153,14 @@ rec { type = "pom"; }; + maven_2_2_1 = fetchMaven { + version = "2.2.1"; + baseName = "maven"; + package = "/org/apache/maven"; + sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0"; + type = "pom"; + }; + maven_3_0_3 = fetchMaven { version = "3.0.3"; baseName = "maven"; @@ -217,6 +249,22 @@ rec { type = "pom"; }; + mavenPluginTools_3_1 = fetchMaven { + version = "3.1"; + baseName = "maven-plugin-tools"; + package = "/org/apache/maven/plugin-tools"; + sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs"; + type = "pom"; + }; + + mavenReporting_2_0_6 = fetchMaven { + version = "2.0.6"; + baseName = "maven-reporting"; + package = "/org/apache/maven/reporting"; + sha512 = "3bi678sg28yxhlby4d3a6mq9fhg1qnjb57kbkhi7dfx9g0c1p6cxhg8cixjz9wv31lkjpspbpp1fq0z29a93lqrjqczlg8a7i1sg554"; + type = "pom"; + }; + mavenReporting_2_0_9 = fetchMaven { version = "2.0.9"; baseName = "maven-reporting"; @@ -225,6 +273,14 @@ rec { type = "pom"; }; + mavenSharedComponents_12 = fetchMaven { + version = "12"; + baseName = "maven-shared-components"; + package = "/org/apache/maven/shared"; + sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy"; + type = "pom"; + }; + mavenSharedComponents_17 = fetchMaven { version = "17"; baseName = "maven-shared-components"; @@ -233,6 +289,14 @@ rec { type = "pom"; }; + mavenSharedComponents_18 = fetchMaven { + version = "18"; + baseName = "maven-shared-components"; + package = "/org/apache/maven/shared"; + sha512 = "2qqabrvgs4kb14v28qkfwj16n715mj5mh4m8aw0dybi5igmrvwh1d8jsjggdfbh929m6499w8x5s6aw0gbzmfzr3wjkz54dqxnm49p0"; + type = "pom"; + }; + mavenSharedComponents_19 = fetchMaven { version = "19"; baseName = "maven-shared-components"; @@ -257,6 +321,14 @@ rec { type = "pom"; }; + plexus_1_0_11 = fetchMaven { + version = "1.0.11"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "20fb1yvg26wg3lih55m8m4i1idiffyg3jlkvazmxqqvnahz2llgd5cfvqcrzg8lkinnypr4ic5glci4lza46k1sfl5nrviyfx0n7kgr"; + type = "pom"; + }; + plexus_2_0_2 = fetchMaven { version = "2.0.2"; baseName = "plexus"; @@ -265,6 +337,22 @@ rec { type = "pom"; }; + plexus_2_0_3 = fetchMaven { + version = "2.0.3"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "15adqpm0gz7c0jwjd4yk0k8h4h7vnz15v1fdmzb6rgs6avl1dx84r5l0fqs6b02kw008rg68inii7nl4m5xwqrj807wr8qzrjm02cam"; + type = "pom"; + }; + + plexus_2_0_6 = fetchMaven { + version = "2.0.6"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "07rrw1yldy4c2qvwv3hcf9rdbr0jf57qsnnv2ai9fajwhjyjkgjixm2zlsid41bm2w8hacg9crzy6nfz8yh1sdh5p767niy9jripq2h"; + type = "pom"; + }; + plexus_2_0_7 = fetchMaven { version = "2.0.7"; baseName = "plexus"; @@ -273,6 +361,22 @@ rec { type = "pom"; }; + plexus_3_3_1 = fetchMaven { + version = "3.3.1"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "1q1p0sfzkhdpknaf0ysq7vzd0qip9q86z62nwamfh9gdsp7lh99kh6hmxav2daha462c3jra6clfniyqrbvs07jwjhf4c79rwhnqc2q"; + type = "pom"; + }; + + plexusCompiler_2_2 = fetchMaven { + version = "2.2"; + baseName = "plexus-compiler"; + package = "/org/codehaus/plexus"; + sha512 = "26sr1hg214qf65nym85viv1z4nk1bgqahx7n4bq3did49s9ymgz2c08vw7zdlcqws5jndz9n2xlyq285plgv3xx2mxrrsi2r24zmw29"; + type = "pom"; + }; + plexusComponents_1_1_4 = fetchMaven { version = "1.1.4"; baseName = "plexus-components"; @@ -281,6 +385,22 @@ rec { type = "pom"; }; + plexusComponents_1_1_15 = fetchMaven { + version = "1.1.15"; + baseName = "plexus-components"; + package = "/org/codehaus/plexus"; + sha512 = "0lfzdq1wlsnkiapzjs8cqi2kzkaw9lfjhdhmf1pz2x83m5njfx2y59v14wgcs2k4cig8kjr45v4qnmd7mp03k8gginzflc1qi1y7yv6"; + type = "pom"; + }; + + plexusComponents_1_3_1 = fetchMaven { + version = "1.3.1"; + baseName = "plexus-components"; + package = "/org/codehaus/plexus"; + sha512 = "16bnfja035zb508f340y64v4vk7pkldn8bvnxvbk0grk8a76rirsn4dl60x3hgmasgkb0y75gr9qp4y72m079klhgg0mbvcfvslkxqb"; + type = "pom"; + }; + plexusContainers_1_0_3 = fetchMaven { version = "1.0.3"; baseName = "plexus-containers"; @@ -297,6 +417,14 @@ rec { type = "pom"; }; + sonatypeForgeParent_3 = fetchMaven { + version = "3"; + baseName = "forge-parent"; + package = "/org/sonatype/forge"; + sha512 = "20x89zl6k0wgd1gb6ysxm6bmgqxwyz3d7zyjn8bwzkz93k7lxnxm0k7skvha283q9ay4cd2vkjisi5avl1f3wvz89rrwg136gmdlksv"; + type = "pom"; + }; + sonatypeForgeParent_5 = fetchMaven { version = "5"; baseName = "forge-parent"; @@ -305,6 +433,14 @@ rec { type = "pom"; }; + sonatypeForgeParent_10 = fetchMaven { + version = "10"; + baseName = "forge-parent"; + package = "/org/sonatype/forge"; + sha512 = "3fpnvrxfkxpxqdsn6g7w1zyql4v0z9iqbjprhh4c6rldrbvq4h3yh7dl5sw4h7av516zhmb3bkc9ycfdr5gs34sfb6f6x5hk7qc374a"; + type = "pom"; + }; + sonatypeParent_7 = fetchMaven { version = "7"; baseName = "oss-parent"; @@ -313,6 +449,14 @@ rec { type = "pom"; }; + sonatypeSpiceParent_10 = fetchMaven { + version = "10"; + baseName = "spice-parent"; + package = "/org/sonatype/spice"; + sha512 = "0gg2cxqvfmg6jk7qi2f4hcgskpd1ysnf1d5vay8dza40wfbk2vy7qvhgjhg55dpbjkadmsj483hg81qdzwqbxmagd2xr9j9062hbja8"; + type = "pom"; + }; + sonatypeSpiceParent_16 = fetchMaven { version = "16"; baseName = "spice-parent"; @@ -321,6 +465,22 @@ rec { type = "pom"; }; + sonatypeSpiceParent_17 = fetchMaven { + version = "17"; + baseName = "spice-parent"; + package = "/org/sonatype/spice"; + sha512 = "1jqqp5xylm9bjz33wab7mj49xqczvkhpp4aysrcngszxmil61kanpjmn5ks5r0hq4waj0bqnr91p2p9a7ylqnqjs6ib1x9psl5c9cyw"; + type = "pom"; + }; + + surefire_2_12_4 = fetchMaven { + version = "2.12.4"; + baseName = "surefire"; + package = "/org/apache/maven/surefire"; + sha512 = "1zyppjqqwpzcp16g7v49r9fsgdvrny325r583kpis5497ic0qbcczxn53x7s1hnmhgcs33dr0k3alrwl7m574lm2qdgj0s8x18pl6gb"; + type = "pom"; + }; + surefire_2_17 = fetchMaven { version = "2.17"; baseName = "surefire"; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 760dd01e732..a777d57ec2c 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -25,29 +25,43 @@ in { inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; }) commonsLang_2_3; + inherit (callPackage ../development/java-modules/findbugs/jsr305.nix { inherit fetchMaven; }) + findbugsJsr305_2_0_1; + inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; }) hamcrestCore_1_3; - inherit (callPackage ../development/java-modules/junit { inherit mavenbuild; }) + inherit (callPackage ../development/java-modules/junit { inherit mavenbuild fetchMaven; }) + junit_3_8_1 junit_4_12; + inherit (callPackage ../development/java-modules/maven/archiver.nix { inherit fetchMaven; }) + mavenArchiver_2_5; + inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; }) + mavenArtifact_2_0_6 mavenArtifact_2_0_9 mavenArtifact_3_0_3; inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; }) - mavenArtifactManager_2_0_9; + mavenArtifactManager_2_0_6 + mavenArtifactManager_2_0_9 + mavenArtifactManager_2_2_1; inherit (callPackage ../development/java-modules/maven/common-artifact-filters.nix { inherit fetchMaven; }) + mavenCommonArtifactFilters_1_3 mavenCommonArtifactFilters_1_4; inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; }) - mavenCore_2_0_9; + mavenCore_2_0_6 + mavenCore_2_0_9 + mavenCore_2_2_1; inherit (callPackage ../development/java-modules/maven/dependency-tree.nix { inherit fetchMaven; }) mavenDependencyTree_2_1; inherit (callPackage ../development/java-modules/maven/doxia-sink-api.nix { inherit fetchMaven; }) + mavenDoxiaSinkApi_1_0_alpha7 mavenDoxiaSinkApi_1_0_alpha10; inherit (callPackage ../development/java-modules/maven/enforcer.nix { inherit fetchMaven; }) @@ -55,43 +69,98 @@ in { mavenEnforcerRules_1_3_1; inherit (callPackage ../development/java-modules/maven/error-diagnostics.nix { inherit fetchMaven; }) - mavenErrorDiagnostics_2_0_9; + mavenErrorDiagnostics_2_0_6 + mavenErrorDiagnostics_2_0_9 + mavenErrorDiagnostics_2_2_1; + + inherit (callPackage ../development/java-modules/maven/filtering.nix { inherit fetchMaven; }) + mavenFiltering_1_1; + + inherit (callPackage ../development/java-modules/maven-hello { inherit mavenbuild; }) + mavenHello_1_0; inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; }) + mavenModel_2_0_6 mavenModel_2_0_9 + mavenModel_2_2_1 mavenModel_3_0_3; inherit (callPackage ../development/java-modules/maven/monitor.nix { inherit fetchMaven; }) - mavenMonitor_2_0_9; + mavenMonitor_2_0_6 + mavenMonitor_2_0_9 + mavenMonitor_2_2_1; + + inherit (callPackage ../development/java-modules/maven/plugin-annotations.nix { inherit fetchMaven; }) + mavenPluginAnnotations_3_1; inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; }) mavenPluginApi_2_0_6 mavenPluginApi_2_0_9 + mavenPluginApi_2_2_1 mavenPluginApi_3_0_3; inherit (callPackage ../development/java-modules/maven/plugin-descriptor.nix { inherit fetchMaven; }) - mavenPluginDescriptor_2_0_9; + mavenPluginDescriptor_2_0_6 + mavenPluginDescriptor_2_0_9 + mavenPluginDescriptor_2_2_1; inherit (callPackage ../development/java-modules/maven/plugin-parameter-documenter.nix { inherit fetchMaven; }) - mavenPluginParameterDocumenter_2_0_9; + mavenPluginParameterDocumenter_2_0_6 + mavenPluginParameterDocumenter_2_0_9 + mavenPluginParameterDocumenter_2_2_1; inherit (callPackage ../development/java-modules/maven/plugin-registry.nix { inherit fetchMaven; }) - mavenPluginRegistry_2_0_9; + mavenPluginRegistry_2_0_6 + mavenPluginRegistry_2_0_9 + mavenPluginRegistry_2_2_1; inherit (callPackage ../development/java-modules/maven/profile.nix { inherit fetchMaven; }) - mavenProfile_2_0_9; + mavenProfile_2_0_6 + mavenProfile_2_0_9 + mavenProfile_2_2_1; inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; }) + mavenProject_2_0_6 mavenProject_2_0_9; inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; }) + mavenReportingApi_2_0_6 mavenReportingApi_2_0_9; inherit (callPackage ../development/java-modules/maven/repository-metadata.nix { inherit fetchMaven; }) - mavenRepositoryMetadata_2_0_9; + mavenRepositoryMetadata_2_0_6 + mavenRepositoryMetadata_2_0_9 + mavenRepositoryMetadata_2_2_1; inherit (callPackage ../development/java-modules/maven/settings.nix { inherit fetchMaven; }) - mavenSettings_2_0_9; + mavenSettings_2_0_6 + mavenSettings_2_0_9 + mavenSettings_2_2_1; + + inherit (callPackage ../development/java-modules/maven/shared-incremental.nix { inherit fetchMaven; }) + mavenSharedIncremental_1_1; + + inherit (callPackage ../development/java-modules/maven/shared-utils.nix { inherit fetchMaven; }) + mavenSharedUtils_0_1; + + inherit (callPackage ../development/java-modules/maven/surefire-api.nix { inherit fetchMaven; }) + mavenSurefireApi_2_12_4; + + inherit (callPackage ../development/java-modules/maven/surefire-booter.nix { inherit fetchMaven; }) + mavenSurefireBooter_2_12_4; + + inherit (callPackage ../development/java-modules/maven/surefire-common.nix { inherit fetchMaven; }) + mavenSurefireCommon_2_12_4; + + inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; }) + mavenToolchain_1_0 + mavenToolchain_2_0_9; + + inherit (callPackage ../development/java-modules/plexus/build-api.nix { inherit fetchMaven; }) + plexusBuildApi_0_0_4; + + inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; }) + plexusCompilerApi_2_2; inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; }) plexusComponentAnnotations_1_5_5; @@ -105,9 +174,14 @@ in { inherit (callPackage ../development/java-modules/plexus/interactivity-api.nix { inherit fetchMaven; }) plexusInteractivityApi_1_0_alpha4; + inherit (callPackage ../development/java-modules/plexus/interpolation.nix { inherit fetchMaven; }) + plexusInterpolation_1_13; + inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; }) plexusUtils_1_1 + plexusUtils_1_5_1 plexusUtils_1_5_8 + plexusUtils_2_0_5 plexusUtils_2_0_6 plexusUtils_3_0; } From f23c44516cfa19fe19cf9764b47d9a520a73853a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Oct 2016 10:23:22 -0400 Subject: [PATCH 004/274] Fixup --- .../java-modules/build-maven-package.nix | 6 +- .../java-modules/maven-minimal.nix | 138 ++++++++++++++++++ .../java-modules/maven/plugin-annotations.nix | 2 +- .../java-modules/maven/surefire-api.nix | 4 +- .../development/java-modules/mavenPlugins.nix | 136 +---------------- pkgs/development/java-modules/poms.nix | 16 ++ 6 files changed, 164 insertions(+), 138 deletions(-) create mode 100644 pkgs/development/java-modules/maven-minimal.nix diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 499a48b2228..9449e3e17b1 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -4,10 +4,12 @@ with builtins; with lib; -stdenv.mkDerivation rec { +let + mavenMinimal = import ./maven-minimal.nix { inherit pkgs lib stdenv maven; }; +in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; - flatDeps = unique (flatten (mavenDeps ++ pkgs.javaPackages.mavenPlugins.mavenMinimal)); + flatDeps = unique (flatten (mavenDeps ++ mavenMinimal.mavenMinimal)); propagatedBuildInput = [ maven ] ++ flatDeps; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix new file mode 100644 index 00000000000..e97a97b69ea --- /dev/null +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -0,0 +1,138 @@ +{ stdenv, pkgs, lib, maven }: + +with pkgs.javaPackages; + +let + fetchMaven = pkgs.callPackage ./m2install.nix { }; + poms = import ./poms.nix { inherit fetchMaven; }; + plugins = import ./mavenPlugins.nix { inherit stdenv lib pkgs maven; }; +in rec { +# "Minimal" + mavenMinimal = lib.flatten + (with plugins; [ + classworlds_1_1 + commonsCli_1_0 + findbugsJsr305_2_0_1 + junit_3_8_1 + mavenArchiver_2_5 + mavenArtifact_2_0_6 + mavenArtifact_2_0_9 + mavenArtifactManager_2_0_6 + mavenArtifactManager_2_0_9 + mavenArtifactManager_2_2_1 + mavenClean_2_5 + mavenCompiler_3_1 + mavenCore_2_0_6 + mavenCore_2_0_9 + mavenCore_2_2_1 + mavenDoxiaSinkApi_1_0_alpha7 + mavenErrorDiagnostics_2_0_6 + mavenErrorDiagnostics_2_0_9 + mavenErrorDiagnostics_2_2_1 + mavenFiltering_1_1 + mavenInstall_2_4 + mavenJar_2_4 + mavenModel_2_0_6 + mavenModel_2_0_9 + mavenModel_2_2_1 + mavenMonitor_2_0_6 + mavenMonitor_2_0_9 + mavenMonitor_2_2_1 + mavenPluginDescriptor_2_0_6 + mavenPluginDescriptor_2_0_9 + mavenPluginDescriptor_2_2_1 + mavenPluginParameterDocumenter_2_0_6 + mavenPluginParameterDocumenter_2_0_9 + mavenPluginParameterDocumenter_2_2_1 + mavenProfile_2_0_6 + mavenProfile_2_0_9 + mavenProfile_2_2_1 + mavenProject_2_0_6 + mavenProject_2_0_9 + mavenPluginAnnotations_3_1 + mavenPluginApi_2_0_6 + mavenPluginApi_2_0_9 + mavenPluginApi_2_2_1 + mavenPluginRegistry_2_0_6 + mavenPluginRegistry_2_0_9 + mavenPluginRegistry_2_2_1 + mavenReportingApi_2_0_6 + mavenReportingApi_2_0_9 + mavenRepositoryMetadata_2_0_6 + mavenRepositoryMetadata_2_0_9 + mavenRepositoryMetadata_2_2_1 + mavenResources_2_6 + mavenSettings_2_0_6 + mavenSettings_2_0_9 + mavenSettings_2_2_1 + mavenSharedIncremental_1_1 + mavenSharedUtils_0_1 + mavenSurefire_2_12_4 + mavenSurefireApi_2_12_4 + mavenSurefireBooter_2_12_4 + mavenSurefireCommon_2_12_4 + mavenToolchain_1_0 + mavenToolchain_2_0_9 + plexusBuildApi_0_0_4 + plexusCompilerApi_2_2 + plexusContainerDefault_1_0_alpha9_stable1 + plexusInteractivityApi_1_0_alpha4 + plexusInterpolation_1_13 + plexusUtils_1_5_1 + plexusUtils_2_0_5 + plexusUtils_3_0 + ]) + ++ + (with + poms; + [ + apache_3 + apache_4 + apache_5 + apache_6 + apache_9 + apache_10 + apache_11 + apache_13 + doxia_1_0_alpha7 + maven_2_0_6 + maven_2_0_9 + maven_2_2_1 + mavenParent_5 + mavenParent_8 + mavenParent_11 + mavenParent_13 + mavenParent_21 + mavenParent_22 + mavenParent_23 + mavenPlugins_22 + mavenPlugins_23 + mavenPlugins_24 + mavenPluginTools_3_1 + mavenReporting_2_0_6 + mavenReporting_2_0_9 + mavenSharedComponents_12 + mavenSharedComponents_17 + mavenSharedComponents_18 + mavenSharedComponents_19 + plexus_1_0_4 + plexus_1_0_11 + plexus_2_0_3 + plexus_2_0_6 + plexus_2_0_7 + plexus_3_3_1 + plexusCompiler_2_2 + plexusComponents_1_1_15 + plexusComponents_1_3_1 + plexusComponentAnnotations_1_5_5 + plexusContainers_1_0_3 + plexusContainers_1_5_5 + sonatypeForgeParent_3 + sonatypeForgeParent_5 + sonatypeForgeParent_10 + sonatypeSpiceParent_10 + sonatypeSpiceParent_16 + sonatypeSpiceParent_17 + surefire_2_12_4 + ]); +} diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix index da7d52242a3..c00d0a4f9a2 100644 --- a/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -1,7 +1,7 @@ { fetchMaven }: rec { - mavenPluginAnnotations = map (obj: fetchMaven { + mavenPluginAnnotations_3_1 = map (obj: fetchMaven { version = "3.1"; baseName = "maven-plugin-annotations"; package = "/org/apache/maven/plugin-tools"; diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix index b696beae4c4..550490a32b1 100644 --- a/pkgs/development/java-modules/maven/surefire-api.nix +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -1,9 +1,9 @@ { fetchMaven }: rec { - mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { + mavenSurefireApi_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; - baseName = "maven-surefire-booter"; + baseName = "maven-surefire-api"; package = "/org/apache/maven/surefire"; sha512 = obj.sha512; type = obj.type; diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index 15be1594117..7c564037108 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -1,142 +1,12 @@ -{ pkgs, stdenv, lib, maven, fetchurl }: +{ pkgs, stdenv, lib, maven }: +with pkgs; with pkgs.javaPackages; let - mavenbuild = pkgs.callPackage ./build-maven-package.nix { }; fetchMaven = pkgs.callPackage ./m2install.nix { }; - poms = import ./poms.nix { inherit fetchMaven; }; in rec { - inherit mavenbuild fetchMaven poms; - - # "Minimal" - mavenMinimal = lib.flatten -[ -classworlds_1_1 -commonsCli_1_0 -findbugsJsr305_2_0_1 -junit_3_8_1 -mavenArchiver_2_5 -mavenArtifact_2_0_6 -mavenArtifact_2_0_9 -mavenArtifactManager_2_0_6 -mavenArtifactManager_2_0_9 -mavenArtifactManager_2_2_1 -mavenClean_2_5 -mavenCompiler_3_1 -mavenCore_2_0_6 -mavenCore_2_0_9 -mavenCore_2_2_1 -mavenDoxiaSinkApi_1_0_alpha7 -mavenErrorDiagnostics_2_0_6 -mavenErrorDiagnostics_2_0_9 -mavenErrorDiagnostics_2_2_1 -mavenFiltering_1_1 -mavenInstall_2_4 -mavenJar_2_4 -mavenModel_2_0_6 -mavenModel_2_0_9 -mavenModel_2_2_1 -mavenMonitor_2_0_6 -mavenMonitor_2_0_9 -mavenMonitor_2_2_1 -mavenPluginDescriptor_2_0_6 -mavenPluginDescriptor_2_0_9 -mavenPluginDescriptor_2_2_1 -mavenPluginParameterDocumenter_2_0_6 -mavenPluginParameterDocumenter_2_0_9 -mavenPluginParameterDocumenter_2_2_1 -mavenProfile_2_0_6 -mavenProfile_2_0_9 -mavenProfile_2_2_1 -mavenProject_2_0_6 -mavenProject_2_0_9 -mavenPluginAnnotations_3_1 -mavenPluginApi_2_0_6 -mavenPluginApi_2_0_9 -mavenPluginApi_2_2_1 -mavenPluginRegistry_2_0_6 -mavenPluginRegistry_2_0_9 -mavenPluginRegistry_2_2_1 -mavenReportingApi_2_0_6 -mavenReportingApi_2_0_9 -mavenRepositoryMetadata_2_0_6 -mavenRepositoryMetadata_2_0_9 -mavenRepositoryMetadata_2_2_1 -mavenResources_2_6 -mavenSettings_2_0_6 -mavenSettings_2_0_9 -mavenSettings_2_2_1 -mavenSharedIncremental_1_1 -mavenSharedUtils_0_1 -mavenSurefire_2_12_4 -mavenSurefireApi_2_12_4 -mavenSurefireBooter_2_12_4 -mavenSurefireCommon_2_12_4 -mavenToolchain_1_0 -mavenToolchain_2_0_9 -plexusBuildApi_0_0_4 -plexusCompilerApi_2_2 -plexusContainerDefault_1_0_alpha9_stable1 -plexusInteractivityApi_1_0_alpha4 -plexusInterpolation_1_13 -plexusUtils_1_5_1 -plexusUtils_2_0_5 -plexusUtils_3_0 -] -++ -(with -poms; -[ -apache_3 -apache_4 -apache_5 -apache_6 -apache_9 -apache_10 -apache_11 -apache_13 -doxia_1_0_alpha7 -maven_2_0_6 -maven_2_0_9 -maven_2_2_1 -mavenParent_5 -mavenParent_8 -mavenParent_11 -mavenParent_13 -mavenParent_21 -mavenParent_22 -mavenParent_23 -mavenPlugins_22 -mavenPlugins_23 -mavenPlugins_24 -mavenPluginTools_3_1 -mavenReporting_2_0_6 -mavenReporting_2_0_9 -mavenSharedComponents_12 -mavenSharedComponents_17 -mavenSharedComponents_18 -mavenSharedComponents_19 -plexus_1_0_4 -plexus_1_0_11 -plexus_2_0_3 -plexus_2_0_6 -plexus_2_0_7 -plexus_3_3_1 -plexusCompiler_2_2 -plexusComponents_1_1_15 -plexusComponents_1_3_1 -plexusComponentAnnotations_1_5_5 -plexusContainers_1_0_3 -plexusContainers_1_5_5 -sonatypeForgeParent_3 -sonatypeForgeParent_5 -sonatypeForgeParent_10 -sonatypeSpiceParent_10 -sonatypeSpiceParent_16 -sonatypeSpiceParent_17 -surefire_2_12_4 -]); + inherit fetchMaven; animalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 3e5ef87223f..18944e27a86 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -193,6 +193,22 @@ rec { type = "pom"; }; + mavenParent_11 = fetchMaven { + version = "11"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp"; + type = "pom"; + }; + + mavenParent_13 = fetchMaven { + version = "13"; + baseName = "maven-parent"; + package = "/org/apache/maven"; + sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp"; + type = "pom"; + }; + mavenParent_15 = fetchMaven { version = "15"; baseName = "maven-parent"; From 8500c2491110031e5582b014691a57b27bc6722a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Oct 2016 13:10:26 -0400 Subject: [PATCH 005/274] Finish maven-hello / framework --- .../java-modules/apache/commons-lang.nix | 11 + .../java-modules/apache/commons-lang3.nix | 14 + .../apache/commons-logging-api.nix | 14 + .../java-modules/apache/xbean-reflect.nix | 14 + .../java-modules/build-maven-package.nix | 10 +- .../java-modules/classworlds/classworlds.nix | 11 + .../java-modules/google/collections.nix | 15 + .../java-modules/hamcrest/core.nix | 1 - .../java-modules/junit/default.nix | 11 + .../java-modules/log4j/default.nix | 15 + .../java-modules/maven-minimal.nix | 305 ++++++++++-------- .../java-modules/maven/archiver.nix | 4 +- .../java-modules/maven/artifact-manager.nix | 4 +- .../java-modules/maven/artifact.nix | 11 + .../maven/common-artifact-filters.nix | 4 +- pkgs/development/java-modules/maven/core.nix | 4 +- .../java-modules/maven/error-diagnostics.nix | 4 +- pkgs/development/java-modules/maven/model.nix | 4 +- .../java-modules/maven/monitor.nix | 4 +- .../java-modules/maven/plugin-annotations.nix | 4 +- .../java-modules/maven/plugin-api.nix | 4 +- .../java-modules/maven/plugin-descriptor.nix | 4 +- .../maven/plugin-parameter-documenter.nix | 4 +- .../java-modules/maven/plugin-registry.nix | 4 +- .../java-modules/maven/profile.nix | 4 +- .../java-modules/maven/project.nix | 11 + .../maven/repository-metadata.nix | 4 +- .../java-modules/maven/settings.nix | 4 +- .../java-modules/maven/surefire-api.nix | 6 +- .../java-modules/maven/surefire-booter.nix | 6 +- .../java-modules/maven/surefire-common.nix | 4 +- .../java-modules/maven/toolchain.nix | 4 +- .../development/java-modules/mavenPlugins.nix | 2 +- .../java-modules/plexus/archiver.nix | 14 + .../java-modules/plexus/classworlds.nix | 14 + .../java-modules/plexus/compiler-javac.nix | 14 + .../java-modules/plexus/compiler-manager.nix | 14 + .../java-modules/plexus/container-default.nix | 22 ++ .../java-modules/plexus/digest.nix | 14 + .../java-modules/plexus/interpolation.nix | 33 ++ pkgs/development/java-modules/plexus/io.nix | 14 + .../development/java-modules/plexus/utils.nix | 77 +++++ pkgs/development/java-modules/poms.nix | 174 +++++++++- pkgs/top-level/java-packages.nix | 58 +++- 44 files changed, 789 insertions(+), 184 deletions(-) create mode 100644 pkgs/development/java-modules/apache/commons-lang3.nix create mode 100644 pkgs/development/java-modules/apache/commons-logging-api.nix create mode 100644 pkgs/development/java-modules/apache/xbean-reflect.nix create mode 100644 pkgs/development/java-modules/google/collections.nix create mode 100644 pkgs/development/java-modules/log4j/default.nix create mode 100644 pkgs/development/java-modules/plexus/archiver.nix create mode 100644 pkgs/development/java-modules/plexus/classworlds.nix create mode 100644 pkgs/development/java-modules/plexus/compiler-javac.nix create mode 100644 pkgs/development/java-modules/plexus/compiler-manager.nix create mode 100644 pkgs/development/java-modules/plexus/digest.nix create mode 100644 pkgs/development/java-modules/plexus/io.nix diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix index eb60d19e818..8987823e470 100644 --- a/pkgs/development/java-modules/apache/commons-lang.nix +++ b/pkgs/development/java-modules/apache/commons-lang.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + commonsLang_2_1 = map (obj: fetchMaven { + version = "2.1"; + baseName = "commons-lang"; + package = "/commons-lang"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1hr3q67cn0nk5kn9vdfs8155cw814jf20jk7dsn3cn0a6l2j6dx297z6akz5f62dkkn0nj4pac7z4wvnawisnvzhpg6q6qhwj7wwc8n"; } + { type = "jar"; sha512 = "2phbi7q2k3v48gyys7s0yw8xaa9kpczwif5jfqgfarzf7il1r0vplpwgwcnlsxpifjjnap7lw0yq38zp0mbajp7h8p5z0qp7gisa4m3"; } + ]; + commonsLang_2_3 = map (obj: fetchMaven { version = "2.3"; baseName = "commons-lang"; diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix new file mode 100644 index 00000000000..8b5498f362d --- /dev/null +++ b/pkgs/development/java-modules/apache/commons-lang3.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + commonsLang3_3_1 = map (obj: fetchMaven { + version = "3.1"; + baseName = "commons-lang3"; + package = "/org/apache/commons"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "0msypmqn5q4sxks97zbvi85rq2zclkyz8j09riqw7c95n96nyv7x3pysi83vdgc53d0lhl4apkp7warl52xq1qzdyjxipjdlhqmhdcw"; } + { type = "jar"; sha512 = "3lw2naanwxjqrwgbg5ij6abzlkch0l6bcx44sl4a59m2r5fi2rvmc07pqai2l9kqwql05fyx9h1md5jjh2wzia15rqnvwssprykjwvi"; } + ]; +} diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix new file mode 100644 index 00000000000..9aae04e4206 --- /dev/null +++ b/pkgs/development/java-modules/apache/commons-logging-api.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + commonsLoggingApi_1_1 = map (obj: fetchMaven { + version = "1.1"; + baseName = "commons-logging-api"; + package = "/commons-logging"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "3fp3d08l6m1xmma6pz7hvkvj5isbnyjimgvxf4plrwqmalifw0ywjbal5r5kmmrdlcda7l49mxdsv43ygglm9g22dzkbhdqlhlrn934"; } + { type = "jar"; sha512 = "316dgnyhwai9n8dqjkp9chkkbhkyli9mfbgsj8ch6cdpmzmcvzirnjj7z1xbxm7v8hlybqhyaf5075pxwz3cg1w5ih3rhwjfi19f8dq"; } + ]; +} diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix new file mode 100644 index 00000000000..c1e9916443c --- /dev/null +++ b/pkgs/development/java-modules/apache/xbean-reflect.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + xbeanReflect_3_4 = map (obj: fetchMaven { + version = "3.4"; + baseName = "xbean-reflect"; + package = "/org/apache/xbean"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1nny6dcwif0kd0kr2l55j2l5rb1aw8l2f2fbhanj6j48zhcz3vv1wx5xi0l6vg4j70y12fxyg1kyn4lq0bx19by19r73k06wlxs001k"; } + { type = "jar"; sha512 = "3w22jbm4sii16lzkzwi6hv5zbid5jw8dv356q9hr0pnb8d4gm6ypl2pjqj0brzmpq9pydqya14wk798ddjalqjh25rl2ry9qhjx3hlm"; } + ]; +} diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 9449e3e17b1..a056953f9ab 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,11 +1,11 @@ -{ stdenv, maven, lib, pkgs }: +{ stdenv, maven, pkgs }: { mavenDeps, src, name, meta, m2Path, ... }: with builtins; -with lib; +with stdenv.lib; let - mavenMinimal = import ./maven-minimal.nix { inherit pkgs lib stdenv maven; }; + mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv maven; }; in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; @@ -16,7 +16,10 @@ in stdenv.mkDerivation rec { find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; copy = ''cp -rs ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2''; + phases = [ "unpackPhase" "buildPhase" ]; + buildPhase = '' + mkdir -p $out/target mkdir -p $out/m2/${m2Path} ${optionalString (length flatDeps > 0) find} ${optionalString (length flatDeps > 0) copy} @@ -24,5 +27,6 @@ in stdenv.mkDerivation rec { tmpm2file://$out/m2*\ $out/m2" >> $out/m2/settings.xml ${maven}/bin/mvn clean install -Dmaven.test.skip=true -gs $out/m2/settings.xml + cp -v ./target/*.jar $out/target/ ''; } diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix index a177927d3d6..3a85cc4363e 100644 --- a/pkgs/development/java-modules/classworlds/classworlds.nix +++ b/pkgs/development/java-modules/classworlds/classworlds.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + classworlds_1_1_alpha2 = map (obj: fetchMaven { + version = "1.1-alpha-2"; + baseName = "classworlds"; + package = "/classworlds"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "027b0s13ck41wg75z7bz1zxazdxp56llxlg4z9kp01wys1sbkng8s0i0mxyvjaq61q5lg2gfrxypnzg7vha23vq57hkdhwyksjdcd5c"; } + { type = "jar"; sha512 = "36vir8jja85cg7khaf2qjln7m8q5iq0n43vvkxkwwngv67ffpvqqz6j1fscvl16hzb0nf6j9gzkcrgk3mk9jl49vrj3fw7c173m4xzb"; } + ]; + classworlds_1_1 = map (obj: fetchMaven { version = "1.1"; baseName = "classworlds"; diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix new file mode 100644 index 00000000000..9898ddeaf31 --- /dev/null +++ b/pkgs/development/java-modules/google/collections.nix @@ -0,0 +1,15 @@ +{ fetchMaven }: + +rec { + googleCollections_1_0 = map (obj: fetchMaven { + version = "1.0"; + baseName = "google-collections"; + package = "/com/google/collections"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3vvgac799ilrmab28ya894jkyq3jj4217ix8mfyxzbkb8v0wy2rpmdbni3irrrdhc9skd0sldlcnfpvs1hjv5v07ajxlm1dbkgvqhap"; } + { type = "pom"; sha512 = "38x885cglwmx0chqlzhx83jcrqvnwwr9qj6awx3n0xqp175qznjwn0i94rwxhyj00a7xgvvm9jvwkppwfkcdiyxmimb1z8frdhkkh7p"; } + ]; +} + diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix index 1414dc1fe6b..104331f6f13 100644 --- a/pkgs/development/java-modules/hamcrest/core.nix +++ b/pkgs/development/java-modules/hamcrest/core.nix @@ -1,7 +1,6 @@ { fetchMaven }: rec { - # Ant build, just fetch the binary hamcrestCore_1_3 = map (obj: fetchMaven { version = "1.3"; baseName = "hamcrest-core"; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index ebb614bb703..8304b1a8a01 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -36,6 +36,17 @@ rec { { type = "jar"; sha512 = "25yk0lzwk46r867nhrw4hg7cvz28wb8ln9nw1dqrb6zarifl54p4h1mcz90vmih405bsk96g0qb6hn1h4df0fas3f5kma9vxfjryvwf"; } ]; + junit_3_8_2 = map (obj: fetchMaven { + version = "3.8.2"; + baseName = "junit"; + package = "/junit"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "01npyfwl1f44l44x92cvqqcp58sckcjraf78dav6zgag3x6ispd9gz594nhpqckmjw0hlrkbqfxnzdcq1mlsj9rw6zyq4wk5ch8rl5j"; } + { type = "jar"; sha512 = "2jcih102666lcm7b23rgs5cd59ww49m78c8mja52mrcm25630zw28rjqkj5lsws18k5jf75div9wkd1sxcvwvq5cvvphgyg7550i8r9"; } + ]; + junit_4_12 = junitGen { mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ]; sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9"; diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix new file mode 100644 index 00000000000..65aaa41adb1 --- /dev/null +++ b/pkgs/development/java-modules/log4j/default.nix @@ -0,0 +1,15 @@ +{ fetchMaven }: + +rec { + log4j_1_2_12 = map (obj: fetchMaven { + version = "1.2.12"; + baseName = "log4j"; + package = "/log4j"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "23amz03i51w4vhh2wfq4fppi5qp2rzy0gqz4fdaqg4s3mz0aj86jylp7akj7aprnm28q2y1v4sj0s64qqvakj1vj020hr9y8rrifdga"; } + { type = "pom"; sha512 = "0n5w0ywp90lllnyyxhaa7py1gapdw85jnnyyk86rm46k132q1lq6j7rh1mvzw1z01lh7bzb800r0rmgcc1mgn3fjgr9hxlr4ssm7gbx"; } + ]; +} + diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index e97a97b69ea..359060c8dae 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -1,138 +1,187 @@ -{ stdenv, pkgs, lib, maven }: +{ stdenv, pkgs, maven }: +with stdenv.lib; with pkgs.javaPackages; let fetchMaven = pkgs.callPackage ./m2install.nix { }; poms = import ./poms.nix { inherit fetchMaven; }; - plugins = import ./mavenPlugins.nix { inherit stdenv lib pkgs maven; }; + plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; }; in rec { -# "Minimal" - mavenMinimal = lib.flatten - (with plugins; [ - classworlds_1_1 - commonsCli_1_0 - findbugsJsr305_2_0_1 - junit_3_8_1 - mavenArchiver_2_5 - mavenArtifact_2_0_6 - mavenArtifact_2_0_9 - mavenArtifactManager_2_0_6 - mavenArtifactManager_2_0_9 - mavenArtifactManager_2_2_1 - mavenClean_2_5 - mavenCompiler_3_1 - mavenCore_2_0_6 - mavenCore_2_0_9 - mavenCore_2_2_1 - mavenDoxiaSinkApi_1_0_alpha7 - mavenErrorDiagnostics_2_0_6 - mavenErrorDiagnostics_2_0_9 - mavenErrorDiagnostics_2_2_1 - mavenFiltering_1_1 - mavenInstall_2_4 - mavenJar_2_4 - mavenModel_2_0_6 - mavenModel_2_0_9 - mavenModel_2_2_1 - mavenMonitor_2_0_6 - mavenMonitor_2_0_9 - mavenMonitor_2_2_1 - mavenPluginDescriptor_2_0_6 - mavenPluginDescriptor_2_0_9 - mavenPluginDescriptor_2_2_1 - mavenPluginParameterDocumenter_2_0_6 - mavenPluginParameterDocumenter_2_0_9 - mavenPluginParameterDocumenter_2_2_1 - mavenProfile_2_0_6 - mavenProfile_2_0_9 - mavenProfile_2_2_1 - mavenProject_2_0_6 - mavenProject_2_0_9 - mavenPluginAnnotations_3_1 - mavenPluginApi_2_0_6 - mavenPluginApi_2_0_9 - mavenPluginApi_2_2_1 - mavenPluginRegistry_2_0_6 - mavenPluginRegistry_2_0_9 - mavenPluginRegistry_2_2_1 - mavenReportingApi_2_0_6 - mavenReportingApi_2_0_9 - mavenRepositoryMetadata_2_0_6 - mavenRepositoryMetadata_2_0_9 - mavenRepositoryMetadata_2_2_1 - mavenResources_2_6 - mavenSettings_2_0_6 - mavenSettings_2_0_9 - mavenSettings_2_2_1 - mavenSharedIncremental_1_1 - mavenSharedUtils_0_1 - mavenSurefire_2_12_4 - mavenSurefireApi_2_12_4 - mavenSurefireBooter_2_12_4 - mavenSurefireCommon_2_12_4 - mavenToolchain_1_0 - mavenToolchain_2_0_9 - plexusBuildApi_0_0_4 - plexusCompilerApi_2_2 - plexusContainerDefault_1_0_alpha9_stable1 - plexusInteractivityApi_1_0_alpha4 - plexusInterpolation_1_13 - plexusUtils_1_5_1 - plexusUtils_2_0_5 - plexusUtils_3_0 - ]) - ++ - (with - poms; + # Maven needs all of these to function + mavenMinimal = flatten [ - apache_3 - apache_4 - apache_5 - apache_6 - apache_9 - apache_10 - apache_11 - apache_13 - doxia_1_0_alpha7 - maven_2_0_6 - maven_2_0_9 - maven_2_2_1 - mavenParent_5 - mavenParent_8 - mavenParent_11 - mavenParent_13 - mavenParent_21 - mavenParent_22 - mavenParent_23 - mavenPlugins_22 - mavenPlugins_23 - mavenPlugins_24 - mavenPluginTools_3_1 - mavenReporting_2_0_6 - mavenReporting_2_0_9 - mavenSharedComponents_12 - mavenSharedComponents_17 - mavenSharedComponents_18 - mavenSharedComponents_19 - plexus_1_0_4 - plexus_1_0_11 - plexus_2_0_3 - plexus_2_0_6 - plexus_2_0_7 - plexus_3_3_1 - plexusCompiler_2_2 - plexusComponents_1_1_15 - plexusComponents_1_3_1 - plexusComponentAnnotations_1_5_5 - plexusContainers_1_0_3 - plexusContainers_1_5_5 - sonatypeForgeParent_3 - sonatypeForgeParent_5 - sonatypeForgeParent_10 - sonatypeSpiceParent_10 - sonatypeSpiceParent_16 - sonatypeSpiceParent_17 - surefire_2_12_4 + classworlds_1_1_alpha2 + classworlds_1_1 + commonsCli_1_0 + commonsLang_2_1 + commonsLang3_3_1 + commonsLoggingApi_1_1 + findbugsJsr305_2_0_1 + googleCollections_1_0 + junit_3_8_1 + junit_3_8_2 + log4j_1_2_12 + mavenArchiver_2_5 + mavenArtifact_2_0_6 + mavenArtifact_2_0_9 + mavenArtifact_2_2_1 + mavenArtifactManager_2_0_6 + mavenArtifactManager_2_0_9 + mavenArtifactManager_2_2_1 + mavenCommonArtifactFilters_1_3 + mavenCore_2_0_6 + mavenCore_2_0_9 + mavenCore_2_2_1 + mavenDoxiaSinkApi_1_0_alpha7 + mavenErrorDiagnostics_2_0_6 + mavenErrorDiagnostics_2_0_9 + mavenErrorDiagnostics_2_2_1 + mavenFiltering_1_1 + mavenModel_2_0_6 + mavenModel_2_0_9 + mavenModel_2_2_1 + mavenMonitor_2_0_6 + mavenMonitor_2_0_9 + mavenMonitor_2_2_1 + mavenPluginDescriptor_2_0_6 + mavenPluginDescriptor_2_0_9 + mavenPluginDescriptor_2_2_1 + mavenPluginParameterDocumenter_2_0_6 + mavenPluginParameterDocumenter_2_0_9 + mavenPluginParameterDocumenter_2_2_1 + mavenProfile_2_0_6 + mavenProfile_2_0_9 + mavenProfile_2_2_1 + mavenProject_2_0_6 + mavenProject_2_0_9 + mavenProject_2_2_1 + mavenPluginAnnotations_3_1 + mavenPluginApi_2_0_6 + mavenPluginApi_2_0_9 + mavenPluginApi_2_2_1 + mavenPluginRegistry_2_0_6 + mavenPluginRegistry_2_0_9 + mavenPluginRegistry_2_2_1 + mavenReportingApi_2_0_6 + mavenReportingApi_2_0_9 + mavenRepositoryMetadata_2_0_6 + mavenRepositoryMetadata_2_0_9 + mavenRepositoryMetadata_2_2_1 + mavenSettings_2_0_6 + mavenSettings_2_0_9 + mavenSettings_2_2_1 + mavenSharedIncremental_1_1 + mavenSharedUtils_0_1 + mavenSurefireApi_2_12_4 + mavenSurefireBooter_2_12_4 + mavenSurefireCommon_2_12_4 + mavenToolchain_1_0 + mavenToolchain_2_0_9 + plexusArchiver_2_1 + plexusBuildApi_0_0_4 + plexusClassworlds_2_2_2 + plexusCompilerApi_2_2 + plexusCompilerJavac_2_2 + plexusCompilerManager_2_2 + plexusComponentAnnotations_1_5_5 + plexusContainerDefault_1_0_alpha9 + plexusContainerDefault_1_0_alpha9_stable1 + plexusContainerDefault_1_5_5 + plexusDigest_1_0 + plexusInteractivityApi_1_0_alpha4 + plexusInterpolation_1_11 + plexusInterpolation_1_12 + plexusInterpolation_1_13 + plexusInterpolation_1_15 + plexusIo_2_0_2 + plexusUtils_1_0_4 + plexusUtils_1_4_1 + plexusUtils_1_4_5 + plexusUtils_1_5_1 + plexusUtils_1_5_5 + plexusUtils_1_5_8 + plexusUtils_1_5_15 + plexusUtils_2_0_5 + plexusUtils_3_0 + plexusUtils_3_0_5 + plexusUtils_3_0_8 + xbeanReflect_3_4 + ] ++ (with plugins; [ + mavenClean_2_5 + mavenCompiler_3_1 + mavenInstall_2_4 + mavenJar_2_4 + mavenResources_2_6 + mavenSurefire_2_12_4 + ]) ++ (with poms; [ + apache_3 + apache_4 + apache_5 + apache_6 + apache_9 + apache_10 + apache_11 + apache_13 + backportUtilConcurrent_3_1 + commonsParent_22 + doxia_1_0_alpha7 + googleParent_1 + jclOverSlf4j_1_5_6 + maven_2_0_6 + maven_2_0_9 + maven_2_2_1 + mavenParent_5 + mavenParent_8 + mavenParent_11 + mavenParent_13 + mavenParent_21 + mavenParent_22 + mavenParent_23 + mavenPlugins_22 + mavenPlugins_23 + mavenPlugins_24 + mavenPluginTools_3_1 + mavenReporting_2_0_6 + mavenReporting_2_0_9 + mavenSharedComponents_12 + mavenSharedComponents_17 + mavenSharedComponents_18 + mavenSharedComponents_19 + plexus_1_0_4 + plexus_1_0_8 + plexus_1_0_11 + plexus_2_0_2 + plexus_2_0_3 + plexus_2_0_6 + plexus_2_0_7 + plexus_3_0_1 + plexus_3_1 + plexus_3_2 + plexus_3_3_1 + plexusCipher_1_4 + plexusCompiler_2_2 + plexusCompilers_2_2 + plexusComponents_1_1_7 + plexusComponents_1_1_14 + plexusComponents_1_1_15 + plexusComponents_1_1_19 + plexusComponents_1_3_1 + plexusContainers_1_0_3 + plexusContainers_1_5_5 + plexusSecDispatcher_1_3 + slf4jApi_1_5_6 + slf4jJdk14_1_5_6 + slf4jParent_1_5_6 + sonatypeForgeParent_3 + sonatypeForgeParent_4 + sonatypeForgeParent_5 + sonatypeForgeParent_10 + sonatypeSpiceParent_10 + sonatypeSpiceParent_12 + sonatypeSpiceParent_16 + sonatypeSpiceParent_17 + surefire_2_12_4 + xbean_3_4 ]); } diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix index 790e7894bff..ecab1f1e99c 100644 --- a/pkgs/development/java-modules/maven/archiver.nix +++ b/pkgs/development/java-modules/maven/archiver.nix @@ -8,7 +8,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "3kkv5kf3k5in69aplawkr0cr2cviyjgf8k6r6qvgxk53i3jmh7qylzrwkrd9bxclkjkgyg77cffxm48qhxm9pyqncdbwjldsmmdfb4f"; } - { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; } + { type = "jar"; sha512 = "0wx6248rn0821nnag659mm1n77r56chgx2lr26x81l7apx4zkc2nidjzy2d73snkir98h9bmcz09wnx21pkrq8mk50x7mjgkc0yziky"; } + { type = "pom"; sha512 = "1rfnwxnk45084rdc52a17bmg8zfyylq1m38wvp956xy455abjvxpnp7il7xpkq6wv16f3bq5yx35hk1b9nycw19w6123rz4v5cs3b0b"; } ]; } diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix index 7f0a9226e87..031bd37eb6f 100644 --- a/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; } - { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; } + { type = "jar"; sha512 = "04i9c4k5diyqz8hn20sxvrqkqrxxm7wxqh7xgyk3dm1hwhrqy3h29irvpb335kp8i0sxljz2p2a9cmjpx9wyl0266bj5y313whmfkr5"; } + { type = "pom"; sha512 = "02ryc46in725q4y11l1kmy6ra01wjnfq5gqwic005wc090l2j39kn5drvn3av6g7413v9x0cksy8qcbagc2jnz6wwxn8z2g5krynw6z"; } ]; } diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix index 12876f53d5a..1cbb347baf4 100644 --- a/pkgs/development/java-modules/maven/artifact.nix +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -23,6 +23,17 @@ rec { { type = "pom"; sha512 = "0g0cbqihzxyaa1b0z9a7qb8lkhcm8bzxi7qnqaab2n2zaaql6jyy7cf4z4yzqw3yfj7ylqvydiwp32j2c7nqacyx0hmcydqkqg46kxv"; } ]; + mavenArtifact_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-artifact"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1wfffq39ay1cdzany6x0d6h7icdqrvmj4py35a8i2aw94bc8mf6cam7lf8z7jjckhrnb7yxbqz6pj8sxsgpkwnl2q4flqaczr8nnx4j"; } + { type = "pom"; sha512 = "099hkdbccd9cf6w64c37z1b2i54h4y0bfx5n56birikgy3s92rrl4x454gvw3wnrpvhkikwvdyw9dv03w40rn50kdwgy0mxc3zgs6l4"; } + ]; + mavenArtifact_3_0_3 = map (obj: fetchMaven { version = "3.0.3"; baseName = "maven-artifact"; diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix index e0ee7e6a59e..2b72293ac93 100644 --- a/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -8,8 +8,8 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "pom"; sha512 = "21wyk4llwjyanlggy281f9n0sjshjqvd322lbhxmzn42cd9vmj0s6xih82jwqlkcxkypwymyj1gl7van55ibd98p1jjjvr93gs1cn14"; } - { type = "jar"; sha512 = "1bv4lp1a8sb79almnygiq0pmm0fdhy9pyakp6xhz91b4v1cqg03sb586yc4lg2934yv4jjbybqjbh4l0y3kgnanjbxdxdgxgyf14iif"; } + { type = "pom"; sha512 = "0kr47rinzfyir5lfzp74r6dbbrcddrxdyic7yf571jfzzlwappy77bhrdchaz3c5w94pz1vq6is6yy5nfawpgb2zr6jpi5k552cf1fz"; } + { type = "jar"; sha512 = "060siqwk0mscxznl05lzyp72hqr9jr23l3fa9k1kdyks1hghw76cp01jbfj9ijy81n62vb6am98c1695mzpgf453kw1gxp40mwv0ryh"; } ]; mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven { diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix index 7f186503d31..d135bd28657 100644 --- a/pkgs/development/java-modules/maven/core.nix +++ b/pkgs/development/java-modules/maven/core.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; } - { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; } + { type = "pom"; sha512 = "3rph4ghz7y0a8a6g6h7hr470swyj99y70rwm9ccv40qjc6gxjrckgyax0ihz50x4gyihvpbz5nl046r1qdq4r57rwx0x81s4wns0vf2"; } + { type = "jar"; sha512 = "1dxfcyic0skz4pm4w5pxbvligyl9pif78lk915pdhzia16b54c65ffk832zs7d774ynjfxrgzpbicvldsdb1wmi15vfgxn421vynbjj"; } ]; } diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix index c8993f1f0c9..8f3cd0a4485 100644 --- a/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; } - { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; } + { type = "jar"; sha512 = "3znssb9y54405gpxmz5cmjzq0hvs3hp77vqfwnxarghsyz52cwfkjix22a3g75a5aqspxlwdgd86lsfm6qvyxzjlvlcqa1m0yrbjbr7"; } + { type = "pom"; sha512 = "39hx14ad5g3jyxbvsmx22l2g8asnax5ym3r0n5dqiqh8pk9zwy2icgsji64kcvrdx48m2dr5blhpp7r2mw4n7si0rgvmmkkpdvzm44m"; } ]; } diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix index 34832c371d5..41b2458550d 100644 --- a/pkgs/development/java-modules/maven/model.nix +++ b/pkgs/development/java-modules/maven/model.nix @@ -30,8 +30,8 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "14pxgdcim20x9lisf510nazzlcjxv9fpqabkdn0d86qa7d9270m4fmya5crasx2np9h0gxl407d77vcjf99fdxizg7i32w35yljqp3z"; } - { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; } + { type = "jar"; sha512 = "1f9ndvsxpiyybmr5p4pl0xrvxap17grad10vr0pskvx8g8phy7w7kmihhg8gd8m91nbikpaqycm54dp5xmhqzyq85dqapxbiy2m599v"; } + { type = "pom"; sha512 = "11imkxiw9wbgnv7zpghdmgpf02v668z78xr5v0cqyay88ph7wjbscwllbgx3v6rayffx64jbhlvsw97m9sdncrfih2c9wkvfp5m48kn"; } ]; mavenModel_3_0_3 = map (obj: fetchMaven { diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix index f127efba210..699d34bbf93 100644 --- a/pkgs/development/java-modules/maven/monitor.nix +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; } - { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; } + { type = "jar"; sha512 = "20yjvzy683ngrpkng4nv82vw081mwsqrmdmlsd66axj9w0sjk4s1d87d3b3jdjhqk4jn4f7vnm644awv17g9pxqvfk1shsn83lbnvi2"; } + { type = "pom"; sha512 = "1pqh6viikr8py8spmp1l55rcsqizsa1cv6kpycmpikj59bnxhd1kqj24rhn485ifam9i90w0p5yywmgg3fmvc09byfnfl5z2lf8j5dj"; } ]; } diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix index c00d0a4f9a2..782e3e14100 100644 --- a/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -8,7 +8,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "pom"; sha512 = "17zyw3j4zbg1hhj18i4q1f0r8gdxl3q9x5ksyqlyr0mrw2sadc6lvbbhyp3l7vsbddl4bgdx36gwvjp5d97gbmk1nbpi1vabadfhq76"; } - { type = "jar"; sha512 = "0rk2nzkwcrkfy3vs0zl0l2lxp3w4hkwxrypisbivv5al7sc8lbzls6jgpp3h5gx9kk4scjj24qf5vyimnbadj63rvqffg581fs2zgl9"; } + { type = "pom"; sha512 = "2q1y622vaks1y2qjbq4005jmi41hpkivsrnmkf5kr3zndz4d6ai47d90jwr70pby8xqqsj461baljcjsicl6rrbq0v9ppyryr13q828"; } + { type = "jar"; sha512 = "1jd8b32kl9kh4dxpdg5i9qf3haqc5br0mz8bl1ri4hb9qgwkzsijvx6jr7pv9zgplanwvgca3lhpgzsgs03n8jlqnbxbmgsv1pl93zb"; } ]; } diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix index ed791a86955..b06b83a8e94 100644 --- a/pkgs/development/java-modules/maven/plugin-api.nix +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -30,8 +30,8 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "pom"; sha512 = "23qj23k049jz4mp77h2wj4mnjqszb99l4xvxas93cpnbdl51a5s0d0rsg60a8zg0ic04n6fr8nig0vvmmcsggx93a96w4p3na97q30n"; } - { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; } + { type = "pom"; sha512 = "25dqpzywbqck1za612d3wqxk61lz92rsk8nvb3arfk2wafw8h5janxy831ikikk34af8wrckkrhgn8smvksj8smyqkfkr5xkga4ywbw"; } + { type = "jar"; sha512 = "18wx59j3k2pgy6i5abxpl6x2glp51jnf2w2dcx9yxfh0qx809gbkad2ikkdaihhzzvipf2ly3xhhnpj0vbkyycnahn4lvl5ahj76g4q"; } ]; mavenPluginApi_3_0_3 = map (obj: fetchMaven { diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix index 397a7610cfe..0a60032125c 100644 --- a/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; } - { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; } + { type = "jar"; sha512 = "34pf7z07gba3a3mvn3q3324bfrlzz01ycf02a31m2daxr12427hczz3ml4jd0gjsjj36qwic89wpcb7p34px3lvgkvy1d5hz0ky6nh6"; } + { type = "pom"; sha512 = "2z3kchasac2jbw1n0zq6d5ym57yw6si7d5i7qhz81q3ripv7r19is4d459idymgcqgpdp98zaqg7dbcbz72d0p6k9g8ngaqgk2iml0x"; } ]; } diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index 3fd437441a3..82b16e61620 100644 --- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; } - { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; } + { type = "jar"; sha512 = "3fp8c3mz9w83r497mx8lrb3lb65v9m2hrqjs2kq7hdzg99rcgwcflg3dcv5bg89xf8vhr853zm702l3s40dqq41ys69g4f1h0ksdkld"; } + { type = "pom"; sha512 = "392c3zmdvwbz7iakaf93bk82s4la0wr8dj88vz2ipsbakmvqk82hs4r6jkpx7mkl04qhrpk4n4d7gl1gllhkyqapvdddf5qvp6a6b5q"; } ]; } diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix index 7191a377a33..547bda4fc9f 100644 --- a/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; } - { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; } + { type = "jar"; sha512 = "31kbwqlcwpyvp69sp41hb86dskyr4jp9pb1b43wc23lnk0qlyc712bqrr3qbc6kbl2wfra5fhpr70nfilx6bxsz66zizgdca3pdc0z3"; } + { type = "pom"; sha512 = "2i5zj8fmfjdnjl5y91b8m5n8gyiaih4n1i6rn85plibq4n8a42kmxgphvicnn36sgrgmy7la4vrzbaigm2zci857qws52j9p16hzv9c"; } ]; } diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix index bcaae06b1f9..d5e79d13c2c 100644 --- a/pkgs/development/java-modules/maven/profile.nix +++ b/pkgs/development/java-modules/maven/profile.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; } - { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; } + { type = "jar"; sha512 = "13lgj34xf9wgwx87z5gbqmq3f3l2dqprk68ji1vig49k2ngxfa8xz3a8qh7gbl9l234gkbdl3dcsafr158bi0m3n5myrczbz0wfcia7"; } + { type = "pom"; sha512 = "0m6fqn507a36rpk0bzwv2zzl1gngcf3h4lrbw8abkmyq7npaqcg57fb5wy6cm30r2cjv2vffrdi142wjxzvrqdr08lmi5nf57gi1sng"; } ]; } diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index 142a311feed..880f821f76c 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -22,4 +22,15 @@ rec { { type = "jar"; sha512 = "0laxsz9z48zvx27m395djfl9121jkr7amiv8n07z9nkz9i60wjl52bb7cw6hp6090ba098g8azqpnz8l5i0yj255phy1j6s92ci1i7c"; } { type = "pom"; sha512 = "047a0a2bd5fkmg70gzhdiwiwq5dmr84pz6jq9yi5fz44y57ndp7nb72fnkr0p0qcwmry3gj03hk9p2xr4ph53bl1x68j22fnv0f9krq"; } ]; + + mavenProject_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-project"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3km1j5jnkyil76817gk37ds8v69fmiz2zh924vnsv8sbaj4bm8rs7n5d5laiyss5ff0p1q9by3k1ai94lw2ambc5pbmm6lz0v71naic"; } + { type = "pom"; sha512 = "10mk142nqdaq8nqg6sf4wfaq2ymlf3fs2ay8xjrfp07l68z838b2kmj7s8lvv1qzkcnkcjrg9w2kr1m3i8bqxc68fwd5iqdq674c1p3"; } + ]; } diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix index 7e29ada0512..7a076a3811e 100644 --- a/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; } - { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; } + { type = "jar"; sha512 = "1dhyh2m8kwys6b1pqnyrn9f9a0bm93xgy9d0nyr98sq3v14irmk6kaf91rgrzrgg5b526816gb41gw1i0rdsrjdgnawlml5dm4qqc8g"; } + { type = "pom"; sha512 = "3xcvc4rsmxsxadsqczzknyrdvklizbd6wr1ldvkqx0vqwwm89k9brgkvb5bqv5i3g8s3izx1xn4g24ya88qmgr3h231wpjby2nihdvg"; } ]; } diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix index 19f0a1ae24d..b4416607ee9 100644 --- a/pkgs/development/java-modules/maven/settings.nix +++ b/pkgs/development/java-modules/maven/settings.nix @@ -30,7 +30,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; } - { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; } + { type = "jar"; sha512 = "3fn6wij56cx3knhyn2w5q4bvsl6sm2ad5wxgszpp4mw5jvl5smczz3k6gpg1bnj5m9f0r9w4aahnf64qxpv4v0lv8fd6k6arwzr1lxd"; } + { type = "pom"; sha512 = "1vmbcxbrklhsyqhhz5x0skkckghi3lwgpksxi3aw0j57f86h7rk464ww1zppym451pqgqnpyvl83zzkizad5n8y8hrw41hgh1cdn3ij"; } ]; } diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix index 550490a32b1..e7a561814e4 100644 --- a/pkgs/development/java-modules/maven/surefire-api.nix +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -3,12 +3,12 @@ rec { mavenSurefireApi_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; - baseName = "maven-surefire-api"; + baseName = "surefire-api"; package = "/org/apache/maven/surefire"; sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; } - { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; } + { type = "jar"; sha512 = "0chjp4jpfrhd99mpvh6v4sz71wgg8r0nyv8j2mgbsxsvbf0wha0za5g5bv16l4pflfigd4rhb2h1mkz51pb71qli8w39ycb3dw4lfpn"; } + { type = "pom"; sha512 = "28ra2n9ln8nb5j1xh6mnxc4kfabnvyqyrgy2wwm66pxhp1fxxxqz1izfvih9jzr3cps7pbvqwql770i14cfyjzvl0zccjsscsjyy50r"; } ]; } diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix index b696beae4c4..8f4d79a9807 100644 --- a/pkgs/development/java-modules/maven/surefire-booter.nix +++ b/pkgs/development/java-modules/maven/surefire-booter.nix @@ -3,12 +3,12 @@ rec { mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; - baseName = "maven-surefire-booter"; + baseName = "surefire-booter"; package = "/org/apache/maven/surefire"; sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; } - { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; } + { type = "jar"; sha512 = "08l0r0s1jhjdgljh26m4i612kf6wqs6g8lwx9n0cccjjzlpn3sxg7dryagwp2gz2g9y5kpdmbpsxmp5imbdak3qrwa56wxrmik16jh8"; } + { type = "pom"; sha512 = "3rj97rbbdm0m0f1cpbvw7mc9hc5jmfkqbg1w1ggr640bd8fzrgmxrcynxf440mf0wg4xy55v27g6v5c3z20zlw1h4qi500x6wfm0l5s"; } ]; } diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix index 0d1bd53721c..c7bd2995c3a 100644 --- a/pkgs/development/java-modules/maven/surefire-common.nix +++ b/pkgs/development/java-modules/maven/surefire-common.nix @@ -8,7 +8,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; } - { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; } + { type = "jar"; sha512 = "3ny5b6mnmka3lzyqk03flmizj82c0hdbiqgcqxj7261pvcf2drrk85p5q2z6f2h15w60mhyvl80p39pzqa35ziqhqnp6walg7rdk0hb"; } + { type = "pom"; sha512 = "3iagspjgilwhbh5sxi64b2q8dpgrwa0s9wiw2417z2lvghy8knszha62n3j9qvbn7pxy819f2981s41aan6wcwx5scr9sg8jwbvcmff"; } ]; } diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix index 14e6866ee32..80622361512 100644 --- a/pkgs/development/java-modules/maven/toolchain.nix +++ b/pkgs/development/java-modules/maven/toolchain.nix @@ -19,7 +19,7 @@ rec { sha512 = obj.sha512; type = obj.type; }) [ - { type = "jar"; sha512 = "34kxv3l3676ddrsj2k02f9fmphcq16avafka950d5dclrcx7w37wgxx3gcf6zfixfx9zlbb7annsa05y8f0rx97g13rkqdfdj1wknky"; } - { type = "pom"; sha512 = "0arkdm0bii7cm0g8qzzfih1jk9j7myn8w2ccr6j01wsj08gv7cbjr5k9jx1iwy1vzvhhsmsj6grq678zsgbvh4msn1s44i744x4fhvy"; } + { type = "jar"; sha512 = "37jjcjfx51bszg13wjhkv2spyw1b2n8glgyaaflzfqxmfhizr43y1fq2zhn2khp2jba6avilkqi9p0f2sd30glrg7lpc0srzqns3yn8"; } + { type = "pom"; sha512 = "1r6w6za6smam46fpdfda2612ayz4a8gm87lgwa4f5jp5k92mzaj22rcsxlnibzly19vrgvycci63w9rgmzkwi2zvxxwxmf8sc5542c7"; } ]; } diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index 7c564037108..5cd022b6837 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, maven }: +{ pkgs, stdenv, maven }: with pkgs; with pkgs.javaPackages; diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix new file mode 100644 index 00000000000..e831df44732 --- /dev/null +++ b/pkgs/development/java-modules/plexus/archiver.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusArchiver_2_1 = map (obj: fetchMaven { + version = "2.1"; + baseName = "plexus-archiver"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0xwsvld0s5p4abk5ain2ya3zbz97bkk8vzjdrmfrly3mwfbxp7lyjhshxqnr58m7kan6l0vygv7lsnyfg0yyxmnj8f5nwvssgxm1izx"; } + { type = "pom"; sha512 = "3rrwjlrwsl9ba7dyf5vp5r1pfvfmk4vwwpyq52yrmrv22djlh4dmbh1r97aizmrf17qbs7995vmcxs83ybpc62263dgxx1qa7c85hy1"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix new file mode 100644 index 00000000000..44b5ff3441a --- /dev/null +++ b/pkgs/development/java-modules/plexus/classworlds.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusClassworlds_2_2_2 = map (obj: fetchMaven { + version = "2.2.2"; + baseName = "plexus-classworlds"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0w6mhv2xjafqr45zx5fwm8iyp8kabrdvyx91qxwy04k71ah6zxzqx1l8ppq7xma4r40lpp98valr1ydgfm1cay87j1kbdgaw2j48vns"; } + { type = "pom"; sha512 = "12kxa236gg61gs6cshgwnsj0yfpywcb606j10l9hflp951vxvlcwpcdh1nlpir0zyqj7rnk5g8609grwahq2m62fs1ymqp8db2rqi56"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix new file mode 100644 index 00000000000..e3f4defd97a --- /dev/null +++ b/pkgs/development/java-modules/plexus/compiler-javac.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusCompilerJavac_2_2 = map (obj: fetchMaven { + version = "2.2"; + baseName = "plexus-compiler-javac"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "12xsiaqd1q6mmmkcsxf4nr4wdjl8fa1nwz32yqwrrbj9cgakph0368cnk1apjzngsmnl6bws87nlxcz64sg0rb7i2vdzggplj0a41br"; } + { type = "pom"; sha512 = "1fv2ij4h9xmzv3f5mvs0ilhkw7khkw5v8n1d97a2canfn254fipz7pd9nkmkqzjvy3cqwiczyh2nzibvcii624p8ggwl4s3yjw92jx4"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix new file mode 100644 index 00000000000..0675fff5004 --- /dev/null +++ b/pkgs/development/java-modules/plexus/compiler-manager.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusCompilerManager_2_2 = map (obj: fetchMaven { + version = "2.2"; + baseName = "plexus-compiler-manager"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1r1sdj784x4zcnkaz840vsz36jn1p2j98c21nia56kcdl1njydjn714bsmdy816l6sdinkz4s196mm3hshmxhq8mkmf16wgxx8jnq94"; } + { type = "pom"; sha512 = "3cpfnbgil6g0bgq0cjbq2ysfjdpl05fh72d9l9cnwbilcsaxcmzn1hgmmkvam2ih222nl82dy7n5020is3y05kiv0i4n4lcs5m0ia48"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix index a720c06a186..4b9949f3eb3 100644 --- a/pkgs/development/java-modules/plexus/container-default.nix +++ b/pkgs/development/java-modules/plexus/container-default.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven { + version = "1.0-alpha-9"; + baseName = "plexus-container-default"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2niq80yyq5kaq4qbmqsbibz9i1b6xqrfwy6iabddx9lwacsrq3a1qwh1ih877vk6dcgq8gbi0ahx19x95vwvbpp7449ja4wml5xmag2"; } + { type = "pom"; sha512 = "144xr23kq2ljhzzvac6w2s120s96jfaccaishb9lqmrx0a8gkq949ccyf3qmv6srryflsqc0sksl7rr3294iwjgwj04xidhd8c5jycd"; } + ]; + plexusContainerDefault_1_0_alpha9_stable1 = map (obj: fetchMaven { version = "1.0-alpha-9-stable-1"; baseName = "plexus-container-default"; @@ -11,4 +22,15 @@ rec { { type = "jar"; sha512 = "1dpzdijx7xb3kgv2ybias3shzvpsq82w6x1ig5gdkg0i47m6a1ld53bi3gjczdpn88xparp80jkqlacjb65764v05ps6zg0v3vr1dkw"; } { type = "pom"; sha512 = "1gnm9ivwrkr3aqpnmdl34hkx53189wxj9acp2fms8inhznrxqcyyk355gpgzwvs9qpgdis1q88mj1fy3x1v3ffa3b6wi758p95q79jc"; } ]; + + plexusContainerDefault_1_5_5 = map (obj: fetchMaven { + version = "1.5.5"; + baseName = "plexus-container-default"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3f6qyisir3k7aa627fqh0q98zvfc4hz8xq1rzjgqjhgv34m2x8kgwfxvlcik5v7724gjj41vjvs909xw7l0v80ryhvl95r35ndqzvzy"; } + { type = "pom"; sha512 = "2axphhx8xiii80gbf9gmm6qrm6m4ws4fbdcmghzfsn1yvmmjsj7x1c15g5mkq0lhh0skscibqifsxh44qix21qfkxr532681jh5qq5h"; } + ]; } diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix new file mode 100644 index 00000000000..8bd73891779 --- /dev/null +++ b/pkgs/development/java-modules/plexus/digest.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusDigest_1_0 = map (obj: fetchMaven { + version = "1.0"; + baseName = "plexus-digest"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0r343fhzhfdnavsjbl7jnxgdw64wsfzyk4q7l3m7s5wx3b8mxnizyg1r4fwb59bd8w8hw6x8l0nxrk16a9hnkhrdmnc01hyb3ra7irk"; } + { type = "pom"; sha512 = "1z7nqj2qa82g8dgd4jzmankz3hkh4r8y1q0abd37kwsx54ij681d46z916w009mq232jharynypg3682ds47jxxnqsmpm9k22i7fgib"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix index 17660f0804c..2d08495532d 100644 --- a/pkgs/development/java-modules/plexus/interpolation.nix +++ b/pkgs/development/java-modules/plexus/interpolation.nix @@ -1,6 +1,28 @@ { fetchMaven }: rec { + plexusInterpolation_1_11 = map (obj: fetchMaven { + version = "1.11"; + baseName = "plexus-interpolation"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "064lk1i6x9jj0yaiw2j1738652mxwi6qavagi364dj0pyg65pp875hs6qv1kc4gpzk60ksr99mg49mhb216p0lim83xshrxqj9i5j2w"; } + { type = "pom"; sha512 = "2laqd4iv9mj4r7kdm0zyc07pyi04p1svb27fdzm2w4y3kmi4z5h2cg39rpn6slf8wmfnk3zlcj3w662sm1fy47qzdjwkkjil0fgv3m3"; } + ]; + + plexusInterpolation_1_12 = map (obj: fetchMaven { + version = "1.12"; + baseName = "plexus-interpolation"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "239qj01vsvn7rxm67z15lgc4nc6lqas3fkxx8an5dddzsdjh7vm99ya576abwzngcm4ckz5d0dk7qx9rgsz6b9rwjq3zvqahmaw2h7a"; } + { type = "pom"; sha512 = "1jpkc2q1i325vscq9ryww1ip7vgpbzcwv23ks18b33gdxpkw25kfzncpcnpdg9fy5jn60fb6jhngxz9mkxnzyl0p3sfkkarwcmcx881"; } + ]; + plexusInterpolation_1_13 = map (obj: fetchMaven { version = "1.13"; baseName = "plexus-interpolation"; @@ -11,4 +33,15 @@ rec { { type = "jar"; sha512 = "0sm1kaxsvn8007br7nr9ncjppmfkp8nzr6ipwwx86idai9bqcsm4kh2scxf893s4jf2ii7f5106dd5w4h7bw67csalhqqzi1zpndbk4"; } { type = "pom"; sha512 = "3hlv9l82yxjbnaf2vqq6p3w38jq2id15a2yjg6wj810fl2286zz5ci3g3x7x0z0xdrxrrfvswns92v25197vpg0dki113lwdbw4bsvr"; } ]; + + plexusInterpolation_1_15 = map (obj: fetchMaven { + version = "1.15"; + baseName = "plexus-interpolation"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0a3bvnmawbnqyva73pcz6mwwd9qsy2hrhjn708qmcplv7n21h06qyvzm5advlrrbqf7k55140vdh6nzvzlwvbw3ksbchdh4r85a9i4j"; } + { type = "pom"; sha512 = "20z12w94g7pdmps9k3in3wmhirbz1qpgymfjpr5zx66kdiarj32b2akz28f5gr037zr3k3v366v3k3l694dx42rqhhwmalralybsj6a"; } + ]; } diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix new file mode 100644 index 00000000000..1b17ae3c2ca --- /dev/null +++ b/pkgs/development/java-modules/plexus/io.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + plexusIo_2_0_2 = map (obj: fetchMaven { + version = "2.0.2"; + baseName = "plexus-io"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1z1il2fj5vr20g4aadwc0wkx117gffh8ql38i6ww5ldv9lppq81wmbsngj9vw434viy1rjifmwrx0ia3k66plqi3w63x86igq7ka0hk"; } + { type = "pom"; sha512 = "3wlqpr3b8gw9kphnqkwbxmd5pmis9wkp31biqaa6qmib31k3az6qk81fd8bwr6ifpki11fabawzbmg0dnabxig8svg6c49ydgjm3p8p"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index 17dc1acdf1f..137ac01c02d 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + plexusUtils_1_0_4 = map (obj: fetchMaven { + version = "1.0.4"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3bk54p57k27fy0gdqbagscp0qqhpb116ds8jw9vcqncl3x31xs1fp0d59pjylc62h9r9g4jp068v0b116n00ljrfjfsnvnknnnlahmd"; } + { type = "pom"; sha512 = "35mm9fkfw1wljabr4lz6l5mq3mxgl7k87whlcz5qlddsbxy0j69j4xgf1fvjlyp06nqq2wz574v54aqpxgp8s6jwjyz9wyvqvsyka8d"; } + ]; + plexusUtils_1_1 = map (obj: fetchMaven { version = "1.1"; baseName = "plexus-utils"; @@ -12,6 +23,28 @@ rec { { type = "pom"; sha512 = "0vbzdfsdcc4cq7hdqzb1vdfxp23vnavq7z4qmmlb4d4fiqj5wqdgagrs43gl7yzca2azpyj3kyxgaipimi7gck07jcsz0pzljkplk4w"; } ]; + plexusUtils_1_4_1 = map (obj: fetchMaven { + version = "1.4.1"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "33b5mg4y3a57dfh41v2wimmvc9fqqh8dhihyd1hqg0lif40nnfc7yhypj1lr2ik95vd1vn6jghv0fi4pkzkbr7vb463gl6kz4yra2fk"; } + { type = "pom"; sha512 = "00h4r4l6isrks402minrpmm0shx8mxhkc31dbfcm86r220vl0bbgxw9mfqqc2ldjh7wkwcd0xp236kxwphxcrajiayxgvp7xgqnvfvb"; } + ]; + + plexusUtils_1_4_5 = map (obj: fetchMaven { + version = "1.4.5"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1f20xhp8jnkc70fy6b0fbhb16pvbwp83k4dwwar4r5570yn24j09iqlk8bhz6ra8pnkh0jz0idg61wrlz9mghzbmgdn6f2dj25dzr8s"; } + { type = "pom"; sha512 = "0liqhpc9pn81vn04qz4j3101jc33hygb415jnwpf0dhph3jay88l49gd9s1bwq6x4npn2v6863vidb8hdh5f8wd20k6m1lqhdpv882j"; } + ]; + plexusUtils_1_5_1 = map (obj: fetchMaven { version = "1.5.1"; baseName = "plexus-utils"; @@ -23,6 +56,17 @@ rec { { type = "pom"; sha512 = "161cdrgjrw2cab4lf189hwa4s1lh42fsahjcjkir696sx0m9bmmxgjbhwxl1l8kpaxn5p6jf701bx16gry393pws636vy59nvnnx1sw"; } ]; + plexusUtils_1_5_5 = map (obj: fetchMaven { + version = "1.5.5"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1ygv6mcv07kb0z8hrg98xg0sr0qqyf1v3snki6j3pn8wwn5bl46j8l70c7bpcv2jf623jn7g8gbkvjl9m04v23v3jlcc106cicbgx3v"; } + { type = "pom"; sha512 = "29knasqhkvjif27gm3ycqhc206ycgc9920mccw7biybxmiqqajyfvv74f02sqpavlk5h6l45cfb20bmldwfznvzz9bw4zhvc12s9y5h"; } + ]; + plexusUtils_1_5_8 = map (obj: fetchMaven { version = "1.5.8"; baseName = "plexus-utils"; @@ -34,6 +78,17 @@ rec { { type = "pom"; sha512 = "06z4gkq3bh2pwyj8pvaly9fihd8gbgcqp3jxl05vkj2rcdb4jw3lw3hwn8f8ggqi17i2fdm8cbndkqgr9vdgiz45p8f1nx8kjlqikbi"; } ]; + plexusUtils_1_5_15 = map (obj: fetchMaven { + version = "1.5.15"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0sya2d7nml8is8dfykyg7va1556ldnxxr90xynq9w5ghw8w8zz69hjhy5al91m4if11kc64d4ysssqqs6s83lxs75c0kipr4byn90gc"; } + { type = "pom"; sha512 = "3ax5sy7x5l7c3qxj4vn4fyak0s6d7m2hbv2r79z5mr7hf0wp29jvg9jjlb8x6mdrg9q0i363j32b4mrvbxcdq7i128sqgc80c5jczdk"; } + ]; + plexusUtils_2_0_5 = map (obj: fetchMaven { version = "2.0.5"; baseName = "plexus-utils"; @@ -66,4 +121,26 @@ rec { { type = "jar"; sha512 = "16m1khf9fafb9f79rbz93qgc35d8605v1qbs4ywnj4sk00d00d6n1649cc9rv593r8ghwd0rkz345z7wb00fagdr9af5h8h5w5blsa1"; } { type = "pom"; sha512 = "123fsmm1jvy571yl1s3wp7yd5k52nfjqxzqpzx2940rsigm35rw2mx1g4bvr3wx0gv5bqlfmqj5cwdhhxdq5vzrax8z5vbmdg5vb77r"; } ]; + + plexusUtils_3_0_5 = map (obj: fetchMaven { + version = "3.0.5"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2b7l2xwn606nn227fiqg47y4cda6apr4nv618f5swjnsji0gifw4dz4a9xyb7p0iy27igkj0j2l6kp3y4fc0vhvi7wn07zfcckswiyf"; } + { type = "pom"; sha512 = "264k562pvd1cyh5danf56iyay1a661d15rywwq12fd3v8k7p85kl9b9ykqa5hssqkkixrv4gmhy6nkk5dhy5whbmlan99h6w6q0pjyw"; } + ]; + + plexusUtils_3_0_8 = map (obj: fetchMaven { + version = "3.0.8"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3745x0zvidknkzsl4p049c0qj0iv19ga9x9mfskl93r97nx7ip6qnwa9a0v9y3s5sy2klhlfg5dyyjnhr822529cv1p2dhlh46brknn"; } + { type = "pom"; sha512 = "1p1l437rwpxv9jfygr25b455xymqcmm4smin1bf7fzcmgkc3m7k0gdd7rfvfg2622070rmwjbk4fgv0z3alf1xz03ksjp6s0gr6sqr8"; } + ]; } diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 18944e27a86..2b3f2861399 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -37,7 +37,7 @@ rec { version = "5"; baseName = "apache"; package = "/org/apache"; - sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6"; + sha512 = "11l6b46mwm404vahylssab5mj4a1fw3zrjhsz3mcj5x3awnqa03131j8phias2n0rppn53xcg2p2xgr9mbp7llwabwx8jm0kz2mpgh0"; type = "pom"; }; @@ -53,7 +53,7 @@ rec { version = "9"; baseName = "apache"; package = "/org/apache"; - sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6"; + sha512 = "0wak95l7zlizrildiji9763zzs10dmhflxaqzg8r9qw2j8a20f2nmns03skvd8na2p12zzvrxa15p952gdfkvrynmvcv2vi1qz822g9"; type = "pom"; }; @@ -81,6 +81,14 @@ rec { type = "pom"; }; + backportUtilConcurrent_3_1 = fetchMaven { + version = "3.1"; + baseName = "backport-util-concurrent"; + package = "/backport-util-concurrent"; + sha512 = "38i04cb0dggdjjsvl32wpxfbczl1d696nlpzissjlq9ya197rwa0g0704p7vz71xsylvpdjssb0cyx916xsigcyb95k8c84b2hmdhvr"; + type = "pom"; + }; + beanshell_2_0_b4 = fetchMaven { version = "2.0b4"; baseName = "beanshell"; @@ -97,6 +105,14 @@ rec { type = "pom"; }; + commonsParent_22 = fetchMaven { + version = "22"; + baseName = "commons-parent"; + package = "/org/apache/commons"; + sha512 = "1sm8g7iwyc5gi4w73yx3p1f1l81kw8d5wzqzqgdgy7k7hfvmsxlm5r9n99h9r0g5y494ad46hjzf8cwjf8am4rv0qzhrmsqkxyd24wk"; + type = "pom"; + }; + doxia_1_0_alpha7 = fetchMaven { version = "1.0-alpha-7"; baseName = "doxia"; @@ -129,6 +145,14 @@ rec { type = "pom"; }; + googleParent_1 = fetchMaven { + version = "1"; + baseName = "google"; + package = "/com/google"; + sha512 = "22whj7li6dvh4xjcdx1hwlh13ar8c8d9snal6ynnbsd566n9g0kif2fx75q5j4kwmqzb2yj3c3vxdfzg82650gkyvjm2x6cb35vdi30"; + type = "pom"; + }; + hamcrestParent_1_3 = fetchMaven { version = "1.3"; baseName = "hamcrest-parent"; @@ -137,6 +161,14 @@ rec { type = "pom"; }; + jclOverSlf4j_1_5_6 = fetchMaven { + version = "1.5.6"; + baseName = "jcl-over-slf4j"; + package = "/org/slf4j"; + sha512 = "3ync9p7ws4p8p494jifarwpqblmbkkl6r6rw4bms8fk6ija0ifxn6q5za3pxvp690p5lzw2zkgidr51rqxk8w1ms69pb1nib1r4j578"; + type = "pom"; + }; + maven_2_0_6 = fetchMaven { version = "2.0.6"; baseName = "maven"; @@ -157,7 +189,7 @@ rec { version = "2.2.1"; baseName = "maven"; package = "/org/apache/maven"; - sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0"; + sha512 = "1bdf85rb7b3dvw9gjv376pk908jgvb35hs8p6fp4pzp19pj71150if09lmhw07gvy7sdd92daw7jmijmi1f9w4gxhkbqhvzkb7qx1rs"; type = "pom"; }; @@ -197,7 +229,7 @@ rec { version = "11"; baseName = "maven-parent"; package = "/org/apache/maven"; - sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp"; + sha512 = "21lz2qb0sl9akirk7fcbj7ldfgnq5nqy90s3hfvmfvz2spk1ppa5yq3702m7z72l3jpbm9vrcm4dvarar314lwjp3477p558gwcpkqf"; type = "pom"; }; @@ -205,7 +237,7 @@ rec { version = "13"; baseName = "maven-parent"; package = "/org/apache/maven"; - sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp"; + sha512 = "0vgjwpmnvcjfif84s5x19ixlxg4413mfma9f10v7klv88b08vwvkpwjnffgzrlqvp5524d8zyswshqkwpdqb0klgppxiipd52d546vw"; type = "pom"; }; @@ -269,7 +301,7 @@ rec { version = "3.1"; baseName = "maven-plugin-tools"; package = "/org/apache/maven/plugin-tools"; - sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs"; + sha512 = "2410rvvhnpwdg67slwb05v7vnpbvq00d36mbsc77parw4v9n3sr1hqai803g8q54lzv05zzcm7knkjv5ip5wcbvzrh0dr4f5lm904wy"; type = "pom"; }; @@ -293,7 +325,7 @@ rec { version = "12"; baseName = "maven-shared-components"; package = "/org/apache/maven/shared"; - sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy"; + sha512 = "1x5q96gigd54qp60i20kvmwi604ga55fc70gkz1nwn5fjmy36rlxldhhdij3kcpnxpwqp4dwxq717ai8rqv3lzjif8pxd06wzmz0q09"; type = "pom"; }; @@ -337,6 +369,14 @@ rec { type = "pom"; }; + plexus_1_0_8 = fetchMaven { + version = "1.0.8"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "1nwv49smddfvqn1fhi8aj993pkzsxa033a9g97z7sc3aia5wzwz86azzyrklgxywc26c3k3mw8vfzv758rv3v7cn0hfmyfzfkrg8vwp"; + type = "pom"; + }; + plexus_1_0_11 = fetchMaven { version = "1.0.11"; baseName = "plexus"; @@ -377,6 +417,30 @@ rec { type = "pom"; }; + plexus_3_0_1 = fetchMaven { + version = "3.0.1"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "3rjh4msw1qjpj0vmc90f89zjkzcyahzh93jrpw25qb2wn0v18jgw65g0ai7ynssdh113kxi816syqcw8vbqwvhlr2b0acrmszy0jnps"; + type = "pom"; + }; + + plexus_3_1 = fetchMaven { + version = "3.1"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "1zyyzy6zvf73bnv8c76x2lmffllqqrgk1k8kpravcrd809acfslip1w7w8kr0rg3sc7554875wsq8fbhq3zdvxwjpzwgz4l5rjr3lmr"; + type = "pom"; + }; + + plexus_3_2 = fetchMaven { + version = "3.2"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "07y1vwz55l9yzfhix5w5fw5xvdj854c1ri1wws6r23xzyp5bqwrrz0x5ln26w05w78vpj1rvrq1mkk192vfr80si3ccr063aschf6ld"; + type = "pom"; + }; + plexus_3_3_1 = fetchMaven { version = "3.3.1"; baseName = "plexus"; @@ -385,6 +449,14 @@ rec { type = "pom"; }; + plexusCipher_1_4 = fetchMaven { + version = "1.4"; + baseName = "plexus-cipher"; + package = "/org/sonatype/plexus"; + sha512 = "1m4f7n6ch8gbwgvz7h8iab0jkan8ws3qq9776qc10k0kj6i3227kskk5s8pxlq9vrxw498jmjnkiga41fy33khrgvsvls2hrj9vv1g1"; + type = "pom"; + }; + plexusCompiler_2_2 = fetchMaven { version = "2.2"; baseName = "plexus-compiler"; @@ -393,6 +465,14 @@ rec { type = "pom"; }; + plexusCompilers_2_2 = fetchMaven { + version = "2.2"; + baseName = "plexus-compilers"; + package = "/org/codehaus/plexus"; + sha512 = "0yvvc8mdz1vd7mpw9h568mhlfxh3qpbz4qpyr5iw7f5ifm46gxsmnfd36ah6mn9hxh6lpra3mi536y5cv1k5mrbr128a1lwyr8p14rg"; + type = "pom"; + }; + plexusComponents_1_1_4 = fetchMaven { version = "1.1.4"; baseName = "plexus-components"; @@ -401,6 +481,22 @@ rec { type = "pom"; }; + plexusComponents_1_1_7 = fetchMaven { + version = "1.1.7"; + baseName = "plexus-components"; + package = "/org/codehaus/plexus"; + sha512 = "2mh1qfbaf6f6nv0nj0g8skgv82jv1l2zg7iivd2jjrzrwnpkc58ajfl1wmylwpz035d9dd713h9szkwy2hdd6pardbc4ja2w4qv5s91"; + type = "pom"; + }; + + plexusComponents_1_1_14 = fetchMaven { + version = "1.1.14"; + baseName = "plexus-components"; + package = "/org/codehaus/plexus"; + sha512 = "2gf578c23wz38cnjnp8w80b6hzmfnzrv6is1yf52qrfcijk84fnj4k8wrqg0jms9yz6l5rkkv40zm2j7kkbxgn862mnh4i4qxcb604g"; + type = "pom"; + }; + plexusComponents_1_1_15 = fetchMaven { version = "1.1.15"; baseName = "plexus-components"; @@ -409,6 +505,14 @@ rec { type = "pom"; }; + plexusComponents_1_1_19 = fetchMaven { + version = "1.1.19"; + baseName = "plexus-components"; + package = "/org/codehaus/plexus"; + sha512 = "01mllmbwfrimvsgmc3wfxp60nm999xa4abp0ywpxdrvbb88dwr4g7sg3mlz22xhc8pky72mif882ppgrdxj01lx3lmm84p3g5f51bii"; + type = "pom"; + }; + plexusComponents_1_3_1 = fetchMaven { version = "1.3.1"; baseName = "plexus-components"; @@ -433,6 +537,38 @@ rec { type = "pom"; }; + plexusSecDispatcher_1_3 = fetchMaven { + version = "1.3"; + baseName = "plexus-sec-dispatcher"; + package = "/org/sonatype/plexus"; + sha512 = "09blh68dwrh3zix33cbfbvmxbbm7ck80pwp9x4v1ilf11y6hgm065jx39viqm0zlr86kwngrlm4skrgjw5v67aj2q7d7kd5jgj5s0qc"; + type = "pom"; + }; + + slf4jApi_1_5_6 = fetchMaven { + version = "1.5.6"; + baseName = "slf4j-api"; + package = "/org/slf4j"; + sha512 = "3ahxd5zfxpwrp97yq74xfhrh02a7hnmcdxk5rwjn4v5hcms9b98iizsgd2ssjxa1vy784jh45f6k8qby1c1bdcwk9y18mkcw79zhl2n"; + type = "pom"; + }; + + slf4jJdk14_1_5_6 = fetchMaven { + version = "1.5.6"; + baseName = "slf4j-jdk14"; + package = "/org/slf4j"; + sha512 = "11yiy09mlm5dq2ir05n97nka3sqwn48k47x4d2vqmgjsk3vz255m8ilxvq5hjjzygyw0prcrp4zbwkphb5his00pw8f4hczd1w16nvr"; + type = "pom"; + }; + + slf4jParent_1_5_6 = fetchMaven { + version = "1.5.6"; + baseName = "slf4j-parent"; + package = "/org/slf4j"; + sha512 = "036cizr5vh557l65jiv706iiy1q1s3lkr1xqa1hd5yspawd111d5iq8q3qdsw07c3rmxq7n9sflgcj08bhs149ni119fdr7hn9cx0nl"; + type = "pom"; + }; + sonatypeForgeParent_3 = fetchMaven { version = "3"; baseName = "forge-parent"; @@ -441,6 +577,14 @@ rec { type = "pom"; }; + sonatypeForgeParent_4 = fetchMaven { + version = "4"; + baseName = "forge-parent"; + package = "/org/sonatype/forge"; + sha512 = "0j13rfddklh25sdwppxvdn97y3l8vy809g2w5zpflh74v0rh0q04ylm3j2nj5hf3ypmgx3lhdp161jbv3l47gl7gh60fk3rnq17kfbq"; + type = "pom"; + }; + sonatypeForgeParent_5 = fetchMaven { version = "5"; baseName = "forge-parent"; @@ -473,6 +617,14 @@ rec { type = "pom"; }; + sonatypeSpiceParent_12 = fetchMaven { + version = "12"; + baseName = "spice-parent"; + package = "/org/sonatype/spice"; + sha512 = "3bx63k5frr99ma5wcjlqlym7qr6x1m031hns35rpvz039s9cxcn8r3f7slwqaa7s19i3j46kwgxirnhs4ylcddql4rsibaqjwy9lh0d"; + type = "pom"; + }; + sonatypeSpiceParent_16 = fetchMaven { version = "16"; baseName = "spice-parent"; @@ -504,4 +656,12 @@ rec { sha512 = "3yraw37xwayyrvwa62y6li3wbzrha08j389psz16j1dawxmg78zlm2x1jmgz3nzdb60n9kk143606bgs3vrf7ri9d5pwkg9lvw7hk92"; type = "pom"; }; + + xbean_3_4 = fetchMaven { + version = "3.4"; + baseName = "xbean"; + package = "/org/apache/xbean"; + sha512 = "2qdd1srj7ahskmxp1cb3gkxgdmy0ms4m5mi43mvfrl085fp58f67ip2y0w4r0xfwzds12727yili6hciiwix9i6hx7wasi5sa9djcp6"; + type = "pom"; + }; } diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index a777d57ec2c..fac982b5be2 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -17,30 +17,46 @@ in { bsh_2_0_b4; inherit (callPackage ../development/java-modules/classworlds/classworlds.nix { inherit fetchMaven; }) + classworlds_1_1_alpha2 classworlds_1_1; inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; }) commonsCli_1_0; inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; }) + commonsLang_2_1 commonsLang_2_3; + inherit (callPackage ../development/java-modules/apache/commons-lang3.nix { inherit fetchMaven; }) + commonsLang3_3_1; + + inherit (callPackage ../development/java-modules/apache/commons-logging-api.nix { inherit fetchMaven; }) + commonsLoggingApi_1_1; + inherit (callPackage ../development/java-modules/findbugs/jsr305.nix { inherit fetchMaven; }) findbugsJsr305_2_0_1; + inherit (callPackage ../development/java-modules/google/collections.nix { inherit fetchMaven; }) + googleCollections_1_0; + inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; }) hamcrestCore_1_3; inherit (callPackage ../development/java-modules/junit { inherit mavenbuild fetchMaven; }) junit_3_8_1 + junit_3_8_2 junit_4_12; + inherit (callPackage ../development/java-modules/log4j { inherit fetchMaven; }) + log4j_1_2_12; + inherit (callPackage ../development/java-modules/maven/archiver.nix { inherit fetchMaven; }) mavenArchiver_2_5; inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; }) mavenArtifact_2_0_6 mavenArtifact_2_0_9 + mavenArtifact_2_2_1 mavenArtifact_3_0_3; inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; }) @@ -121,7 +137,8 @@ in { inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; }) mavenProject_2_0_6 - mavenProject_2_0_9; + mavenProject_2_0_9 + mavenProject_2_2_1; inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; }) mavenReportingApi_2_0_6 @@ -156,17 +173,34 @@ in { mavenToolchain_1_0 mavenToolchain_2_0_9; + inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; }) + plexusArchiver_2_1; + inherit (callPackage ../development/java-modules/plexus/build-api.nix { inherit fetchMaven; }) plexusBuildApi_0_0_4; + inherit (callPackage ../development/java-modules/plexus/classworlds.nix { inherit fetchMaven; }) + plexusClassworlds_2_2_2; + inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; }) plexusCompilerApi_2_2; + inherit (callPackage ../development/java-modules/plexus/compiler-javac.nix { inherit fetchMaven; }) + plexusCompilerJavac_2_2; + + inherit (callPackage ../development/java-modules/plexus/compiler-manager.nix { inherit fetchMaven; }) + plexusCompilerManager_2_2; + inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; }) plexusComponentAnnotations_1_5_5; inherit (callPackage ../development/java-modules/plexus/container-default.nix { inherit fetchMaven; }) - plexusContainerDefault_1_0_alpha9_stable1; + plexusContainerDefault_1_0_alpha9 + plexusContainerDefault_1_0_alpha9_stable1 + plexusContainerDefault_1_5_5; + + inherit (callPackage ../development/java-modules/plexus/digest.nix { inherit fetchMaven; }) + plexusDigest_1_0; inherit (callPackage ../development/java-modules/plexus/i18n.nix { inherit fetchMaven; }) plexusI18n_1_0_beta6; @@ -175,13 +209,29 @@ in { plexusInteractivityApi_1_0_alpha4; inherit (callPackage ../development/java-modules/plexus/interpolation.nix { inherit fetchMaven; }) - plexusInterpolation_1_13; + plexusInterpolation_1_11 + plexusInterpolation_1_12 + plexusInterpolation_1_13 + plexusInterpolation_1_15; + + inherit (callPackage ../development/java-modules/plexus/io.nix { inherit fetchMaven; }) + plexusIo_2_0_2; inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; }) + plexusUtils_1_0_4 plexusUtils_1_1 + plexusUtils_1_4_1 + plexusUtils_1_4_5 plexusUtils_1_5_1 + plexusUtils_1_5_5 plexusUtils_1_5_8 + plexusUtils_1_5_15 plexusUtils_2_0_5 plexusUtils_2_0_6 - plexusUtils_3_0; + plexusUtils_3_0 + plexusUtils_3_0_5 + plexusUtils_3_0_8; + + inherit (callPackage ../development/java-modules/apache/xbean-reflect.nix { inherit fetchMaven; }) + xbeanReflect_3_4; } From 5d54cfd7a4474c952faccd24dba10844f8348778 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 31 Oct 2016 13:25:27 -0400 Subject: [PATCH 006/274] junit_4_12 part 2 --- .../java-modules/apache/ant-launcher.nix | 14 +++ pkgs/development/java-modules/apache/ant.nix | 14 +++ .../java-modules/apache/commons-io.nix | 14 +++ .../java-modules/apache/commons-lang.nix | 11 ++ .../java-modules/build-maven-package.nix | 2 +- .../java-modules/junit/default.nix | 8 +- pkgs/development/java-modules/m2install.nix | 4 +- .../maven/common-artifact-filters.nix | 11 ++ .../java-modules/maven/plugin-annotations.nix | 11 ++ .../java-modules/maven/project.nix | 11 ++ .../java-modules/maven/surefire-api.nix | 11 ++ .../java-modules/maven/surefire-booter.nix | 11 ++ .../java-modules/maven/surefire-common.nix | 11 ++ .../java-modules/maven/toolchain.nix | 11 ++ .../java-modules/mojo/animal-sniffer.nix | 15 +++ .../java-modules/plexus/classworlds.nix | 11 ++ .../development/java-modules/plexus/utils.nix | 11 ++ pkgs/development/java-modules/poms.nix | 104 ++++++++++++++++++ pkgs/development/java-modules/sisu/guice.nix | 14 +++ .../java-modules/sisu/inject-bean.nix | 14 +++ .../java-modules/sisu/inject-plexus.nix | 14 +++ pkgs/development/java-modules/xerces/impl.nix | 14 +++ .../java-modules/xml-apis/default.nix | 14 +++ pkgs/top-level/java-packages.nix | 51 +++++++-- 24 files changed, 394 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/java-modules/apache/ant-launcher.nix create mode 100644 pkgs/development/java-modules/apache/ant.nix create mode 100644 pkgs/development/java-modules/apache/commons-io.nix create mode 100644 pkgs/development/java-modules/mojo/animal-sniffer.nix create mode 100644 pkgs/development/java-modules/sisu/guice.nix create mode 100644 pkgs/development/java-modules/sisu/inject-bean.nix create mode 100644 pkgs/development/java-modules/sisu/inject-plexus.nix create mode 100644 pkgs/development/java-modules/xerces/impl.nix create mode 100644 pkgs/development/java-modules/xml-apis/default.nix diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix new file mode 100644 index 00000000000..0e4d7b26765 --- /dev/null +++ b/pkgs/development/java-modules/apache/ant-launcher.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + antLauncher_1_8_2 = map (obj: fetchMaven { + version = "1.8.2"; + baseName = "ant-launcher"; + package = "/org/apache/ant"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3h1xmlamkh39lz3dgpbyxj0mai9a266qmxkcyb7kqpzkl0xxvgyi8i2l4nnn02n4qbxznhmvsba77v52ldh67qmhxk3vw1q3xqnn2xx"; } + { type = "pom"; sha512 = "3fvz9di9lbfgy5370gwwdp2d380gl42sn44kr97l8i7k0n9crrbjrxs2dpy9cnsnnavvk14nrrkc72n9f1gkg1dvdxqpxlwm0y9lxhy"; } + ]; +} diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix new file mode 100644 index 00000000000..fa83663f5ec --- /dev/null +++ b/pkgs/development/java-modules/apache/ant.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + ant_1_8_2 = map (obj: fetchMaven { + version = "1.8.2"; + baseName = "ant"; + package = "/org/apache/ant"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3x9m09i4kn57avkjbz57v1chx0356lp4mz77adslcbmr59gxfs3km1f4dq3lm1nxspldwxqk654yzh5sgrcfz13r1zlg3bvlsjbb1bs"; } + { type = "pom"; sha512 = "2h8ajn6x40cn8cicx3h167blkv9p6478l610xrp2n1k1zlfnh1rz2kcsi74gy7psb4h98118p3zp90gvw4h8gsphz1n30f3c96qnpiq"; } + ]; +} diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix new file mode 100644 index 00000000000..612dcb85f8e --- /dev/null +++ b/pkgs/development/java-modules/apache/commons-io.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + commonsIo_2_1 = map (obj: fetchMaven { + version = "2.1"; + baseName = "commons-io"; + package = "/commons-io"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "30bzhsnn2vhi3wfmkas58spl6sxvl9rvwkzaqf9z1lr3iz4iym6x1xgspgq1dvy7pwr7ajny1dfpj1l6vzh7adqm2b4pidjf2w00fp2"; } + { type = "jar"; sha512 = "14b2kcjsn12cnrl1qc7v7r48m9vmpw5h9jljhsx58ac8xrlb8g6l71j9lnhp8cf8vc3jwz4drrwn4l9p3r5sk02cparl3h2r0y4cp2c"; } + ]; +} diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix index 8987823e470..f6dc6b407ef 100644 --- a/pkgs/development/java-modules/apache/commons-lang.nix +++ b/pkgs/development/java-modules/apache/commons-lang.nix @@ -22,4 +22,15 @@ rec { { type = "pom"; sha512 = "0i94xb3fgq0ig0aids9r1h1kblhlf762gsjxh422ra23saa4474q4iywgfk596bpcflngf2sarq8ch6lw09p0g43779d23b74bd939n"; } { type = "jar"; sha512 = "1f30pryvd39m2yazflzy5l1h4l473dj8ccrd9v8z8lb6iassn4xc142f2snkzxlc7ncqsi6fbfd3zfxsy8afivmxmxds6mbsrxayqwk"; } ]; + + commonsLang_2_6 = map (obj: fetchMaven { + version = "2.6"; + baseName = "commons-lang"; + package = "/commons-lang"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "2b3yp5bawbh9b0gh56g35x03swrjv2c5jpvwjwric7ywadaf4p6cw1kmabldmi0y3rja5cypz7gfdm1pwdrpr9lmi48ijjssimmgsh1"; } + { type = "jar"; sha512 = "11gnsj6c1rz61j19wnr0j5rbdnl63hq9axwm7wwampmdq70n3m1szbn014phl8y3nccvrq2ifcgwb48q6jwqs50rki4bij196z3snja"; } + ]; } diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index a056953f9ab..203fa88aa00 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { echo "\ tmpm2file://$out/m2*\ $out/m2" >> $out/m2/settings.xml - ${maven}/bin/mvn clean install -Dmaven.test.skip=true -gs $out/m2/settings.xml + ${maven}/bin/mvn clean package -Dmaven.test.skip=true -Danimal.sniffer.skip=true -gs $out/m2/settings.xml cp -v ./target/*.jar $out/target/ ''; } diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 8304b1a8a01..5418679b78f 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -2,7 +2,9 @@ with pkgs.javaPackages; -rec { +let + poms = import (../poms.nix) { inherit fetchMaven; }; +in rec { junitGen = { mavenDeps, sha512, version }: mavenbuild rec { inherit mavenDeps sha512 version; @@ -48,7 +50,9 @@ rec { ]; junit_4_12 = junitGen { - mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ]; + mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ]) + ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenProject_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_1 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ] + ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 beanshell_2_0_b4 codehausParent_4 commonsParent_17 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenSharedComponents_11 mojoParent_32 plexus_1_0_12 plexusComponents_1_1_4 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]); sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9"; version = "4.12"; }; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index 56ae8132c61..88e8efca1a1 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: -{ version, baseName, package, sha512, type ? "jar" }: +{ version, baseName, package, sha512, type ? "jar", suffix ? "" }: let name = "${baseName}-${version}"; m2Path = "${package}/${baseName}/${version}"; - m2File = "${name}.${type}"; + m2File = "${name}${suffix}.${type}"; src = fetchurl rec { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix index 2b72293ac93..3949882f98b 100644 --- a/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven { + version = "1.2"; + baseName = "maven-common-artifact-filters"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "33g4qwxxnwdzx8h5xh5gjx8ijy6cmc5iyv0jgn70hvz1zqnilr49ibzjnichyb3m77zma30zb1njgw7fbnlx177ph5h2w0radkh3m88"; } + { type = "jar"; sha512 = "1z55x8hrb9g4kk21jsk9n4r26ncgsxinr18nmjgxsrcbaxcjhxbhx3nin24gwvcy6zh2d6gv26dng8i90ccc1qxvpmga2ahk68jfyjk"; } + ]; + mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven { version = "1.3"; baseName = "maven-common-artifact-filters"; diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix index 782e3e14100..6bd8928cf0f 100644 --- a/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -11,4 +11,15 @@ rec { { type = "pom"; sha512 = "2q1y622vaks1y2qjbq4005jmi41hpkivsrnmkf5kr3zndz4d6ai47d90jwr70pby8xqqsj461baljcjsicl6rrbq0v9ppyryr13q828"; } { type = "jar"; sha512 = "1jd8b32kl9kh4dxpdg5i9qf3haqc5br0mz8bl1ri4hb9qgwkzsijvx6jr7pv9zgplanwvgca3lhpgzsgs03n8jlqnbxbmgsv1pl93zb"; } ]; + + mavenPluginAnnotations_3_2 = map (obj: fetchMaven { + version = "3.2"; + baseName = "maven-plugin-annotations"; + package = "/org/apache/maven/plugin-tools"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "0ggvy7xhlgbpb7abc7vj0bhdqzfc6x0d4ldj7bl8qyi0qhv404qlfy4iqhn5jv3qwmj2pp9w4fa9jv5vsaz6yh8hpkzgdbpcwxdrmb9"; } + { type = "jar"; sha512 = "2j2lrm2dlikbpncz20r4yxhyi7h5dnhkxalvkih35m7fz57csbgd53whq969hixpfhyj18svd6695a3v4bfa94hg99mw78lzq8lwb37"; } + ]; } diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index 880f821f76c..25911fcdee8 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenProject_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-project"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "09dyyxwyjlr9q65r8zh7bsf41glpqxc9b6902s2s1clrs98k672kg04vq4fn569vx6hishna3kpxk8y7q5k5zpfy3g9wqsxcxhbqznx"; } + { type = "pom"; sha512 = "2fl4dl48cni9hqx0i7arrylcs028vymvmsa0wncbsz37g2gsxq462lqqd1swhgjnjqn1g6386rh6wq6j9mhpbm8kf741aypz9sf33wm"; } + ]; + mavenProject_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-project"; diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix index e7a561814e4..cd422bbb758 100644 --- a/pkgs/development/java-modules/maven/surefire-api.nix +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -11,4 +11,15 @@ rec { { type = "jar"; sha512 = "0chjp4jpfrhd99mpvh6v4sz71wgg8r0nyv8j2mgbsxsvbf0wha0za5g5bv16l4pflfigd4rhb2h1mkz51pb71qli8w39ycb3dw4lfpn"; } { type = "pom"; sha512 = "28ra2n9ln8nb5j1xh6mnxc4kfabnvyqyrgy2wwm66pxhp1fxxxqz1izfvih9jzr3cps7pbvqwql770i14cfyjzvl0zccjsscsjyy50r"; } ]; + + mavenSurefireApi_2_17 = map (obj: fetchMaven { + version = "2.17"; + baseName = "surefire-api"; + package = "/org/apache/maven/surefire"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "319kkasis86cqimkvsvmry60sj9m1f8vmhawpa8a56arqxfiqifnjiqfppydzlm3hlk8m4qgx3k5s291acbrv05297db8qbcrb2n688"; } + { type = "pom"; sha512 = "0p0yc6sq26jsa19iiqy8d0mw3q0i1jmqz21m8fp855i8q07iyqbd1lmzasfdbblki52fdyk986mdw26yhznkr29hgpy8qv7f0l6a5pz"; } + ]; } diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix index 8f4d79a9807..f7fb8068a26 100644 --- a/pkgs/development/java-modules/maven/surefire-booter.nix +++ b/pkgs/development/java-modules/maven/surefire-booter.nix @@ -11,4 +11,15 @@ rec { { type = "jar"; sha512 = "08l0r0s1jhjdgljh26m4i612kf6wqs6g8lwx9n0cccjjzlpn3sxg7dryagwp2gz2g9y5kpdmbpsxmp5imbdak3qrwa56wxrmik16jh8"; } { type = "pom"; sha512 = "3rj97rbbdm0m0f1cpbvw7mc9hc5jmfkqbg1w1ggr640bd8fzrgmxrcynxf440mf0wg4xy55v27g6v5c3z20zlw1h4qi500x6wfm0l5s"; } ]; + + mavenSurefireBooter_2_17 = map (obj: fetchMaven { + version = "2.17"; + baseName = "surefire-booter"; + package = "/org/apache/maven/surefire"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1x8nldyxzx56an3zskbq40i3aq4sp21jlnybmrd6pjzf4c3pgrd8qsxkvz23pxyfzvskpkgmibfpshng9qk18c5dm2h4n5sljp1ayni"; } + { type = "pom"; sha512 = "0w2ql9a70ncdvzicv0947q8jil4ksha42xxswqk1aas1bsg7qwpg8v4pih887y4zirnl861qaw6d1v09l1s3jqq7hxid0w3jxnlcasb"; } + ]; } diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix index c7bd2995c3a..4e56b0c5a86 100644 --- a/pkgs/development/java-modules/maven/surefire-common.nix +++ b/pkgs/development/java-modules/maven/surefire-common.nix @@ -11,4 +11,15 @@ rec { { type = "jar"; sha512 = "3ny5b6mnmka3lzyqk03flmizj82c0hdbiqgcqxj7261pvcf2drrk85p5q2z6f2h15w60mhyvl80p39pzqa35ziqhqnp6walg7rdk0hb"; } { type = "pom"; sha512 = "3iagspjgilwhbh5sxi64b2q8dpgrwa0s9wiw2417z2lvghy8knszha62n3j9qvbn7pxy819f2981s41aan6wcwx5scr9sg8jwbvcmff"; } ]; + + mavenSurefireCommon_2_17 = map (obj: fetchMaven { + version = "2.17"; + baseName = "maven-surefire-common"; + package = "/org/apache/maven/surefire"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2ikw1ddnxxfglb3k4920lfr8ziav5n2wp13452bxyd1gbhpwkq0js58wy9jbhyzqgdblqhfj3syxka0mxd4vngyg4iqw3c2phslmn6i"; } + { type = "pom"; sha512 = "1l2dkbzbi80bjsh4ri6gxw84iwzsm5g6mmhrj1ndrsr66d4cg7vg5nfyqxvf7xhzwj45768y5id09r70zijliavpsxrvjq5j0g05yb6"; } + ]; } diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix index 80622361512..97ea74a5e52 100644 --- a/pkgs/development/java-modules/maven/toolchain.nix +++ b/pkgs/development/java-modules/maven/toolchain.nix @@ -22,4 +22,15 @@ rec { { type = "jar"; sha512 = "37jjcjfx51bszg13wjhkv2spyw1b2n8glgyaaflzfqxmfhizr43y1fq2zhn2khp2jba6avilkqi9p0f2sd30glrg7lpc0srzqns3yn8"; } { type = "pom"; sha512 = "1r6w6za6smam46fpdfda2612ayz4a8gm87lgwa4f5jp5k92mzaj22rcsxlnibzly19vrgvycci63w9rgmzkwi2zvxxwxmf8sc5542c7"; } ]; + + mavenToolchain_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-toolchain"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "02ya75k4n4w62s9p5y1mq758s33s6vqcqli77hknr4wn22rr5fgaax8qscdnj90w3y6rkr6w0afiw438wr4hxwns5vp90fkzym87bp6"; } + { type = "pom"; sha512 = "1iv6k0pwyq2w5l4gfkmh818mrja0il48sajmgnpnn7ayi2238mbja07sqccm75wmzapb4039p7xq2jfp0vm41y3s00410gq3jgnf2pw"; } + ]; } diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix new file mode 100644 index 00000000000..b6a5565f6fc --- /dev/null +++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix @@ -0,0 +1,15 @@ +{ fetchMaven }: + +rec { + mojoAnimalSniffer_1_11 = map (obj: fetchMaven { + version = "1.11"; + baseName = "animal-sniffer"; + package = "/org/codehaus/mojo"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "36qx2q1zaja470zj7w3ygafb5n07vb623yicgwjqf1nak7ianin5nlmh7pp2pzpdd9arvg7d005rnsn79bqmxcb6y1ihsxsh6l7bmsv"; } + { type = "pom"; sha512 = "1dp427c8vyiw255193s4m0ffag6ngqxfkj1cwl7v40p5c1bh8avxaj8cg56nn8ajp39shxr5wgwgjs7xwjz46yjnblh9pl29z58lm4i"; } + ]; +} + diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix index 44b5ff3441a..308287a2904 100644 --- a/pkgs/development/java-modules/plexus/classworlds.nix +++ b/pkgs/development/java-modules/plexus/classworlds.nix @@ -11,4 +11,15 @@ rec { { type = "jar"; sha512 = "0w6mhv2xjafqr45zx5fwm8iyp8kabrdvyx91qxwy04k71ah6zxzqx1l8ppq7xma4r40lpp98valr1ydgfm1cay87j1kbdgaw2j48vns"; } { type = "pom"; sha512 = "12kxa236gg61gs6cshgwnsj0yfpywcb606j10l9hflp951vxvlcwpcdh1nlpir0zyqj7rnk5g8609grwahq2m62fs1ymqp8db2rqi56"; } ]; + + plexusClassworlds_2_4 = map (obj: fetchMaven { + version = "2.4"; + baseName = "plexus-classworlds"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1299qgrf60pz9a40wccb1376wibk99rf79x8dw9z2c97gyzxb3narkpna3fk9wqs7a89p18d2b7zi7vxr3wcdhw6n8saxggz44w9gpq"; } + { type = "pom"; sha512 = "1g2xisql030wjb8kvrfp0qcip2b4jbf4islmxa0k1fvjyrzms5babgdpx7m75g29dl8s649z8fb90wrrqc7g14y9g74lydc9i6rd2q5"; } + ]; } diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index 137ac01c02d..2cfdd60ccae 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -67,6 +67,17 @@ rec { { type = "pom"; sha512 = "29knasqhkvjif27gm3ycqhc206ycgc9920mccw7biybxmiqqajyfvv74f02sqpavlk5h6l45cfb20bmldwfznvzz9bw4zhvc12s9y5h"; } ]; + plexusUtils_1_5_6 = map (obj: fetchMaven { + version = "1.5.6"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "26p385szy6sphplalxc9750f29z7fnvmaz7m1fv0mx7p7qmvkk6pm5m4kl636m8jsflkfmzh4f4y5vj5vhxypfyc4pdzfsp9xyc3vwq"; } + { type = "pom"; sha512 = "261yv9sgjmslxjsfx7fj1ma53ld930qxic4br5m88wv96skyni09w2nh9sslgrmpxj3q89ykhq3fciscn40066v1qn0h0f6lbk3w68r"; } + ]; + plexusUtils_1_5_8 = map (obj: fetchMaven { version = "1.5.8"; baseName = "plexus-utils"; diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 2b3f2861399..ee19aaf2103 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -17,6 +17,22 @@ rec { type = "pom"; }; + antParent_1_8_2 = fetchMaven { + version = "1.8.2"; + baseName = "ant-parent"; + package = "/org/apache/ant"; + sha512 = "1q560n9xbqk9qpprvm0nigd5nhm9s8m027qxjmzhay083sjrazscpaly4mzgry5lpdmr3xyhly1r1s88879y04qr5xqzqh0j45j943x"; + type = "pom"; + }; + + apache_1 = fetchMaven { + version = "1"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "0vbf7mbs61n13dmxndvzkafr0sg9p7g45ng9j1917cz8a9m4zflqf7xvpp9wfprmb4d1wd3ay2hhy9brxryqmvx41wfjlk9ahg34k0h"; + type = "pom"; + }; + apache_3 = fetchMaven { version = "3"; baseName = "apache"; @@ -49,6 +65,14 @@ rec { type = "pom"; }; + apache_7 = fetchMaven { + version = "7"; + baseName = "apache"; + package = "/org/apache"; + sha512 = "2yvwxxifqypmpgxyx10ggj6l52jnl64f9554kyfdph7z56n02bcalj3cr43m6br0as6yc67k5p23l2k3gvdr66c5dfw1l8rwhahk9lr"; + type = "pom"; + }; + apache_9 = fetchMaven { version = "9"; baseName = "apache"; @@ -105,6 +129,14 @@ rec { type = "pom"; }; + commonsParent_17 = fetchMaven { + version = "17"; + baseName = "commons-parent"; + package = "/org/apache/commons"; + sha512 = "31ijvmfj2yybfy0n4qh7ga8192wg75hs5v26vwm98hgvlppxs9irik4qlqzh4iqq0azp0xl8idz6nn6yb9vzsjxax4c3v5wyk3yvyfy"; + type = "pom"; + }; + commonsParent_22 = fetchMaven { version = "22"; baseName = "commons-parent"; @@ -169,6 +201,14 @@ rec { type = "pom"; }; + maven_2_0_1 = fetchMaven { + version = "2.0.1"; + baseName = "maven"; + package = "/org/apache/maven"; + sha512 = "02n3kpll7w5iqaijawmm4rzr35sbv826c9vp1fzfnrgbvpfw22yrsjv2z416pzk2qyjh3wx7pc5xxxxdchmpzcxm694vsdl67ki2rrz"; + type = "pom"; + }; + maven_2_0_6 = fetchMaven { version = "2.0.6"; baseName = "maven"; @@ -305,6 +345,14 @@ rec { type = "pom"; }; + mavenPluginTools_3_2 = fetchMaven { + version = "3.2"; + baseName = "maven-plugin-tools"; + package = "/org/apache/maven/plugin-tools"; + sha512 = "28qhbacsb69rcp86l3lkc3d83267qdwwpl0zm134rxi58wy4y4rd8nz2yzk6yx4x8h0drq776b2qnr4ps1da1ybsvsi2sc655scx3lf"; + type = "pom"; + }; + mavenReporting_2_0_6 = fetchMaven { version = "2.0.6"; baseName = "maven-reporting"; @@ -321,6 +369,14 @@ rec { type = "pom"; }; + mavenSharedComponents_11 = fetchMaven { + version = "11"; + baseName = "maven-shared-components"; + package = "/org/apache/maven/shared"; + sha512 = "3g30bgx3nhw1pwq5nq7ns17vs53cck3zrk6b4sqh56my7vhdv08v0n94l326q9f51sxvnsn11zmpnn8zri8hz2ci1g61ymgi2d0mxyd"; + type = "pom"; + }; + mavenSharedComponents_12 = fetchMaven { version = "12"; baseName = "maven-shared-components"; @@ -385,6 +441,14 @@ rec { type = "pom"; }; + plexus_1_0_12 = fetchMaven { + version = "1.0.12"; + baseName = "plexus"; + package = "/org/codehaus/plexus"; + sha512 = "2ckzb1z4hgmp2r61a05v3aqapkfnyfs4b7wrf60aiymrz57kliyq3nn50h7bj6ak9hlpyzxpqgqps0chzfpizr8v0abdkjmbplvw2ai"; + type = "pom"; + }; + plexus_2_0_2 = fetchMaven { version = "2.0.2"; baseName = "plexus"; @@ -545,6 +609,38 @@ rec { type = "pom"; }; + sisuInject_2_1_1 = fetchMaven { + version = "2.1.1"; + baseName = "sisu-inject"; + package = "/org/sonatype/sisu"; + sha512 = "0720p7ai7l1wqs2rfcgpvgd1rc3p2bdpp51a57jmqbgh9msr54iy0c6n0ipybd9lrl88iz4l8cc1s73qj5appf8r481bbwgv4wxi19v"; + type = "pom"; + }; + + sisuInjectGuiceBean_2_1_1 = fetchMaven { + version = "2.1.1"; + baseName = "guice-bean"; + package = "/org/sonatype/sisu/inject"; + sha512 = "2arva9197d03whnavfspz8wm7fw8iqrhacp10984lxwig221m34p5bb9vmhn8bbswf7d8whzf9q5lsq9mxbmd2c90kc1m7n7qja6qq5"; + type = "pom"; + }; + + sisuInjectGuicePlexus_2_1_1 = fetchMaven { + version = "2.1.1"; + baseName = "guice-plexus"; + package = "/org/sonatype/sisu/inject"; + sha512 = "0gspz9n6vbnlbx33xynm4sg0wxlr89i8490gcl0y0qw6mvjjqfwv1dqgncm9xp41mb21i00gxq0ml6d4wfr0sdayk9m736b826lrvq4"; + type = "pom"; + }; + + sisuParent_2_1_1 = fetchMaven { + version = "2.1.1"; + baseName = "sisu-parent"; + package = "/org/sonatype/sisu"; + sha512 = "2z006ib6azrxf5s02ixv5plc1db0rglnv2m8k4il0s144v63ay98wjxawcc1chld64iribhhby6wnlv2fxvv8sl9mr03qb2q2isflgc"; + type = "pom"; + }; + slf4jApi_1_5_6 = fetchMaven { version = "1.5.6"; baseName = "slf4j-api"; @@ -593,6 +689,14 @@ rec { type = "pom"; }; + sonatypeForgeParent_7 = fetchMaven { + version = "7"; + baseName = "forge-parent"; + package = "/org/sonatype/forge"; + sha512 = "3l6c336cm6wnrw2l7lr0wg83w1304bggvw4qydh5bqbbyfpdgwqa3pbfkq4x760k3wqwarnlpf31fz2dp6abrynjl4rr1lv68j1hhyn"; + type = "pom"; + }; + sonatypeForgeParent_10 = fetchMaven { version = "10"; baseName = "forge-parent"; diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix new file mode 100644 index 00000000000..9fb70fad446 --- /dev/null +++ b/pkgs/development/java-modules/sisu/guice.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + sisuGuice_2_9_4 = map (obj: fetchMaven { + version = "2.9.4"; + baseName = "sisu-guice"; + package = "/org/sonatype/sisu"; + suffix = "-no_aop"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1529vg4r0gy3ss68lprkdf13r79r0lng4iyx68gj94cf806li9kayi9p2byl6axbx174cvam9w3l90qcdsdz14vrvm163b2r8sq927m"; } + ]; +} diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix new file mode 100644 index 00000000000..fba7130cfbd --- /dev/null +++ b/pkgs/development/java-modules/sisu/inject-bean.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + sisuInjectBean_2_1_1 = map (obj: fetchMaven { + version = "2.1.1"; + baseName = "sisu-inject-bean"; + package = "/org/sonatype/sisu"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0cqplf149dlqyqwaqk3bjlki97fbnav57vv5d9kkd2lvdradp7k89m5niwg5qgsfdlj91zidgrrkls5vyr4dcdy3lhxs1wyr4y8r0qb"; } + { type = "pom"; sha512 = "39dwwfh1p56crmx187wbm2kskxbcr0dfysdvqiwjfx91yhh64l9672axi28hdaw1qd5dh6whzxfqqlfjac94r37wv6fq5pkx6acp2dn"; } + ]; +} diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix new file mode 100644 index 00000000000..73335ec951e --- /dev/null +++ b/pkgs/development/java-modules/sisu/inject-plexus.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + sisuInjectPlexus_2_1_1 = map (obj: fetchMaven { + version = "2.1.1"; + baseName = "sisu-inject-plexus"; + package = "/org/sonatype/sisu"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0qklkc024xc58ayl6503ig1yhpsvhxk5fc9vfb7xny9v8w2ds3f9yvd275n8iyy6iza0kj8xlk0clq1i50k96j11lf401r2vcfnk69g"; } + { type = "pom"; sha512 = "1fcpyrjz82v0lncyndrw61bb1p9kxzlikiw6qk2v71zgfz2cggw694g26nxsppab2d1ps689sijb9i934vf5bpkdvkc52ipbc43jwr4"; } + ]; +} diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix new file mode 100644 index 00000000000..7b04e21f50e --- /dev/null +++ b/pkgs/development/java-modules/xerces/impl.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + xercesImpl_2_8_0 = map (obj: fetchMaven { + version = "2.8.0"; + baseName = "xercesImpl"; + package = "/xerces"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "09nwhb52g4ak92l8d0aymasbgjxmk4s7vp7i55l38x21zq1plxxkdp2sdk110qyg5mw06y433v28fm867jybpca8zrx51w4g7wg0w2y"; } + { type = "pom"; sha512 = "3lv2zqm25mmirazrpp53dicd3ficy32mdr3r7bc7xhmjky2r0051vzh5k0c01rwlb4kx0rinysxw9k20ml96ivw6ipwlrvpxjwgb74f"; } + ]; +} diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix new file mode 100644 index 00000000000..44044a35a57 --- /dev/null +++ b/pkgs/development/java-modules/xml-apis/default.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + xmlApis_1_3_03 = map (obj: fetchMaven { + version = "1.3.03"; + baseName = "xml-apis"; + package = "/xml-apis"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2sx6rm0lgzidcq1q81gnwxcj1himyny986ys6r60r3ws1p4bgxprargh5fdrmkp90djqzvy6d5b0sa0zfg1r9spynjbc8rjbr6agys9"; } + { type = "pom"; sha512 = "2n2pjaclvgllb8nzqkibvp1pida7sr9kmz0ngmsdrpk7sh5wrh32ri82gdj5l9mc1z88dwjyn1ydz6aazw36gdqqdwj3ba1mqs6pqmh"; } + ]; +} diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index fac982b5be2..2865418eb92 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -13,6 +13,12 @@ in { inherit (callPackage ../development/java-modules/eclipse/aether-util.nix { inherit fetchMaven; }) aetherUtil_0_9_0_M2; + inherit (callPackage ../development/java-modules/apache/ant.nix { inherit fetchMaven; }) + ant_1_8_2; + + inherit (callPackage ../development/java-modules/apache/ant-launcher.nix { inherit fetchMaven; }) + antLauncher_1_8_2; + inherit (callPackage ../development/java-modules/beanshell/bsh.nix { inherit fetchMaven; }) bsh_2_0_b4; @@ -23,9 +29,13 @@ in { inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; }) commonsCli_1_0; + inherit (callPackage ../development/java-modules/apache/commons-io.nix { inherit fetchMaven; }) + commonsIo_2_1; + inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; }) commonsLang_2_1 - commonsLang_2_3; + commonsLang_2_3 + commonsLang_2_6; inherit (callPackage ../development/java-modules/apache/commons-lang3.nix { inherit fetchMaven; }) commonsLang3_3_1; @@ -65,6 +75,7 @@ in { mavenArtifactManager_2_2_1; inherit (callPackage ../development/java-modules/maven/common-artifact-filters.nix { inherit fetchMaven; }) + mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_3 mavenCommonArtifactFilters_1_4; @@ -107,7 +118,8 @@ in { mavenMonitor_2_2_1; inherit (callPackage ../development/java-modules/maven/plugin-annotations.nix { inherit fetchMaven; }) - mavenPluginAnnotations_3_1; + mavenPluginAnnotations_3_1 + mavenPluginAnnotations_3_2; inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; }) mavenPluginApi_2_0_6 @@ -136,6 +148,7 @@ in { mavenProfile_2_2_1; inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; }) + mavenProject_2_0_1 mavenProject_2_0_6 mavenProject_2_0_9 mavenProject_2_2_1; @@ -161,17 +174,24 @@ in { mavenSharedUtils_0_1; inherit (callPackage ../development/java-modules/maven/surefire-api.nix { inherit fetchMaven; }) - mavenSurefireApi_2_12_4; + mavenSurefireApi_2_12_4 + mavenSurefireApi_2_17; inherit (callPackage ../development/java-modules/maven/surefire-booter.nix { inherit fetchMaven; }) - mavenSurefireBooter_2_12_4; + mavenSurefireBooter_2_12_4 + mavenSurefireBooter_2_17; inherit (callPackage ../development/java-modules/maven/surefire-common.nix { inherit fetchMaven; }) - mavenSurefireCommon_2_12_4; + mavenSurefireCommon_2_12_4 + mavenSurefireCommon_2_17; inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; }) mavenToolchain_1_0 - mavenToolchain_2_0_9; + mavenToolchain_2_0_9 + mavenToolchain_2_2_1; + + inherit (callPackage ../development/java-modules/mojo/animal-sniffer.nix { inherit fetchMaven; }) + mojoAnimalSniffer_1_11; inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; }) plexusArchiver_2_1; @@ -180,7 +200,8 @@ in { plexusBuildApi_0_0_4; inherit (callPackage ../development/java-modules/plexus/classworlds.nix { inherit fetchMaven; }) - plexusClassworlds_2_2_2; + plexusClassworlds_2_2_2 + plexusClassworlds_2_4; inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; }) plexusCompilerApi_2_2; @@ -224,6 +245,7 @@ in { plexusUtils_1_4_5 plexusUtils_1_5_1 plexusUtils_1_5_5 + plexusUtils_1_5_6 plexusUtils_1_5_8 plexusUtils_1_5_15 plexusUtils_2_0_5 @@ -232,6 +254,21 @@ in { plexusUtils_3_0_5 plexusUtils_3_0_8; + inherit (callPackage ../development/java-modules/sisu/guice.nix { inherit fetchMaven; }) + sisuGuice_2_9_4; + + inherit (callPackage ../development/java-modules/sisu/inject-bean.nix { inherit fetchMaven; }) + sisuInjectBean_2_1_1; + + inherit (callPackage ../development/java-modules/sisu/inject-plexus.nix { inherit fetchMaven; }) + sisuInjectPlexus_2_1_1; + inherit (callPackage ../development/java-modules/apache/xbean-reflect.nix { inherit fetchMaven; }) xbeanReflect_3_4; + + inherit (callPackage ../development/java-modules/xerces/impl.nix { inherit fetchMaven; }) + xercesImpl_2_8_0; + + inherit (callPackage ../development/java-modules/xml-apis { inherit fetchMaven; }) + xmlApis_1_3_03; } From 0e10bfa24646637e7054eb8235b260e02c6953a0 Mon Sep 17 00:00:00 2001 From: NeQuissimus Date: Mon, 14 Nov 2016 19:23:08 -0500 Subject: [PATCH 007/274] maven_hello: Add 1.1, add ability to choose skipping tests --- pkgs/development/java-modules/build-maven-package.nix | 4 ++-- pkgs/development/java-modules/maven-hello/default.nix | 11 +++++++++-- pkgs/top-level/java-packages.nix | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 203fa88aa00..10dabadb50c 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,5 +1,5 @@ { stdenv, maven, pkgs }: -{ mavenDeps, src, name, meta, m2Path, ... }: +{ mavenDeps, src, name, meta, m2Path, skipTests ? true, ... }: with builtins; with stdenv.lib; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { echo "\ tmpm2file://$out/m2*\ $out/m2" >> $out/m2/settings.xml - ${maven}/bin/mvn clean package -Dmaven.test.skip=true -Danimal.sniffer.skip=true -gs $out/m2/settings.xml + ${maven}/bin/mvn clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml cp -v ./target/*.jar $out/target/ ''; } diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index feb3146ffd6..a1a6cfce6b4 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -3,8 +3,8 @@ with pkgs.javaPackages; rec { - mavenHelloRec = { mavenDeps, sha512, version }: mavenbuild rec { - inherit mavenDeps sha512 version; + mavenHelloRec = { mavenDeps, sha512, version, skipTests }: mavenbuild rec { + inherit mavenDeps sha512 version skipTests; name = "maven-hello-${version}"; src = pkgs.fetchFromGitHub { @@ -30,4 +30,11 @@ rec { sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2"; version = "1.0"; }; + + mavenHello_1_1 = mavenHelloRec { + mavenDeps = [ junit_4_12 ]; + sha512 = "3dhgl5z3nzqskjjcggrjyz37r20b0m5vhfzbx382qyqcy4d2jdhkl7v1ajhcg8vkz0qdzq85k09w5is81hybv8sd09h3hgb3rrigdaq"; + version = "1.1"; + skipTests = false; + }; } diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 2865418eb92..488f4cb59db 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -104,7 +104,8 @@ in { mavenFiltering_1_1; inherit (callPackage ../development/java-modules/maven-hello { inherit mavenbuild; }) - mavenHello_1_0; + mavenHello_1_0 + mavenHello_1_1; inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; }) mavenModel_2_0_6 From 63a46e0914fb1eb40c1903998faf10ffe3383cc5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 14:18:19 -0500 Subject: [PATCH 008/274] Complete hello world with test --- .../java-modules/apache/commons-cli.nix | 11 +++ .../java-modules/build-maven-package.nix | 14 ++-- .../development/java-modules/hamcrest/all.nix | 15 ++++ .../java-modules/junit/default.nix | 4 +- .../java-modules/maven-hello/default.nix | 13 +-- .../java-modules/maven/artifact-manager.nix | 11 +++ .../java-modules/maven/artifact.nix | 22 +++++ pkgs/development/java-modules/maven/core.nix | 11 +++ .../java-modules/maven/doxia-sink-api.nix | 11 +++ .../java-modules/maven/error-diagnostics.nix | 11 +++ pkgs/development/java-modules/maven/model.nix | 11 +++ .../java-modules/maven/monitor.nix | 11 +++ .../java-modules/maven/plugin-api.nix | 11 +++ .../java-modules/maven/plugin-descriptor.nix | 11 +++ .../maven/plugin-parameter-documenter.nix | 11 +++ .../java-modules/maven/plugin-registry.nix | 11 +++ .../maven/plugin-testing-harness.nix | 14 ++++ .../java-modules/maven/profile.nix | 11 +++ .../java-modules/maven/project.nix | 11 +++ .../java-modules/maven/reporting-api.nix | 22 +++++ .../maven/repository-metadata.nix | 11 +++ .../java-modules/maven/settings.nix | 11 +++ .../java-modules/maven/surefire-junit4.nix | 14 ++++ .../mojo/java-boot-classpath-detector.nix | 14 ++++ pkgs/development/java-modules/ow2/asm-all.nix | 15 ++++ .../java-modules/plexus/archiver.nix | 11 +++ .../development/java-modules/plexus/utils.nix | 22 +++++ pkgs/development/java-modules/poms.nix | 80 +++++++++++++++++++ pkgs/top-level/java-packages.nix | 41 +++++++++- 29 files changed, 451 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/java-modules/hamcrest/all.nix create mode 100644 pkgs/development/java-modules/maven/plugin-testing-harness.nix create mode 100644 pkgs/development/java-modules/maven/surefire-junit4.nix create mode 100644 pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix create mode 100644 pkgs/development/java-modules/ow2/asm-all.nix diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix index 74087a04e0c..ffad5632b0a 100644 --- a/pkgs/development/java-modules/apache/commons-cli.nix +++ b/pkgs/development/java-modules/apache/commons-cli.nix @@ -11,4 +11,15 @@ rec { { type = "pom"; sha512 = "1pm5ba95viabcgpjhsqw21iwis9ajn8hwpyc6rzs9frr5k62hs7lj8darxmmp21hf14mxrs37a8swayhagq6i6g8js4nl4r8mmwjlvp"; } { type = "jar"; sha512 = "0ybdbpfzadkncwcmnzkscbp2fhmcsqmpy60qppz7s8hs00hgqy64jr4qpdyz5bj0l4bc434vn0pv4gzxzi7y1lhh7b2rk4zv1mgs3ff"; } ]; + + commonsCli_1_2 = map (obj: fetchMaven { + version = "1.2"; + baseName = "commons-cli"; + package = "/commons-cli"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "3lrjnrkq0vq1mjp1z6zbi6x0x45hj20yvs74aqnpzayd0prwv22hyfyadgrj343is54s6m2p5mx2kpziqz9wcih5hmwg5f80ni8mxp7"; } + { type = "jar"; sha512 = "2mdzpng0cybpnw5dw1q4dmpn2i89zhg13m8xjv8pdbn5q28zsf8m3m7w0y8irbjyplwrfdrxipkxxvnz5f61bxi4s85hnm0sc84d3qb"; } + ]; } diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 10dabadb50c..d83b43ffd75 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,5 +1,5 @@ { stdenv, maven, pkgs }: -{ mavenDeps, src, name, meta, m2Path, skipTests ? true, ... }: +{ mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }: with builtins; with stdenv.lib; @@ -13,8 +13,8 @@ in stdenv.mkDerivation rec { propagatedBuildInput = [ maven ] ++ flatDeps; - find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; - copy = ''cp -rs ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2''; + find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; + copy = ''cp -rsfu ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2''; phases = [ "unpackPhase" "buildPhase" ]; @@ -23,10 +23,12 @@ in stdenv.mkDerivation rec { mkdir -p $out/m2/${m2Path} ${optionalString (length flatDeps > 0) find} ${optionalString (length flatDeps > 0) copy} + if [ -f $out/m2/settings.xml ]; then rm $out/m2/settings.xml; fi echo "\ - tmpm2file://$out/m2*\ - $out/m2" >> $out/m2/settings.xml - ${maven}/bin/mvn clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml + tmpm2file://$out/m2*\ + $out/m2/" >> $out/m2/settings.xml + ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml + cp ./target/*.jar $out/m2/${m2Path} cp -v ./target/*.jar $out/target/ ''; } diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix new file mode 100644 index 00000000000..2bba1ac9249 --- /dev/null +++ b/pkgs/development/java-modules/hamcrest/all.nix @@ -0,0 +1,15 @@ +{ fetchMaven }: + +rec { + hamcrestAll_1_3 = map (obj: fetchMaven { + version = "1.3"; + baseName = "hamcrest-all"; + package = "/org/hamcrest"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3pmh19hhwr2vcvj3wqx0m8gipilny4ap9gax1xpks4k5pwykh74w0x9iwpns7cl8r7kqd6rbq4khhc0shcmfh6gydr8ax201wc7lvb8"; } + { type = "pom"; sha512 = "1w0byl3qy1gq2d8r66fzpffalc7pqm82iz5k3bqcxhclb60ifadmsxi1icqdhfpa29gvr5p1j5723zqpr11dk9w3p16njxc0arqxp2h"; } + ]; +} + diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 5418679b78f..84ccef3975d 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -51,8 +51,8 @@ in rec { junit_4_12 = junitGen { mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ]) - ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenProject_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_1 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ] - ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 beanshell_2_0_b4 codehausParent_4 commonsParent_17 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenSharedComponents_11 mojoParent_32 plexus_1_0_12 plexusComponents_1_1_4 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]); + ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_1 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenArtifactManager_2_0_1 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenCore_2_0_1 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_1 mavenModel_2_0_1 mavenModel_3_0_3 mavenMonitor_2_0_1 mavenPluginApi_2_0_1 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginDescriptor_2_0_1 mavenPluginParameterDocumenter_2_0_1 mavenPluginRegistry_2_0_1 mavenPluginTestingHarness_1_1 mavenProfile_2_0_1 mavenProject_2_0_1 mavenProject_2_0_8 mavenReportingApi_2_0_1 mavenReportingApi_2_2_1 mavenRepositoryMetadata_2_0_1 mavenSettings_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ] + ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 asmParent_4_0 beanshell_2_0_b4 codehausParent_4 commonsParent_11 commonsParent_17 doxia_1_0_alpha6 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_2_0_8 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenReporting_2_0_1 mavenReporting_2_2_1 mavenSharedComponents_7 mavenSharedComponents_11 mojoParent_32 ow2_1_3 plexus_1_0_12 plexusComponents_1_1_4 plexusComponents_1_1_6 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]); sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9"; version = "4.12"; }; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index a1a6cfce6b4..1ac023ec534 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -2,9 +2,11 @@ with pkgs.javaPackages; -rec { - mavenHelloRec = { mavenDeps, sha512, version, skipTests }: mavenbuild rec { - inherit mavenDeps sha512 version skipTests; +let + poms = import ../poms.nix { inherit fetchMaven; }; +in rec { + mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec { + inherit mavenDeps sha512 version skipTests quiet; name = "maven-hello-${version}"; src = pkgs.fetchFromGitHub { @@ -32,9 +34,10 @@ rec { }; mavenHello_1_1 = mavenHelloRec { - mavenDeps = [ junit_4_12 ]; - sha512 = "3dhgl5z3nzqskjjcggrjyz37r20b0m5vhfzbx382qyqcy4d2jdhkl7v1ajhcg8vkz0qdzq85k09w5is81hybv8sd09h3hgb3rrigdaq"; + mavenDeps = [ junit_4_12 mavenSurefireJunit4_2_12_4 hamcrestCore_1_3 ] ++ (with poms; [ surefireProviders_2_12_4 ]); + sha512 = "2f13592blvfgwad61174fza99ncb5jlch4sjjindk1pcaixqw26fnjfxb4ck80cknkihvcsylhviyfvhpm1ivvpg0zkicxva37cr4ri"; version = "1.1"; skipTests = false; + quiet = false; }; } diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix index 031bd37eb6f..6d7e0caadfd 100644 --- a/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenArtifactManager_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-artifact-manager"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0xciyvsl2l6fnd5k5dbhz5iih66fgacdagcrflk6cfiiv3qng5zrhx61v9fbjr0fpxbj7rswkczv7vn46359nlkb80513jwhzs8gqwv"; } + { type = "pom"; sha512 = "1j20ygljm0qa10ryw72j9q4jlwnsjdrcdg08a10ar456zi8gxzszp5cd0xsp0j29q69bp3wck2ggfr028v0zxivxgvakm4fa6l33sya"; } + ]; + mavenArtifactManager_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-artifact-manager"; diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix index 1cbb347baf4..224570f910f 100644 --- a/pkgs/development/java-modules/maven/artifact.nix +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenArtifact_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-artifact"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3xmim81k0p3l7fpgr8xlbj3mcz83d1rw3nwzdlrnwh3nkc5xryxl8fx499351vjlmjs009bhd68a20v59y3flxz8hxiy07cijgcbqnx"; } + { type = "pom"; sha512 = "30y2mirgqvdm3gdalxkzjljswh9xhygsw6v2jfrd9y61wqng2hzyn7dawkn5q4cyiknmw1b9660pvbnysvh3rbic75lhw5xqqgdjmih"; } + ]; + mavenArtifact_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-artifact"; @@ -12,6 +23,17 @@ rec { { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; } ]; + mavenArtifact_2_0_8 = map (obj: fetchMaven { + version = "2.0.8"; + baseName = "maven-artifact"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0i2xd2fkvp5glb7yx8zhh96px4v2yq0bgxa6xxcy6if0sn8c3vps8jmd1z3ys27jzj1gvwgg4rpa17k0nk1c8szz1v7vwvyhp7s22pi"; } + { type = "pom"; sha512 = "37563kfswgk9yfzm46vk4nr44rncdd3y705vgg20lj4nsrqn7iwg55fx1a4f039gbaf8dzb6xwp0ypyspsx9q742wkwrsr5q41d99v7"; } + ]; + mavenArtifact_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-artifact"; diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix index d135bd28657..ed3313bba59 100644 --- a/pkgs/development/java-modules/maven/core.nix +++ b/pkgs/development/java-modules/maven/core.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenCore_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-core"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "1iv0bg9z6zmlihxnynccdq0ivgk0bdi2vk863ii59qqnqp9wqcswx0bc60hyfasjm4d8m30b60www56v6y05mjjbpir4mmrjdbxw9gd"; } + { type = "jar"; sha512 = "04hrkgcpvxdisdgcp1mslkylm0b461mp42mylwpm6xdi9lcfdbd97k2rybvwgxd0y9r9j72ahm4fsqjb53xlz4737w96cmynpr8mrz4"; } + ]; + mavenCore_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-core"; diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix index 7454f7bbc96..18ccf4b707a 100644 --- a/pkgs/development/java-modules/maven/doxia-sink-api.nix +++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven { + version = "1.0-alpha-6"; + baseName = "doxia-sink-api"; + package = "/org/apache/maven/doxia"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "156j8ic3m2j23nrh074j567qxcsqi8ahpl97ba68l88cq08al1z7mh72hm8jz24lq04kxkrf3r1icqbpki10jgv7qma0cpz86yw27x2"; } + { type = "jar"; sha512 = "12yqdygds5w4dx8zxq4ss65a28pqrhavzzmgi3n7473r1k5r3kiw5h5bm71zdhccv5lgb4lb9p9lswa2pjkwriykfm3fj0l3924x6dk"; } + ]; + mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven { version = "1.0-alpha-7"; baseName = "doxia-sink-api"; diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix index 8f3cd0a4485..6f22316edc7 100644 --- a/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-error-diagnostics"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2jva1b8myaxy6y56rkqh8lynj36rj1apsgasc8i9qrigrw2wjk9yhsywv2ylmbspva1aypn23di7bd5bfb7vhaxhlqrlakdx5pqv7kh"; } + { type = "pom"; sha512 = "250x4ajr37nlch6n502ggfmr558hvhdxfgwjr28svvbxlyhk73h2nz9r95gvkfymv32dml8j1d4cgy3zs3qy2wzb679pnyckjwpdq9z"; } + ]; + mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-error-diagnostics"; diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix index 41b2458550d..70bfd34e737 100644 --- a/pkgs/development/java-modules/maven/model.nix +++ b/pkgs/development/java-modules/maven/model.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenModel_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-model"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2y6dqd0xlkkmff5gwfnc5pk0w6zpircj7mrvfw2nwvsaxx9cw3fkn33m3bamzyz1zv5w1vlrlrnynifvm3mzfrgkl3dxa16p00yj5wp"; } + { type = "pom"; sha512 = "0mnjzcansaxakip9b2nq7pxl2nbf9033if8bap658q9i9fbm8b6djqs09frmdds1vns44vlirvmm94s2k7i1lswmsqjgv3p12lrvbb1"; } + ]; + mavenModel_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-model"; diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix index 699d34bbf93..0a71d7ba5a4 100644 --- a/pkgs/development/java-modules/maven/monitor.nix +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenMonitor_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-monitor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1jp0kf3hyvk3x25fnxb9qi1yxs4lk1bpc9r76fvkggm7xhda4k2cr4ql37py5qh08c67bixyl4qiqsvlzv41jqnkxrxr85z2962fy8m"; } + { type = "pom"; sha512 = "3i0fzz4lb6lckvnv61bxcb26cw5cd3ibyirzlh0nnaig80rykf1v0bvr2ll0xpz2ss25b3j320kpwncsir2qmlfi51vh6ms3zm7p1ik"; } + ]; + mavenMonitor_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-monitor"; diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix index b06b83a8e94..e4d8fbec39b 100644 --- a/pkgs/development/java-modules/maven/plugin-api.nix +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenPluginApi_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-plugin-api"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "pom"; sha512 = "0fvx3mhmpr03cgyy3rx6ysdpvya6zs77yvjki1s9qfd3axzbnh2xl4w2d389rpx2vmqqx3a1lr8nj2yphm5r1wz3sb7v9rnba6jrfcr"; } + { type = "jar"; sha512 = "1fwfw7smywavmafbdma7xla07vaaihkg9md1v16ckp6xpbdxpsknb7s07dnx5jx757gd0gp5ak7mawg0a5sfrvjh955ynikhzjq13lz"; } + ]; + mavenPluginApi_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-plugin-api"; diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix index 0a60032125c..76f1bf5de1b 100644 --- a/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-plugin-descriptor"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2gwjmn4xnxh2hy9nnlr107q1fpnyy2yhkajvj2snpl1xmpn76m1vvj64zf52l9grpvpx91b0pvd8pxa8hzmh8kqdf1w3wqjg5k1p4zf"; } + { type = "pom"; sha512 = "0g9hl6i0kqfrifjmykrg5pfb2xh35by3dc1nfa4i1434xr1fzi4y5avdqaw3zlvhnybi611qxv1g2ydnwkq9mgnvjq8fis4ir60g82s"; } + ]; + mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-plugin-descriptor"; diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index 82b16e61620..f3ef7c7fc5b 100644 --- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-plugin-parameter-documenter"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3hx5wg0jqhhknfgb98j7d3xy452lyw5yr3ncbk0jfzx1xkxc3v101s5s192q3c2agjgj76xsk1axmipdmwfv3801rbk99hmyjhdqbkn"; } + { type = "pom"; sha512 = "0x56m654vdgakslrbzfnvarh699ag288drbk6vnwjp5xxa5jg9vizrm6kz1917d2qygrpqnn5b6yzwawj864qy9xdadzr9mbak33424"; } + ]; + mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-plugin-parameter-documenter"; diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix index 547bda4fc9f..b75806182cf 100644 --- a/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenPluginRegistry_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-plugin-registry"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "392cx42731zgiyvjdpqcpbhqvpjbd4ydlxfnracws8vimifcsln33s48yzk2q671ydcwdzs3kla2npy410vqzvc535km5ssj60fhq2f"; } + { type = "pom"; sha512 = "3g1rbjz64x7cihfgmc061nm7sg52p7wr34cb1b1725w7d3hp0vz33s5ybql3vccbf7brx9vvfykxiwsgqbw6g19zv77276vdpy8v5nr"; } + ]; + mavenPluginRegistry_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-plugin-registry"; diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix new file mode 100644 index 00000000000..754bcc08031 --- /dev/null +++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenPluginTestingHarness_1_1 = map (obj: fetchMaven { + version = "1.1"; + baseName = "maven-plugin-testing-harness"; + package = "/org/apache/maven/shared"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "38cqg736n2nlzhssabyw47yl0rqcaha3k8sqgjs7pgvcpphapxinx9gck2n2y5m77rhjwkz0n6lyym6zi2k382jbasm2n59y5gkpnkj"; } + { type = "pom"; sha512 = "26gfh7i9qg79yggsp3sl21qj9s4j6hdabllvbvnnr0m6j8whadzbhfx2ds7p6ddvzvyi5214xrsl6ag3nxw6k5rjw10k4g32b0nyvv2"; } + ]; +} diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix index d5e79d13c2c..b160fb4e943 100644 --- a/pkgs/development/java-modules/maven/profile.nix +++ b/pkgs/development/java-modules/maven/profile.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenProfile_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-profile"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "39zjz3jh5q5k4ryyg8psj741gwy01blflmw2hk9krqid9fpmbbcj5f3h34i1q03qcz7kgb1sz1kp58j2fmbk8364y2i0xyrg4zalzz5"; } + { type = "pom"; sha512 = "32jcvvf47if22cy3z0ld2gf7873ysz4qcx6b2zp62r8pbmj1i2a1kd62llvjv7p2x5l960ndvlr1a80x6mm9mnsjrwxd4vy0iwyshmv"; } + ]; + mavenProfile_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-profile"; diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index 25911fcdee8..f1ff4f05c4c 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -23,6 +23,17 @@ rec { { type = "pom"; sha512 = "13z607rjazzrs3rjw6hlhpw6jip85lgdkvnkm1j17wsbhywa53x45ydyg1hzrcax8xr5zxn7mkrryp4wwwm4ihhsaz3nq8bh12yrh8p"; } ]; + mavenProject_2_0_8 = map (obj: fetchMaven { + version = "2.0.8"; + baseName = "maven-project"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2j3mwqh0zjm7pc7jydpdg6xp5gl3ila84zkhk1znn9663d84p4wgkv6zi1r16djc5jvy2g2z2id1zc7gr97spv5riwz3hbw1vw4ajzp"; } + { type = "pom"; sha512 = "1489hvb5g28afc2yjyc5qnlihg0qqiq0r1fkbl976hvr5kfj6pkx4h3sz69gv3pnsgpjkavqxafm11s7w1hgd8xsvajrnsy77hmpsqa"; } + ]; + mavenProject_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; baseName = "maven-project"; diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix index 36818dc57e0..afb949d79c5 100644 --- a/pkgs/development/java-modules/maven/reporting-api.nix +++ b/pkgs/development/java-modules/maven/reporting-api.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenReportingApi_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-reporting-api"; + package = "/org/apache/maven/reporting"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "06721y3g8zxhv2hx9c743ai3pc8d2agdgkz8wyaia6h7k2sy0rjxcfixpdxpw9hzdm0fqjqc3hdjf0j5dlkd11xzv9q87dr1s1x24w2"; } + { type = "pom"; sha512 = "2xjij0375hnv807sar41gk0qk8f7xaqm1fkrgvrbcl5sbwm614rrdxir14wlkkgr78qjx3b8m3r1jrdi47j1n5p4c9zmgg4vjl3n1sy"; } + ]; + mavenReportingApi_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-reporting-api"; @@ -22,4 +33,15 @@ rec { { type = "jar"; sha512 = "0x7j7k3xbxps80swyp4ff1sw4rwrhlxsx80kyh0sj0i9jz50x18p1rba10gx2fqd4l29zri77nlm4qza5yrf61s68xby2zr2bygyc9r"; } { type = "pom"; sha512 = "054v1p9h0141pahs52pg8wb0x4jghm5222yns6mf4dbc9gpy7x9j2b0z2lv9q3slx98378s4zakx4kbk5ca9ldlm8sz9y10fpqm35s6"; } ]; + + mavenReportingApi_2_2_1 = map (obj: fetchMaven { + version = "2.2.1"; + baseName = "maven-reporting-api"; + package = "/org/apache/maven/reporting"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "38nbplfyi1xcf6q502m8sgz9iacqy06y9fq811sz75wsqxld8zxkr85lqg46zhpjm8k3hk7dg4an466j65mbpf0n7iswcjnqn78slil"; } + { type = "pom"; sha512 = "0clwbb7p9fm5xlwkjyxx97v0k9alpz98smlpv26gz9j22hlzl08zajgiw52abqarbk80x28c02clipv1ifgbwrxyji4s8rb5f689nkp"; } + ]; } diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix index 7a076a3811e..1ed2717ac4f 100644 --- a/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-repository-metadata"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3aq5k4ifam2lm6mny7zyjlylcpk6is2jnas81w6z5p6qd5jfwfj1i3g89y0vsl7mamh2rp7xncx60mvqr0jm9hxgx8ibjcynkq92kaf"; } + { type = "pom"; sha512 = "29nynsxh8k1q91whs4glca3qxigid32dx70c87jvk1x1cfc8s78bvm6lzr14x7wvw5i5n61lrqvq5mc6mzsi8xmspaqjhm2m7azyx7y"; } + ]; + mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-repository-metadata"; diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix index b4416607ee9..a18532fa362 100644 --- a/pkgs/development/java-modules/maven/settings.nix +++ b/pkgs/development/java-modules/maven/settings.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + mavenSettings_2_0_1 = map (obj: fetchMaven { + version = "2.0.1"; + baseName = "maven-settings"; + package = "/org/apache/maven"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3jf3iix8zwbjrfxswn4x4q5jxmpkm5bqq0pb6yq5vjk74kipkk6cl5cfjhy8pakb1fymq7j7knsi791xp6jrhyyrzi31lgprdmlk06x"; } + { type = "pom"; sha512 = "2r0256akp6gkcg7mjpaf27s985x2hblqk2dqcjq4cl415j4hx1xvarvvkh9py8sk8sjp66nzabph2kyk7v01cy29ryay6b6hn1wzi62"; } + ]; + mavenSettings_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; baseName = "maven-settings"; diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix new file mode 100644 index 00000000000..83aaebc7f6d --- /dev/null +++ b/pkgs/development/java-modules/maven/surefire-junit4.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven { + version = "2.12.4"; + baseName = "surefire-junit4"; + package = "/org/apache/maven/surefire"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2m6k4dsy9d6yfcn33lrv1q4lb3hlg1q6c8ff0rhb05j7lzsiiqa55n2561a45bznhc8l85l31mrvva0h2hhca6xjyx1hw7k3ddgpzc5"; } + { type = "pom"; sha512 = "1na33q7j22fsdwcynd8pv8ivsq1fq51p818nyhhldaqnh7rm2478pnxyhq14wv9mrsgrfxffipaiqyvwq30y69y6ddn597arv16ihix"; } + ]; +} diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix new file mode 100644 index 00000000000..95eb52ae3e8 --- /dev/null +++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +rec { + mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven { + version = "1.11"; + baseName = "java-boot-classpath-detector"; + package = "/org/codehaus/mojo"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "0dn0ry30n47544bbhp8j3r5fm6ip7cs1i8wg0wdfr735ak7r38wpb297q0k5kfaqrlqwi8cmnz4lngjan223lpwywjc806v27adjh57"; } + { type = "pom"; sha512 = "1ndzid9lik3a3bh8d2n9fqql29wypx4cw4ybvjgqhx63rs8hbb038irmcdr18jsalb8v2sj0bmjv6nmrr58wgf158r1zjv311m95yw0"; } + ]; +} diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix new file mode 100644 index 00000000000..2fee6529f16 --- /dev/null +++ b/pkgs/development/java-modules/ow2/asm-all.nix @@ -0,0 +1,15 @@ +{ fetchMaven }: + +rec { + ow2AsmAll_4_0 = map (obj: fetchMaven { + version = "4.0"; + baseName = "asm-all"; + package = "/org/ow2/asm"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3b38kqyzg15plsdwwr5kri06h0pag1pxnxzlyqcwpaa2ncd4pqh44zc7mzaxrsvpx8z5cdl413xs2p0qn1qhcz92w5lqykm4gnvb2az"; } + { type = "pom"; sha512 = "11gcdp8417immlsb8dvw70cmqykcqvzcl2xz37vsimdpwjx31px88dgmxs6l3k50z9mvs6h1cfgfbaw1i2qmzdkdlbyai8iwnl8q2mr"; } + ]; +} + diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix index e831df44732..3a2b0a347e3 100644 --- a/pkgs/development/java-modules/plexus/archiver.nix +++ b/pkgs/development/java-modules/plexus/archiver.nix @@ -1,6 +1,17 @@ { fetchMaven }: rec { + plexusArchiver_1_0_alpha7 = map (obj: fetchMaven { + version = "1.0-alpha-7"; + baseName = "plexus-archiver"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "3r1c5bknlk9010wqw1m6asqhnbmqz6xammhpci929gjjims27fr0c9qmskqr55vnbswcmvsiikfjnjwa36msgscirzsay48zrs5iwfk"; } + { type = "pom"; sha512 = "05gnm321rx3zi5bnkgl64nbx6j8f3pz6y0v6nb3xfw44kgv7rxaq8b1v716wpr2p0bdrmarxmzidc92hps2w5src0ramg6xv35zfw6w"; } + ]; + plexusArchiver_2_1 = map (obj: fetchMaven { version = "2.1"; baseName = "plexus-archiver"; diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index 2cfdd60ccae..ca46c0d4d62 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -12,6 +12,17 @@ rec { { type = "pom"; sha512 = "35mm9fkfw1wljabr4lz6l5mq3mxgl7k87whlcz5qlddsbxy0j69j4xgf1fvjlyp06nqq2wz574v54aqpxgp8s6jwjyz9wyvqvsyka8d"; } ]; + plexusUtils_1_0_5 = map (obj: fetchMaven { + version = "1.0.5"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2wj0xyywifivqq1rnmd3lj7c4kgprcyq3rb4v4y5rr89isdm40hnfhziz0zakyysk8wqw4l4wp3lg7vxhs3yd44rdfm0czvkjl726zj"; } + { type = "pom"; sha512 = "1pz98avnr6pml058mg2db79rpxckcxkgpl8z373l055kppsy1pvmkhjahkjpzfrg63pdsk2kgm2ls9ji5697whpbm7xcwi8j3ssx791"; } + ]; + plexusUtils_1_1 = map (obj: fetchMaven { version = "1.1"; baseName = "plexus-utils"; @@ -45,6 +56,17 @@ rec { { type = "pom"; sha512 = "0liqhpc9pn81vn04qz4j3101jc33hygb415jnwpf0dhph3jay88l49gd9s1bwq6x4npn2v6863vidb8hdh5f8wd20k6m1lqhdpv882j"; } ]; + plexusUtils_1_4_9 = map (obj: fetchMaven { + version = "1.4.9"; + baseName = "plexus-utils"; + package = "/org/codehaus/plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "12fhq89mqj8m5y0ks8h39ig2q4nr3qlygjwygp9wg60dkfqrm6rscfrycs18pqd9y9fkhk8rqi96gq2vy8wg1v1a24h2wlzak1d22ip"; } + { type = "pom"; sha512 = "23fpn9f8gq0a3hi2mlwzjpbr3kyrsr4wl58zyq8i6xbdnnfx0wfwc2xsfn8yp3mq2pjjpdlza9l3qdmwsyzmrz8micvms8bladpvcmv"; } + ]; + plexusUtils_1_5_1 = map (obj: fetchMaven { version = "1.5.1"; baseName = "plexus-utils"; diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index ee19aaf2103..7feff9548a1 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -105,6 +105,14 @@ rec { type = "pom"; }; + asmParent_4_0 = fetchMaven { + version = "4.0"; + baseName = "asm-parent"; + package = "/org/ow2/asm"; + sha512 = "2vysz9nn1pn1qzd40n7d2njmcpz7qi37pi73k9ajjmmbzwza6h8gc1pvadfqxlnih47gzc1wn3hqrc1sqd3b84kh8nrznwjcp10y0lf"; + type = "pom"; + }; + backportUtilConcurrent_3_1 = fetchMaven { version = "3.1"; baseName = "backport-util-concurrent"; @@ -129,6 +137,14 @@ rec { type = "pom"; }; + commonsParent_11 = fetchMaven { + version = "11"; + baseName = "commons-parent"; + package = "/org/apache/commons"; + sha512 = "3986i0mnawni27fqf74zfb1n9wvyn502nvslfmbwz5m3rgvhfdb7r1wj7qz8g3wznfvh3wd99h83d94300yvy6cilqy5sj9gfwxk3jv"; + type = "pom"; + }; + commonsParent_17 = fetchMaven { version = "17"; baseName = "commons-parent"; @@ -145,6 +161,14 @@ rec { type = "pom"; }; + doxia_1_0_alpha6 = fetchMaven { + version = "1.0-alpha-6"; + baseName = "doxia"; + package = "/org/apache/maven/doxia"; + sha512 = "0ya69g2xfzawf30r2n45n85h2bag0ihd2cbkd0896ykwndx62jyagc594f9pkvb8x9vwgq1dkhfc5lfw1sjcmsxm9dmyzvy2nmykpsy"; + type = "pom"; + }; + doxia_1_0_alpha7 = fetchMaven { version = "1.0-alpha-7"; baseName = "doxia"; @@ -217,6 +241,14 @@ rec { type = "pom"; }; + maven_2_0_8 = fetchMaven { + version = "2.0.8"; + baseName = "maven"; + package = "/org/apache/maven"; + sha512 = "0mzlba0vbanxvdgfvj3kq6xw211j40b6hk6w0b7lc686m2c26vgxks9iisgm10888lq140i6510813326bs9yb053hqfvnz3m72lkss"; + type = "pom"; + }; + maven_2_0_9 = fetchMaven { version = "2.0.9"; baseName = "maven"; @@ -353,6 +385,14 @@ rec { type = "pom"; }; + mavenReporting_2_0_1 = fetchMaven { + version = "2.0.1"; + baseName = "maven-reporting"; + package = "/org/apache/maven/reporting"; + sha512 = "3ns0j0w3g3xzvi4y2nbz7yl3w0bq6npvkpy56c2s2m8z0b0007vw97qm3z7b6iicwck69g9001qqqanhzr35x1qbzlqzrx5v271hvfa"; + type = "pom"; + }; + mavenReporting_2_0_6 = fetchMaven { version = "2.0.6"; baseName = "maven-reporting"; @@ -369,6 +409,22 @@ rec { type = "pom"; }; + mavenReporting_2_2_1 = fetchMaven { + version = "2.2.1"; + baseName = "maven-reporting"; + package = "/org/apache/maven/reporting"; + sha512 = "02gs0nk2hihvayh7gxn1ncbq7nq1hbpr40whby6c58adk7g6jq3cn84fi8svcv10w915f696drav1cimjpizcyjn00if1iql59dmfda"; + type = "pom"; + }; + + mavenSharedComponents_7 = fetchMaven { + version = "7"; + baseName = "maven-shared-components"; + package = "/org/apache/maven/shared"; + sha512 = "35zwvraafv86jpyfvfmi76n9bzmahq5z90j9axb3b6d0wfvildz5qb43kw27si2ldwghiwsfh2jikd3gf9ms553pfillf4baab13dp6"; + type = "pom"; + }; + mavenSharedComponents_11 = fetchMaven { version = "11"; baseName = "maven-shared-components"; @@ -417,6 +473,14 @@ rec { type = "pom"; }; + ow2_1_3 = fetchMaven { + version = "1.3"; + baseName = "ow2"; + package = "/org/ow2"; + sha512 = "1jqfqqmh19lvrjk45zzzp895jbxb8giw8sn1qdvwhh1yqxr1z5vkv98n4g0ib2l359qmb9fal4d21ba57zmbl0rqxqlggv9c5l87gfs"; + type = "pom"; + }; + plexus_1_0_4 = fetchMaven { version = "1.0.4"; baseName = "plexus"; @@ -545,6 +609,14 @@ rec { type = "pom"; }; + plexusComponents_1_1_6 = fetchMaven { + version = "1.1.6"; + baseName = "plexus-components"; + package = "/org/codehaus/plexus"; + sha512 = "1m6f5xzp6mk1n0svznqc8l5x3klr9kk75223ms31q65llx765dxvrsmkjlzgshb0ipb9nfxwk9hs5fvf5dgh0xlzrnc1w2pnqdi8jnh"; + type = "pom"; + }; + plexusComponents_1_1_7 = fetchMaven { version = "1.1.7"; baseName = "plexus-components"; @@ -761,6 +833,14 @@ rec { type = "pom"; }; + surefireProviders_2_12_4 = fetchMaven { + version = "2.12.4"; + baseName = "surefire-providers"; + package = "/org/apache/maven/surefire"; + sha512 = "08di6wgiihz9svrdpkdvhlipdp83byd1s844fnjqfk3z0g5a72lpq718zy27rk41jma3hclmr4pv0g5dvbhf3v8hy92iby8w5rcxv5x"; + type = "pom"; + }; + xbean_3_4 = fetchMaven { version = "3.4"; baseName = "xbean"; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 488f4cb59db..0df0b5a51c9 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -27,7 +27,8 @@ in { classworlds_1_1; inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; }) - commonsCli_1_0; + commonsCli_1_0 + commonsCli_1_2; inherit (callPackage ../development/java-modules/apache/commons-io.nix { inherit fetchMaven; }) commonsIo_2_1; @@ -49,6 +50,9 @@ in { inherit (callPackage ../development/java-modules/google/collections.nix { inherit fetchMaven; }) googleCollections_1_0; + inherit (callPackage ../development/java-modules/hamcrest/all.nix { inherit fetchMaven; }) + hamcrestAll_1_3; + inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; }) hamcrestCore_1_3; @@ -64,12 +68,15 @@ in { mavenArchiver_2_5; inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; }) + mavenArtifact_2_0_1 mavenArtifact_2_0_6 + mavenArtifact_2_0_8 mavenArtifact_2_0_9 mavenArtifact_2_2_1 mavenArtifact_3_0_3; inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; }) + mavenArtifactManager_2_0_1 mavenArtifactManager_2_0_6 mavenArtifactManager_2_0_9 mavenArtifactManager_2_2_1; @@ -80,6 +87,7 @@ in { mavenCommonArtifactFilters_1_4; inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; }) + mavenCore_2_0_1 mavenCore_2_0_6 mavenCore_2_0_9 mavenCore_2_2_1; @@ -88,6 +96,7 @@ in { mavenDependencyTree_2_1; inherit (callPackage ../development/java-modules/maven/doxia-sink-api.nix { inherit fetchMaven; }) + mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha7 mavenDoxiaSinkApi_1_0_alpha10; @@ -96,6 +105,7 @@ in { mavenEnforcerRules_1_3_1; inherit (callPackage ../development/java-modules/maven/error-diagnostics.nix { inherit fetchMaven; }) + mavenErrorDiagnostics_2_0_1 mavenErrorDiagnostics_2_0_6 mavenErrorDiagnostics_2_0_9 mavenErrorDiagnostics_2_2_1; @@ -108,12 +118,14 @@ in { mavenHello_1_1; inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; }) + mavenModel_2_0_1 mavenModel_2_0_6 mavenModel_2_0_9 mavenModel_2_2_1 mavenModel_3_0_3; inherit (callPackage ../development/java-modules/maven/monitor.nix { inherit fetchMaven; }) + mavenMonitor_2_0_1 mavenMonitor_2_0_6 mavenMonitor_2_0_9 mavenMonitor_2_2_1; @@ -123,27 +135,35 @@ in { mavenPluginAnnotations_3_2; inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; }) + mavenPluginApi_2_0_1 mavenPluginApi_2_0_6 mavenPluginApi_2_0_9 mavenPluginApi_2_2_1 mavenPluginApi_3_0_3; inherit (callPackage ../development/java-modules/maven/plugin-descriptor.nix { inherit fetchMaven; }) + mavenPluginDescriptor_2_0_1 mavenPluginDescriptor_2_0_6 mavenPluginDescriptor_2_0_9 mavenPluginDescriptor_2_2_1; inherit (callPackage ../development/java-modules/maven/plugin-parameter-documenter.nix { inherit fetchMaven; }) + mavenPluginParameterDocumenter_2_0_1 mavenPluginParameterDocumenter_2_0_6 mavenPluginParameterDocumenter_2_0_9 mavenPluginParameterDocumenter_2_2_1; inherit (callPackage ../development/java-modules/maven/plugin-registry.nix { inherit fetchMaven; }) + mavenPluginRegistry_2_0_1 mavenPluginRegistry_2_0_6 mavenPluginRegistry_2_0_9 mavenPluginRegistry_2_2_1; + inherit (callPackage ../development/java-modules/maven/plugin-testing-harness.nix { inherit fetchMaven; }) + mavenPluginTestingHarness_1_1; + inherit (callPackage ../development/java-modules/maven/profile.nix { inherit fetchMaven; }) + mavenProfile_2_0_1 mavenProfile_2_0_6 mavenProfile_2_0_9 mavenProfile_2_2_1; @@ -151,19 +171,24 @@ in { inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; }) mavenProject_2_0_1 mavenProject_2_0_6 + mavenProject_2_0_8 mavenProject_2_0_9 mavenProject_2_2_1; inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; }) + mavenReportingApi_2_0_1 mavenReportingApi_2_0_6 - mavenReportingApi_2_0_9; + mavenReportingApi_2_0_9 + mavenReportingApi_2_2_1; inherit (callPackage ../development/java-modules/maven/repository-metadata.nix { inherit fetchMaven; }) + mavenRepositoryMetadata_2_0_1 mavenRepositoryMetadata_2_0_6 mavenRepositoryMetadata_2_0_9 mavenRepositoryMetadata_2_2_1; inherit (callPackage ../development/java-modules/maven/settings.nix { inherit fetchMaven; }) + mavenSettings_2_0_1 mavenSettings_2_0_6 mavenSettings_2_0_9 mavenSettings_2_2_1; @@ -186,6 +211,9 @@ in { mavenSurefireCommon_2_12_4 mavenSurefireCommon_2_17; + inherit (callPackage ../development/java-modules/maven/surefire-junit4.nix { inherit fetchMaven; }) + mavenSurefireJunit4_2_12_4; + inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; }) mavenToolchain_1_0 mavenToolchain_2_0_9 @@ -194,7 +222,14 @@ in { inherit (callPackage ../development/java-modules/mojo/animal-sniffer.nix { inherit fetchMaven; }) mojoAnimalSniffer_1_11; + inherit (callPackage ../development/java-modules/mojo/java-boot-classpath-detector.nix { inherit fetchMaven; }) + mojoJavaBootClasspathDetector_1_11; + + inherit (callPackage ../development/java-modules/ow2/asm-all.nix { inherit fetchMaven; }) + ow2AsmAll_4_0; + inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; }) + plexusArchiver_1_0_alpha7 plexusArchiver_2_1; inherit (callPackage ../development/java-modules/plexus/build-api.nix { inherit fetchMaven; }) @@ -241,9 +276,11 @@ in { inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; }) plexusUtils_1_0_4 + plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_1 plexusUtils_1_4_5 + plexusUtils_1_4_9 plexusUtils_1_5_1 plexusUtils_1_5_5 plexusUtils_1_5_6 From 82c1ff501aec3f625ad423c795e53fbe5ea761be Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 14:44:35 -0500 Subject: [PATCH 009/274] Create mavenLibs --- pkgs/development/java-modules/collections.nix | 77 +++++++++++++++++++ .../java-modules/junit/default.nix | 4 +- .../java-modules/maven-minimal.nix | 52 ++----------- 3 files changed, 86 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/java-modules/collections.nix diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix new file mode 100644 index 00000000000..39b274b5030 --- /dev/null +++ b/pkgs/development/java-modules/collections.nix @@ -0,0 +1,77 @@ +{ pkgs }: + +with pkgs.javaPackages; + +rec { + mavenLibs_2_0_1 = [ + mavenArtifact_2_0_1 + mavenArtifactManager_2_0_1 + mavenCore_2_0_1 + mavenErrorDiagnostics_2_0_1 + mavenModel_2_0_1 + mavenMonitor_2_0_1 + mavenPluginApi_2_0_1 + mavenPluginDescriptor_2_0_1 + mavenPluginParameterDocumenter_2_0_1 + mavenPluginRegistry_2_0_1 + mavenProfile_2_0_1 + mavenProject_2_0_1 + mavenReportingApi_2_0_1 + mavenRepositoryMetadata_2_0_1 + mavenSettings_2_0_1 + ]; + + mavenLibs_2_0_6 = [ + mavenArtifact_2_0_6 + mavenArtifactManager_2_0_6 + mavenCore_2_0_6 + mavenErrorDiagnostics_2_0_6 + mavenModel_2_0_6 + mavenMonitor_2_0_6 + mavenPluginApi_2_0_6 + mavenPluginDescriptor_2_0_6 + mavenPluginParameterDocumenter_2_0_6 + mavenPluginRegistry_2_0_6 + mavenProfile_2_0_6 + mavenProject_2_0_6 + mavenReportingApi_2_0_6 + mavenRepositoryMetadata_2_0_6 + mavenSettings_2_0_6 + ]; + + mavenLibs_2_0_9 = [ + mavenArtifact_2_0_9 + mavenArtifactManager_2_0_9 + mavenCore_2_0_9 + mavenErrorDiagnostics_2_0_9 + mavenModel_2_0_9 + mavenMonitor_2_0_9 + mavenPluginApi_2_0_9 + mavenPluginDescriptor_2_0_9 + mavenPluginParameterDocumenter_2_0_9 + mavenPluginRegistry_2_0_9 + mavenProfile_2_0_9 + mavenProject_2_0_9 + mavenReportingApi_2_0_9 + mavenRepositoryMetadata_2_0_9 + mavenSettings_2_0_9 + ]; + + mavenLibs_2_2_1 = [ + mavenArtifact_2_2_1 + mavenArtifactManager_2_2_1 + mavenCore_2_2_1 + mavenErrorDiagnostics_2_2_1 + mavenModel_2_2_1 + mavenMonitor_2_2_1 + mavenPluginApi_2_2_1 + mavenPluginDescriptor_2_2_1 + mavenPluginParameterDocumenter_2_2_1 + mavenPluginRegistry_2_2_1 + mavenProfile_2_2_1 + mavenProject_2_2_1 + mavenReportingApi_2_2_1 + mavenRepositoryMetadata_2_2_1 + mavenSettings_2_2_1 + ]; +} diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 84ccef3975d..2f315fa3161 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -4,6 +4,7 @@ with pkgs.javaPackages; let poms = import (../poms.nix) { inherit fetchMaven; }; + collections = import (../collections.nix) { inherit pkgs; }; in rec { junitGen = { mavenDeps, sha512, version }: mavenbuild rec { inherit mavenDeps sha512 version; @@ -51,7 +52,8 @@ in rec { junit_4_12 = junitGen { mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ]) - ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_1 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenArtifactManager_2_0_1 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenCore_2_0_1 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_1 mavenModel_2_0_1 mavenModel_3_0_3 mavenMonitor_2_0_1 mavenPluginApi_2_0_1 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginDescriptor_2_0_1 mavenPluginParameterDocumenter_2_0_1 mavenPluginRegistry_2_0_1 mavenPluginTestingHarness_1_1 mavenProfile_2_0_1 mavenProject_2_0_1 mavenProject_2_0_8 mavenReportingApi_2_0_1 mavenReportingApi_2_2_1 mavenRepositoryMetadata_2_0_1 mavenSettings_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ] + ++ collections.mavenLibs_2_0_1 + ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginTestingHarness_1_1 mavenProject_2_0_8 mavenReportingApi_2_2_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ] ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 asmParent_4_0 beanshell_2_0_b4 codehausParent_4 commonsParent_11 commonsParent_17 doxia_1_0_alpha6 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_2_0_8 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenReporting_2_0_1 mavenReporting_2_2_1 mavenSharedComponents_7 mavenSharedComponents_11 mojoParent_32 ow2_1_3 plexus_1_0_12 plexusComponents_1_1_4 plexusComponents_1_1_6 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]); sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9"; version = "4.12"; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index 359060c8dae..df87f51768d 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -4,13 +4,17 @@ with stdenv.lib; with pkgs.javaPackages; let + collections = import ./collections.nix { inherit pkgs; }; fetchMaven = pkgs.callPackage ./m2install.nix { }; - poms = import ./poms.nix { inherit fetchMaven; }; plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; }; + poms = import ./poms.nix { inherit fetchMaven; }; in rec { # Maven needs all of these to function mavenMinimal = flatten - [ + collections.mavenLibs_2_0_6 + ++ collections.mavenLibs_2_0_9 + ++ collections.mavenLibs_2_2_1 + ++ [ classworlds_1_1_alpha2 classworlds_1_1 commonsCli_1_0 @@ -23,54 +27,10 @@ in rec { junit_3_8_2 log4j_1_2_12 mavenArchiver_2_5 - mavenArtifact_2_0_6 - mavenArtifact_2_0_9 - mavenArtifact_2_2_1 - mavenArtifactManager_2_0_6 - mavenArtifactManager_2_0_9 - mavenArtifactManager_2_2_1 mavenCommonArtifactFilters_1_3 - mavenCore_2_0_6 - mavenCore_2_0_9 - mavenCore_2_2_1 mavenDoxiaSinkApi_1_0_alpha7 - mavenErrorDiagnostics_2_0_6 - mavenErrorDiagnostics_2_0_9 - mavenErrorDiagnostics_2_2_1 mavenFiltering_1_1 - mavenModel_2_0_6 - mavenModel_2_0_9 - mavenModel_2_2_1 - mavenMonitor_2_0_6 - mavenMonitor_2_0_9 - mavenMonitor_2_2_1 - mavenPluginDescriptor_2_0_6 - mavenPluginDescriptor_2_0_9 - mavenPluginDescriptor_2_2_1 - mavenPluginParameterDocumenter_2_0_6 - mavenPluginParameterDocumenter_2_0_9 - mavenPluginParameterDocumenter_2_2_1 - mavenProfile_2_0_6 - mavenProfile_2_0_9 - mavenProfile_2_2_1 - mavenProject_2_0_6 - mavenProject_2_0_9 - mavenProject_2_2_1 mavenPluginAnnotations_3_1 - mavenPluginApi_2_0_6 - mavenPluginApi_2_0_9 - mavenPluginApi_2_2_1 - mavenPluginRegistry_2_0_6 - mavenPluginRegistry_2_0_9 - mavenPluginRegistry_2_2_1 - mavenReportingApi_2_0_6 - mavenReportingApi_2_0_9 - mavenRepositoryMetadata_2_0_6 - mavenRepositoryMetadata_2_0_9 - mavenRepositoryMetadata_2_2_1 - mavenSettings_2_0_6 - mavenSettings_2_0_9 - mavenSettings_2_2_1 mavenSharedIncremental_1_1 mavenSharedUtils_0_1 mavenSurefireApi_2_12_4 From 8a7a44c9181217e3640534b49b7a135023d22890 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Nov 2016 12:39:59 -0500 Subject: [PATCH 010/274] javaPackages: Use artifactId/groupId --- pkgs/build-support/fetchurl/mirrors.nix | 4 +- .../java-modules/apache/ant-launcher.nix | 4 +- pkgs/development/java-modules/apache/ant.nix | 4 +- .../java-modules/apache/commons-cli.nix | 8 +- .../java-modules/apache/commons-io.nix | 4 +- .../java-modules/apache/commons-lang.nix | 12 +- .../java-modules/apache/commons-lang3.nix | 4 +- .../apache/commons-logging-api.nix | 4 +- .../java-modules/apache/xbean-reflect.nix | 4 +- .../java-modules/beanshell/bsh.nix | 4 +- .../java-modules/classworlds/classworlds.nix | 8 +- .../java-modules/eclipse/aether-util.nix | 4 +- .../java-modules/findbugs/jsr305.nix | 4 +- .../java-modules/google/collections.nix | 4 +- .../development/java-modules/hamcrest/all.nix | 4 +- .../java-modules/hamcrest/core.nix | 4 +- .../java-modules/junit/default.nix | 8 +- .../java-modules/log4j/default.nix | 4 +- pkgs/development/java-modules/m2install.nix | 6 +- .../java-modules/maven/archiver.nix | 4 +- .../java-modules/maven/artifact-manager.nix | 16 +- .../java-modules/maven/artifact.nix | 24 +- .../maven/common-artifact-filters.nix | 12 +- pkgs/development/java-modules/maven/core.nix | 16 +- .../java-modules/maven/dependency-tree.nix | 4 +- .../java-modules/maven/doxia-sink-api.nix | 12 +- .../java-modules/maven/enforcer.nix | 8 +- .../java-modules/maven/error-diagnostics.nix | 16 +- .../java-modules/maven/filtering.nix | 4 +- pkgs/development/java-modules/maven/model.nix | 20 +- .../java-modules/maven/monitor.nix | 16 +- .../java-modules/maven/plugin-annotations.nix | 8 +- .../java-modules/maven/plugin-api.nix | 20 +- .../java-modules/maven/plugin-descriptor.nix | 16 +- .../maven/plugin-parameter-documenter.nix | 16 +- .../java-modules/maven/plugin-registry.nix | 16 +- .../maven/plugin-testing-harness.nix | 4 +- .../java-modules/maven/profile.nix | 16 +- .../java-modules/maven/project.nix | 20 +- .../java-modules/maven/reporting-api.nix | 16 +- .../maven/repository-metadata.nix | 16 +- .../java-modules/maven/settings.nix | 16 +- .../java-modules/maven/shared-incremental.nix | 4 +- .../java-modules/maven/shared-utils.nix | 4 +- .../java-modules/maven/surefire-api.nix | 8 +- .../java-modules/maven/surefire-booter.nix | 8 +- .../java-modules/maven/surefire-common.nix | 8 +- .../java-modules/maven/surefire-junit4.nix | 4 +- .../java-modules/maven/toolchain.nix | 12 +- .../development/java-modules/mavenPlugins.nix | 40 +- .../java-modules/mojo/animal-sniffer.nix | 4 +- .../mojo/java-boot-classpath-detector.nix | 4 +- pkgs/development/java-modules/ow2/asm-all.nix | 4 +- .../java-modules/plexus/archiver.nix | 8 +- .../java-modules/plexus/build-api.nix | 4 +- .../java-modules/plexus/classworlds.nix | 8 +- .../java-modules/plexus/compiler-api.nix | 4 +- .../java-modules/plexus/compiler-javac.nix | 4 +- .../java-modules/plexus/compiler-manager.nix | 4 +- .../plexus/component-annotations.nix | 4 +- .../java-modules/plexus/container-default.nix | 12 +- .../java-modules/plexus/digest.nix | 4 +- pkgs/development/java-modules/plexus/i18n.nix | 4 +- .../java-modules/plexus/interactivity-api.nix | 4 +- .../java-modules/plexus/interpolation.nix | 16 +- pkgs/development/java-modules/plexus/io.nix | 4 +- .../development/java-modules/plexus/utils.nix | 64 +-- pkgs/development/java-modules/poms.nix | 424 +++++++++--------- pkgs/development/java-modules/sisu/guice.nix | 4 +- .../java-modules/sisu/inject-bean.nix | 4 +- .../java-modules/sisu/inject-plexus.nix | 4 +- pkgs/development/java-modules/xerces/impl.nix | 4 +- .../java-modules/xml-apis/default.nix | 4 +- 73 files changed, 551 insertions(+), 551 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 0304165828f..f181ade1072 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -398,7 +398,7 @@ rec { # Maven Central maven = [ - http://repo1.maven.org/maven2 - http://central.maven.org/maven2 + http://repo1.maven.org/maven2/ + http://central.maven.org/maven2/ ]; } diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix index 0e4d7b26765..e6a2b0cae99 100644 --- a/pkgs/development/java-modules/apache/ant-launcher.nix +++ b/pkgs/development/java-modules/apache/ant-launcher.nix @@ -3,8 +3,8 @@ rec { antLauncher_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; - baseName = "ant-launcher"; - package = "/org/apache/ant"; + artifactId = "ant-launcher"; + groupId = "org.apache.ant"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix index fa83663f5ec..b4a6aa68f44 100644 --- a/pkgs/development/java-modules/apache/ant.nix +++ b/pkgs/development/java-modules/apache/ant.nix @@ -3,8 +3,8 @@ rec { ant_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; - baseName = "ant"; - package = "/org/apache/ant"; + artifactId = "ant"; + groupId = "org.apache.ant"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix index ffad5632b0a..050d511b0a1 100644 --- a/pkgs/development/java-modules/apache/commons-cli.nix +++ b/pkgs/development/java-modules/apache/commons-cli.nix @@ -3,8 +3,8 @@ rec { commonsCli_1_0 = map (obj: fetchMaven { version = "1.0"; - baseName = "commons-cli"; - package = "/commons-cli"; + artifactId = "commons-cli"; + groupId = "commons-cli"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { commonsCli_1_2 = map (obj: fetchMaven { version = "1.2"; - baseName = "commons-cli"; - package = "/commons-cli"; + artifactId = "commons-cli"; + groupId = "commons-cli"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix index 612dcb85f8e..70ce940ccf1 100644 --- a/pkgs/development/java-modules/apache/commons-io.nix +++ b/pkgs/development/java-modules/apache/commons-io.nix @@ -3,8 +3,8 @@ rec { commonsIo_2_1 = map (obj: fetchMaven { version = "2.1"; - baseName = "commons-io"; - package = "/commons-io"; + artifactId = "commons-io"; + groupId = "commons-io"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix index f6dc6b407ef..a2d71e9db0c 100644 --- a/pkgs/development/java-modules/apache/commons-lang.nix +++ b/pkgs/development/java-modules/apache/commons-lang.nix @@ -3,8 +3,8 @@ rec { commonsLang_2_1 = map (obj: fetchMaven { version = "2.1"; - baseName = "commons-lang"; - package = "/commons-lang"; + artifactId = "commons-lang"; + groupId = "commons-lang"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { commonsLang_2_3 = map (obj: fetchMaven { version = "2.3"; - baseName = "commons-lang"; - package = "/commons-lang"; + artifactId = "commons-lang"; + groupId = "commons-lang"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { commonsLang_2_6 = map (obj: fetchMaven { version = "2.6"; - baseName = "commons-lang"; - package = "/commons-lang"; + artifactId = "commons-lang"; + groupId = "commons-lang"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix index 8b5498f362d..63f68b92543 100644 --- a/pkgs/development/java-modules/apache/commons-lang3.nix +++ b/pkgs/development/java-modules/apache/commons-lang3.nix @@ -3,8 +3,8 @@ rec { commonsLang3_3_1 = map (obj: fetchMaven { version = "3.1"; - baseName = "commons-lang3"; - package = "/org/apache/commons"; + artifactId = "commons-lang3"; + groupId = "org.apache.commons"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix index 9aae04e4206..47750abe462 100644 --- a/pkgs/development/java-modules/apache/commons-logging-api.nix +++ b/pkgs/development/java-modules/apache/commons-logging-api.nix @@ -3,8 +3,8 @@ rec { commonsLoggingApi_1_1 = map (obj: fetchMaven { version = "1.1"; - baseName = "commons-logging-api"; - package = "/commons-logging"; + artifactId = "commons-logging-api"; + groupId = "commons-logging"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix index c1e9916443c..f0614ec99e3 100644 --- a/pkgs/development/java-modules/apache/xbean-reflect.nix +++ b/pkgs/development/java-modules/apache/xbean-reflect.nix @@ -3,8 +3,8 @@ rec { xbeanReflect_3_4 = map (obj: fetchMaven { version = "3.4"; - baseName = "xbean-reflect"; - package = "/org/apache/xbean"; + artifactId = "xbean-reflect"; + groupId = "org.apache.xbean"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix index e636fe557ec..41756bb80d5 100644 --- a/pkgs/development/java-modules/beanshell/bsh.nix +++ b/pkgs/development/java-modules/beanshell/bsh.nix @@ -3,8 +3,8 @@ rec { bsh_2_0_b4 = map (obj: fetchMaven { version = "2.0b4"; - baseName = "bsh"; - package = "/org/beanshell"; + artifactId = "bsh"; + groupId = "org.beanshell"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix index 3a85cc4363e..f8bbc07f102 100644 --- a/pkgs/development/java-modules/classworlds/classworlds.nix +++ b/pkgs/development/java-modules/classworlds/classworlds.nix @@ -3,8 +3,8 @@ rec { classworlds_1_1_alpha2 = map (obj: fetchMaven { version = "1.1-alpha-2"; - baseName = "classworlds"; - package = "/classworlds"; + artifactId = "classworlds"; + groupId = "classworlds"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { classworlds_1_1 = map (obj: fetchMaven { version = "1.1"; - baseName = "classworlds"; - package = "/classworlds"; + artifactId = "classworlds"; + groupId = "classworlds"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix index 33ba3d5edd7..60aac560b9b 100644 --- a/pkgs/development/java-modules/eclipse/aether-util.nix +++ b/pkgs/development/java-modules/eclipse/aether-util.nix @@ -3,8 +3,8 @@ rec { aetherUtil_0_9_0_M2 = map (obj: fetchMaven { version = "0.9.0.M2"; - baseName = "aether-util"; - package = "/org/eclipse/aether"; + artifactId = "aether-util"; + groupId = "org.eclipse.aether"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix index 466ce247633..2e842410aaf 100644 --- a/pkgs/development/java-modules/findbugs/jsr305.nix +++ b/pkgs/development/java-modules/findbugs/jsr305.nix @@ -3,8 +3,8 @@ rec { findbugsJsr305_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "jsr305"; - package = "/com/google/code/findbugs"; + artifactId = "jsr305"; + groupId = "com.google.code.findbugs"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix index 9898ddeaf31..ec874c73e36 100644 --- a/pkgs/development/java-modules/google/collections.nix +++ b/pkgs/development/java-modules/google/collections.nix @@ -3,8 +3,8 @@ rec { googleCollections_1_0 = map (obj: fetchMaven { version = "1.0"; - baseName = "google-collections"; - package = "/com/google/collections"; + artifactId = "google-collections"; + groupId = "com.google.collections"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix index 2bba1ac9249..bab9e1b115d 100644 --- a/pkgs/development/java-modules/hamcrest/all.nix +++ b/pkgs/development/java-modules/hamcrest/all.nix @@ -3,8 +3,8 @@ rec { hamcrestAll_1_3 = map (obj: fetchMaven { version = "1.3"; - baseName = "hamcrest-all"; - package = "/org/hamcrest"; + artifactId = "hamcrest-all"; + groupId = "org.hamcrest"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix index 104331f6f13..3842b8c5afa 100644 --- a/pkgs/development/java-modules/hamcrest/core.nix +++ b/pkgs/development/java-modules/hamcrest/core.nix @@ -3,8 +3,8 @@ rec { hamcrestCore_1_3 = map (obj: fetchMaven { version = "1.3"; - baseName = "hamcrest-core"; - package = "/org/hamcrest"; + artifactId = "hamcrest-core"; + groupId = "org.hamcrest"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 2f315fa3161..5017cb39602 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -30,8 +30,8 @@ in rec { junit_3_8_1 = map (obj: fetchMaven { version = "3.8.1"; - baseName = "junit"; - package = "/junit"; + artifactId = "junit"; + groupId = "junit"; sha512 = obj.sha512; type = obj.type; }) [ @@ -41,8 +41,8 @@ in rec { junit_3_8_2 = map (obj: fetchMaven { version = "3.8.2"; - baseName = "junit"; - package = "/junit"; + artifactId = "junit"; + groupId = "junit"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix index 65aaa41adb1..a8b1ea9f021 100644 --- a/pkgs/development/java-modules/log4j/default.nix +++ b/pkgs/development/java-modules/log4j/default.nix @@ -3,8 +3,8 @@ rec { log4j_1_2_12 = map (obj: fetchMaven { version = "1.2.12"; - baseName = "log4j"; - package = "/log4j"; + artifactId = "log4j"; + groupId = "log4j"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index 88e8efca1a1..7ebe655580e 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: -{ version, baseName, package, sha512, type ? "jar", suffix ? "" }: +{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }: let - name = "${baseName}-${version}"; - m2Path = "${package}/${baseName}/${version}"; + name = "${artifactId}-${version}"; + m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; m2File = "${name}${suffix}.${type}"; src = fetchurl rec { inherit sha512; diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix index ecab1f1e99c..14c5a99d42f 100644 --- a/pkgs/development/java-modules/maven/archiver.nix +++ b/pkgs/development/java-modules/maven/archiver.nix @@ -3,8 +3,8 @@ rec { mavenArchiver_2_5 = map (obj: fetchMaven { version = "2.5"; - baseName = "maven-archiver"; - package = "/org/apache/maven"; + artifactId = "maven-archiver"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix index 6d7e0caadfd..0796d066510 100644 --- a/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -3,8 +3,8 @@ rec { mavenArtifactManager_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-artifact-manager"; - package = "/org/apache/maven"; + artifactId = "maven-artifact-manager"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenArtifactManager_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-artifact-manager"; - package = "/org/apache/maven"; + artifactId = "maven-artifact-manager"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenArtifactManager_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-artifact-manager"; - package = "/org/apache/maven"; + artifactId = "maven-artifact-manager"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenArtifactManager_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-artifact-manager"; - package = "/org/apache/maven"; + artifactId = "maven-artifact-manager"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix index 224570f910f..bb0e578d5d6 100644 --- a/pkgs/development/java-modules/maven/artifact.nix +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -3,8 +3,8 @@ rec { mavenArtifact_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-artifact"; - package = "/org/apache/maven"; + artifactId = "maven-artifact"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenArtifact_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-artifact"; - package = "/org/apache/maven"; + artifactId = "maven-artifact"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenArtifact_2_0_8 = map (obj: fetchMaven { version = "2.0.8"; - baseName = "maven-artifact"; - package = "/org/apache/maven"; + artifactId = "maven-artifact"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenArtifact_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-artifact"; - package = "/org/apache/maven"; + artifactId = "maven-artifact"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -47,8 +47,8 @@ rec { mavenArtifact_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-artifact"; - package = "/org/apache/maven"; + artifactId = "maven-artifact"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -58,8 +58,8 @@ rec { mavenArtifact_3_0_3 = map (obj: fetchMaven { version = "3.0.3"; - baseName = "maven-artifact"; - package = "/org/apache/maven"; + artifactId = "maven-artifact"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix index 3949882f98b..948dbc3baf6 100644 --- a/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -3,8 +3,8 @@ rec { mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven { version = "1.2"; - baseName = "maven-common-artifact-filters"; - package = "/org/apache/maven/shared"; + artifactId = "maven-common-artifact-filters"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven { version = "1.3"; - baseName = "maven-common-artifact-filters"; - package = "/org/apache/maven/shared"; + artifactId = "maven-common-artifact-filters"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven { version = "1.4"; - baseName = "maven-common-artifact-filters"; - package = "/org/apache/maven/shared"; + artifactId = "maven-common-artifact-filters"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix index ed3313bba59..5b45f89e9d5 100644 --- a/pkgs/development/java-modules/maven/core.nix +++ b/pkgs/development/java-modules/maven/core.nix @@ -3,8 +3,8 @@ rec { mavenCore_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-core"; - package = "/org/apache/maven"; + artifactId = "maven-core"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenCore_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-core"; - package = "/org/apache/maven"; + artifactId = "maven-core"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenCore_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-core"; - package = "/org/apache/maven"; + artifactId = "maven-core"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenCore_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-core"; - package = "/org/apache/maven"; + artifactId = "maven-core"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix index cdd626e5848..00d089ea249 100644 --- a/pkgs/development/java-modules/maven/dependency-tree.nix +++ b/pkgs/development/java-modules/maven/dependency-tree.nix @@ -3,8 +3,8 @@ rec { mavenDependencyTree_2_1 = map (obj: fetchMaven { version = "2.1"; - baseName = "maven-dependency-tree"; - package = "/org/apache/maven/shared"; + artifactId = "maven-dependency-tree"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix index 18ccf4b707a..9fa1051cd80 100644 --- a/pkgs/development/java-modules/maven/doxia-sink-api.nix +++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -3,8 +3,8 @@ rec { mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven { version = "1.0-alpha-6"; - baseName = "doxia-sink-api"; - package = "/org/apache/maven/doxia"; + artifactId = "doxia-sink-api"; + groupId = "org.apache.maven.doxia"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven { version = "1.0-alpha-7"; - baseName = "doxia-sink-api"; - package = "/org/apache/maven/doxia"; + artifactId = "doxia-sink-api"; + groupId = "org.apache.maven.doxia"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenDoxiaSinkApi_1_0_alpha10 = map (obj: fetchMaven { version = "1.0-alpha-10"; - baseName = "doxia-sink-api"; - package = "/org/apache/maven/doxia"; + artifactId = "doxia-sink-api"; + groupId = "org.apache.maven.doxia"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix index 83037e6adee..014f678bc14 100644 --- a/pkgs/development/java-modules/maven/enforcer.nix +++ b/pkgs/development/java-modules/maven/enforcer.nix @@ -3,8 +3,8 @@ rec { mavenEnforcerApi_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; - baseName = "enforcer-api"; - package = "/org/apache/maven/enforcer"; + artifactId = "enforcer-api"; + groupId = "org.apache.maven.enforcer"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenEnforcerRules_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; - baseName = "enforcer-rules"; - package = "/org/apache/maven/enforcer"; + artifactId = "enforcer-rules"; + groupId = "org.apache.maven.enforcer"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix index 6f22316edc7..80cbf993a60 100644 --- a/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -3,8 +3,8 @@ rec { mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-error-diagnostics"; - package = "/org/apache/maven"; + artifactId = "maven-error-diagnostics"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-error-diagnostics"; - package = "/org/apache/maven"; + artifactId = "maven-error-diagnostics"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenErrorDiagnostics_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-error-diagnostics"; - package = "/org/apache/maven"; + artifactId = "maven-error-diagnostics"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenErrorDiagnostics_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-error-diagnostics"; - package = "/org/apache/maven"; + artifactId = "maven-error-diagnostics"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix index 5851a3db195..963d6c6b646 100644 --- a/pkgs/development/java-modules/maven/filtering.nix +++ b/pkgs/development/java-modules/maven/filtering.nix @@ -3,8 +3,8 @@ rec { mavenFiltering_1_1 = map (obj: fetchMaven { version = "1.1"; - baseName = "maven-filtering"; - package = "/org/apache/maven/shared"; + artifactId = "maven-filtering"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix index 70bfd34e737..2ae3bfe6034 100644 --- a/pkgs/development/java-modules/maven/model.nix +++ b/pkgs/development/java-modules/maven/model.nix @@ -3,8 +3,8 @@ rec { mavenModel_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-model"; - package = "/org/apache/maven"; + artifactId = "maven-model"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenModel_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-model"; - package = "/org/apache/maven"; + artifactId = "maven-model"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenModel_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-model"; - package = "/org/apache/maven"; + artifactId = "maven-model"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenModel_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-model"; - package = "/org/apache/maven"; + artifactId = "maven-model"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -47,8 +47,8 @@ rec { mavenModel_3_0_3 = map (obj: fetchMaven { version = "3.0.3"; - baseName = "maven-model"; - package = "/org/apache/maven"; + artifactId = "maven-model"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix index 0a71d7ba5a4..ce6c7c17694 100644 --- a/pkgs/development/java-modules/maven/monitor.nix +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -3,8 +3,8 @@ rec { mavenMonitor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-monitor"; - package = "/org/apache/maven"; + artifactId = "maven-monitor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenMonitor_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-monitor"; - package = "/org/apache/maven"; + artifactId = "maven-monitor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenMonitor_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-monitor"; - package = "/org/apache/maven"; + artifactId = "maven-monitor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenMonitor_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-monitor"; - package = "/org/apache/maven"; + artifactId = "maven-monitor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix index 6bd8928cf0f..f852cc957a5 100644 --- a/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -3,8 +3,8 @@ rec { mavenPluginAnnotations_3_1 = map (obj: fetchMaven { version = "3.1"; - baseName = "maven-plugin-annotations"; - package = "/org/apache/maven/plugin-tools"; + artifactId = "maven-plugin-annotations"; + groupId = "org.apache.maven.plugin-tools"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenPluginAnnotations_3_2 = map (obj: fetchMaven { version = "3.2"; - baseName = "maven-plugin-annotations"; - package = "/org/apache/maven/plugin-tools"; + artifactId = "maven-plugin-annotations"; + groupId = "org.apache.maven.plugin-tools"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix index e4d8fbec39b..be9642b0e20 100644 --- a/pkgs/development/java-modules/maven/plugin-api.nix +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -3,8 +3,8 @@ rec { mavenPluginApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-plugin-api"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-api"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenPluginApi_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-plugin-api"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-api"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenPluginApi_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-plugin-api"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-api"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenPluginApi_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-plugin-api"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-api"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -47,8 +47,8 @@ rec { mavenPluginApi_3_0_3 = map (obj: fetchMaven { version = "3.0.3"; - baseName = "maven-plugin-api"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-api"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix index 76f1bf5de1b..dbdc09a4673 100644 --- a/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -3,8 +3,8 @@ rec { mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-plugin-descriptor"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-descriptor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-plugin-descriptor"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-descriptor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenPluginDescriptor_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-plugin-descriptor"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-descriptor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenPluginDescriptor_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-plugin-descriptor"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-descriptor"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index f3ef7c7fc5b..9e11c0f4082 100644 --- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -3,8 +3,8 @@ rec { mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-plugin-parameter-documenter"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-parameter-documenter"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-plugin-parameter-documenter"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-parameter-documenter"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenPluginParameterDocumenter_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-plugin-parameter-documenter"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-parameter-documenter"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenPluginParameterDocumenter_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-plugin-parameter-documenter"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-parameter-documenter"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix index b75806182cf..f0074ef816e 100644 --- a/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -3,8 +3,8 @@ rec { mavenPluginRegistry_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-plugin-registry"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-registry"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenPluginRegistry_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-plugin-registry"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-registry"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenPluginRegistry_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-plugin-registry"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-registry"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenPluginRegistry_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-plugin-registry"; - package = "/org/apache/maven"; + artifactId = "maven-plugin-registry"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix index 754bcc08031..a65f1962048 100644 --- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix +++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix @@ -3,8 +3,8 @@ rec { mavenPluginTestingHarness_1_1 = map (obj: fetchMaven { version = "1.1"; - baseName = "maven-plugin-testing-harness"; - package = "/org/apache/maven/shared"; + artifactId = "maven-plugin-testing-harness"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix index b160fb4e943..6940fafae82 100644 --- a/pkgs/development/java-modules/maven/profile.nix +++ b/pkgs/development/java-modules/maven/profile.nix @@ -3,8 +3,8 @@ rec { mavenProfile_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-profile"; - package = "/org/apache/maven"; + artifactId = "maven-profile"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenProfile_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-profile"; - package = "/org/apache/maven"; + artifactId = "maven-profile"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenProfile_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-profile"; - package = "/org/apache/maven"; + artifactId = "maven-profile"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenProfile_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-profile"; - package = "/org/apache/maven"; + artifactId = "maven-profile"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index f1ff4f05c4c..0b07d8b8679 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -3,8 +3,8 @@ rec { mavenProject_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-project"; - package = "/org/apache/maven"; + artifactId = "maven-project"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenProject_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-project"; - package = "/org/apache/maven"; + artifactId = "maven-project"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenProject_2_0_8 = map (obj: fetchMaven { version = "2.0.8"; - baseName = "maven-project"; - package = "/org/apache/maven"; + artifactId = "maven-project"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenProject_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-project"; - package = "/org/apache/maven"; + artifactId = "maven-project"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -47,8 +47,8 @@ rec { mavenProject_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-project"; - package = "/org/apache/maven"; + artifactId = "maven-project"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix index afb949d79c5..8a508cf1505 100644 --- a/pkgs/development/java-modules/maven/reporting-api.nix +++ b/pkgs/development/java-modules/maven/reporting-api.nix @@ -3,8 +3,8 @@ rec { mavenReportingApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-reporting-api"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting-api"; + groupId = "org.apache.maven.reporting"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenReportingApi_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-reporting-api"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting-api"; + groupId = "org.apache.maven.reporting"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenReportingApi_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-reporting-api"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting-api"; + groupId = "org.apache.maven.reporting"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenReportingApi_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-reporting-api"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting-api"; + groupId = "org.apache.maven.reporting"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix index 1ed2717ac4f..443a1acd451 100644 --- a/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -3,8 +3,8 @@ rec { mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-repository-metadata"; - package = "/org/apache/maven"; + artifactId = "maven-repository-metadata"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-repository-metadata"; - package = "/org/apache/maven"; + artifactId = "maven-repository-metadata"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenRepositoryMetadata_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-repository-metadata"; - package = "/org/apache/maven"; + artifactId = "maven-repository-metadata"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenRepositoryMetadata_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-repository-metadata"; - package = "/org/apache/maven"; + artifactId = "maven-repository-metadata"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix index a18532fa362..6b42082cfd8 100644 --- a/pkgs/development/java-modules/maven/settings.nix +++ b/pkgs/development/java-modules/maven/settings.nix @@ -3,8 +3,8 @@ rec { mavenSettings_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; - baseName = "maven-settings"; - package = "/org/apache/maven"; + artifactId = "maven-settings"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenSettings_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "maven-settings"; - package = "/org/apache/maven"; + artifactId = "maven-settings"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenSettings_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-settings"; - package = "/org/apache/maven"; + artifactId = "maven-settings"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { mavenSettings_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-settings"; - package = "/org/apache/maven"; + artifactId = "maven-settings"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix index 2d4ec372be4..67c44986d0a 100644 --- a/pkgs/development/java-modules/maven/shared-incremental.nix +++ b/pkgs/development/java-modules/maven/shared-incremental.nix @@ -3,8 +3,8 @@ rec { mavenSharedIncremental_1_1 = map (obj: fetchMaven { version = "1.1"; - baseName = "maven-shared-incremental"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-incremental"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix index 9b56075383d..b3cfc928091 100644 --- a/pkgs/development/java-modules/maven/shared-utils.nix +++ b/pkgs/development/java-modules/maven/shared-utils.nix @@ -3,8 +3,8 @@ rec { mavenSharedUtils_0_1 = map (obj: fetchMaven { version = "0.1"; - baseName = "maven-shared-utils"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-utils"; + groupId = "org.apache.maven.shared"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix index cd422bbb758..c1f7fcc3f76 100644 --- a/pkgs/development/java-modules/maven/surefire-api.nix +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -3,8 +3,8 @@ rec { mavenSurefireApi_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; - baseName = "surefire-api"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire-api"; + groupId = "org.apache.maven.surefire"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenSurefireApi_2_17 = map (obj: fetchMaven { version = "2.17"; - baseName = "surefire-api"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire-api"; + groupId = "org.apache.maven.surefire"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix index f7fb8068a26..b62aa86bf45 100644 --- a/pkgs/development/java-modules/maven/surefire-booter.nix +++ b/pkgs/development/java-modules/maven/surefire-booter.nix @@ -3,8 +3,8 @@ rec { mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; - baseName = "surefire-booter"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire-booter"; + groupId = "org.apache.maven.surefire"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenSurefireBooter_2_17 = map (obj: fetchMaven { version = "2.17"; - baseName = "surefire-booter"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire-booter"; + groupId = "org.apache.maven.surefire"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix index 4e56b0c5a86..bc0573f6b70 100644 --- a/pkgs/development/java-modules/maven/surefire-common.nix +++ b/pkgs/development/java-modules/maven/surefire-common.nix @@ -3,8 +3,8 @@ rec { mavenSurefireCommon_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; - baseName = "maven-surefire-common"; - package = "/org/apache/maven/surefire"; + artifactId = "maven-surefire-common"; + groupId = "org.apache.maven.surefire"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenSurefireCommon_2_17 = map (obj: fetchMaven { version = "2.17"; - baseName = "maven-surefire-common"; - package = "/org/apache/maven/surefire"; + artifactId = "maven-surefire-common"; + groupId = "org.apache.maven.surefire"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix index 83aaebc7f6d..1374080d087 100644 --- a/pkgs/development/java-modules/maven/surefire-junit4.nix +++ b/pkgs/development/java-modules/maven/surefire-junit4.nix @@ -3,8 +3,8 @@ rec { mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; - baseName = "surefire-junit4"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire-junit4"; + groupId = "org.apache.maven.surefire"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix index 97ea74a5e52..864d3b98f7b 100644 --- a/pkgs/development/java-modules/maven/toolchain.nix +++ b/pkgs/development/java-modules/maven/toolchain.nix @@ -3,8 +3,8 @@ rec { mavenToolchain_1_0 = map (obj: fetchMaven { version = "1.0"; - baseName = "maven-toolchain"; - package = "/org/apache/maven"; + artifactId = "maven-toolchain"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { mavenToolchain_2_0_9 = map (obj: fetchMaven { version = "2.0.9"; - baseName = "maven-toolchain"; - package = "/org/apache/maven"; + artifactId = "maven-toolchain"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { mavenToolchain_2_2_1 = map (obj: fetchMaven { version = "2.2.1"; - baseName = "maven-toolchain"; - package = "/org/apache/maven"; + artifactId = "maven-toolchain"; + groupId = "org.apache.maven"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index 5cd022b6837..e9ce5b1ce8c 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -10,8 +10,8 @@ in rec { animalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; - baseName = "animal-sniffer-maven-plugin"; - package = "/org/codehaus/mojo"; + artifactId = "animal-sniffer-maven-plugin"; + groupId = "org.codehaus.mojo"; sha512 = obj.sha512; type = obj.type; }) [ @@ -21,8 +21,8 @@ in rec { mavenClean_2_5 = map (obj: fetchMaven rec { version = "2.5"; - baseName = "maven-clean-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-clean-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ @@ -32,8 +32,8 @@ in rec { mavenCompiler_3_1 = map (obj: fetchMaven rec { version = "3.1"; - baseName = "maven-compiler-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-compiler-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ @@ -43,8 +43,8 @@ in rec { mavenEnforcer_1_3_1 = map (obj: fetchMaven rec { version = "1.3.1"; - baseName = "maven-enforcer-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-enforcer-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ @@ -54,8 +54,8 @@ in rec { mavenInstall_2_4 = map (obj: fetchMaven rec { version = "2.4"; - baseName = "maven-install-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-install-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ @@ -65,8 +65,8 @@ in rec { mavenJar_2_4 = map (obj: fetchMaven rec { version = "2.4"; - baseName = "maven-jar-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-jar-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ @@ -76,8 +76,8 @@ in rec { mavenReplacer_1_5_3 = map (obj: fetchMaven rec { version = "1.5.3"; - baseName = "replacer"; - package = "/com/google/code/maven-replacer-plugin"; + artifactId = "replacer"; + groupId = "com.google.code.maven-replacer-plugin"; sha512 = obj.sha512; type = obj.type; }) [ @@ -87,8 +87,8 @@ in rec { mavenResources_2_6 = map (obj: fetchMaven rec { version = "2.6"; - baseName = "maven-resources-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-resources-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ @@ -98,8 +98,8 @@ in rec { mavenSurefire_2_12_4 = map (obj: fetchMaven rec { version = "2.12.4"; - baseName = "maven-surefire-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-surefire-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ @@ -109,8 +109,8 @@ in rec { mavenSurefire_2_17 = map (obj: fetchMaven rec { version = "2.17"; - baseName = "maven-surefire-plugin"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-surefire-plugin"; + groupId = "org.apache.maven.plugins"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix index b6a5565f6fc..dd9b1d1b0aa 100644 --- a/pkgs/development/java-modules/mojo/animal-sniffer.nix +++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix @@ -3,8 +3,8 @@ rec { mojoAnimalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; - baseName = "animal-sniffer"; - package = "/org/codehaus/mojo"; + artifactId = "animal-sniffer"; + groupId = "org.codehaus.mojo"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix index 95eb52ae3e8..245daa5fdb9 100644 --- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix +++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix @@ -3,8 +3,8 @@ rec { mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven { version = "1.11"; - baseName = "java-boot-classpath-detector"; - package = "/org/codehaus/mojo"; + artifactId = "java-boot-classpath-detector"; + groupId = "org.codehaus.mojo"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix index 2fee6529f16..08d18745ed7 100644 --- a/pkgs/development/java-modules/ow2/asm-all.nix +++ b/pkgs/development/java-modules/ow2/asm-all.nix @@ -3,8 +3,8 @@ rec { ow2AsmAll_4_0 = map (obj: fetchMaven { version = "4.0"; - baseName = "asm-all"; - package = "/org/ow2/asm"; + artifactId = "asm-all"; + groupId = "org.ow2.asm"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix index 3a2b0a347e3..384b9285976 100644 --- a/pkgs/development/java-modules/plexus/archiver.nix +++ b/pkgs/development/java-modules/plexus/archiver.nix @@ -3,8 +3,8 @@ rec { plexusArchiver_1_0_alpha7 = map (obj: fetchMaven { version = "1.0-alpha-7"; - baseName = "plexus-archiver"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-archiver"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { plexusArchiver_2_1 = map (obj: fetchMaven { version = "2.1"; - baseName = "plexus-archiver"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-archiver"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix index 2425a6f12ba..c417c955b69 100644 --- a/pkgs/development/java-modules/plexus/build-api.nix +++ b/pkgs/development/java-modules/plexus/build-api.nix @@ -3,8 +3,8 @@ rec { plexusBuildApi_0_0_4 = map (obj: fetchMaven { version = "0.0.4"; - baseName = "plexus-build-api"; - package = "/org/sonatype/plexus"; + artifactId = "plexus-build-api"; + groupId = "org.sonatype.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix index 308287a2904..6ff1755e8f5 100644 --- a/pkgs/development/java-modules/plexus/classworlds.nix +++ b/pkgs/development/java-modules/plexus/classworlds.nix @@ -3,8 +3,8 @@ rec { plexusClassworlds_2_2_2 = map (obj: fetchMaven { version = "2.2.2"; - baseName = "plexus-classworlds"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-classworlds"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { plexusClassworlds_2_4 = map (obj: fetchMaven { version = "2.4"; - baseName = "plexus-classworlds"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-classworlds"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix index 2ef5d3cdab1..11baab0950d 100644 --- a/pkgs/development/java-modules/plexus/compiler-api.nix +++ b/pkgs/development/java-modules/plexus/compiler-api.nix @@ -3,8 +3,8 @@ rec { plexusCompilerApi_2_2 = map (obj: fetchMaven { version = "2.2"; - baseName = "plexus-compiler-api"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-compiler-api"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix index e3f4defd97a..a42064a0e9e 100644 --- a/pkgs/development/java-modules/plexus/compiler-javac.nix +++ b/pkgs/development/java-modules/plexus/compiler-javac.nix @@ -3,8 +3,8 @@ rec { plexusCompilerJavac_2_2 = map (obj: fetchMaven { version = "2.2"; - baseName = "plexus-compiler-javac"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-compiler-javac"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix index 0675fff5004..f7221a96627 100644 --- a/pkgs/development/java-modules/plexus/compiler-manager.nix +++ b/pkgs/development/java-modules/plexus/compiler-manager.nix @@ -3,8 +3,8 @@ rec { plexusCompilerManager_2_2 = map (obj: fetchMaven { version = "2.2"; - baseName = "plexus-compiler-manager"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-compiler-manager"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix index 949238001be..fd3fc80e7e0 100644 --- a/pkgs/development/java-modules/plexus/component-annotations.nix +++ b/pkgs/development/java-modules/plexus/component-annotations.nix @@ -3,8 +3,8 @@ rec { plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven { version = "1.5.5"; - baseName = "plexus-component-annotations"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-component-annotations"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix index 4b9949f3eb3..375a1913afc 100644 --- a/pkgs/development/java-modules/plexus/container-default.nix +++ b/pkgs/development/java-modules/plexus/container-default.nix @@ -3,8 +3,8 @@ rec { plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven { version = "1.0-alpha-9"; - baseName = "plexus-container-default"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-container-default"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { plexusContainerDefault_1_0_alpha9_stable1 = map (obj: fetchMaven { version = "1.0-alpha-9-stable-1"; - baseName = "plexus-container-default"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-container-default"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { plexusContainerDefault_1_5_5 = map (obj: fetchMaven { version = "1.5.5"; - baseName = "plexus-container-default"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-container-default"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix index 8bd73891779..be2013a2676 100644 --- a/pkgs/development/java-modules/plexus/digest.nix +++ b/pkgs/development/java-modules/plexus/digest.nix @@ -3,8 +3,8 @@ rec { plexusDigest_1_0 = map (obj: fetchMaven { version = "1.0"; - baseName = "plexus-digest"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-digest"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix index 7af0cd17de8..5b34cde0503 100644 --- a/pkgs/development/java-modules/plexus/i18n.nix +++ b/pkgs/development/java-modules/plexus/i18n.nix @@ -3,8 +3,8 @@ rec { plexusI18n_1_0_beta6 = map (obj: fetchMaven { version = "1.0-beta-6"; - baseName = "plexus-i18n"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-i18n"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix index 9d62aec70f4..8ada106f48f 100644 --- a/pkgs/development/java-modules/plexus/interactivity-api.nix +++ b/pkgs/development/java-modules/plexus/interactivity-api.nix @@ -3,8 +3,8 @@ rec { plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven { version = "1.0-alpha-4"; - baseName = "plexus-interactivity-api"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-interactivity-api"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix index 2d08495532d..90ff3de6a3f 100644 --- a/pkgs/development/java-modules/plexus/interpolation.nix +++ b/pkgs/development/java-modules/plexus/interpolation.nix @@ -3,8 +3,8 @@ rec { plexusInterpolation_1_11 = map (obj: fetchMaven { version = "1.11"; - baseName = "plexus-interpolation"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-interpolation"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { plexusInterpolation_1_12 = map (obj: fetchMaven { version = "1.12"; - baseName = "plexus-interpolation"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-interpolation"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { plexusInterpolation_1_13 = map (obj: fetchMaven { version = "1.13"; - baseName = "plexus-interpolation"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-interpolation"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { plexusInterpolation_1_15 = map (obj: fetchMaven { version = "1.15"; - baseName = "plexus-interpolation"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-interpolation"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix index 1b17ae3c2ca..eee41f5ed2f 100644 --- a/pkgs/development/java-modules/plexus/io.nix +++ b/pkgs/development/java-modules/plexus/io.nix @@ -3,8 +3,8 @@ rec { plexusIo_2_0_2 = map (obj: fetchMaven { version = "2.0.2"; - baseName = "plexus-io"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-io"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index ca46c0d4d62..ce0537cea7d 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -3,8 +3,8 @@ rec { plexusUtils_1_0_4 = map (obj: fetchMaven { version = "1.0.4"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -14,8 +14,8 @@ rec { plexusUtils_1_0_5 = map (obj: fetchMaven { version = "1.0.5"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -25,8 +25,8 @@ rec { plexusUtils_1_1 = map (obj: fetchMaven { version = "1.1"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -36,8 +36,8 @@ rec { plexusUtils_1_4_1 = map (obj: fetchMaven { version = "1.4.1"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -47,8 +47,8 @@ rec { plexusUtils_1_4_5 = map (obj: fetchMaven { version = "1.4.5"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -58,8 +58,8 @@ rec { plexusUtils_1_4_9 = map (obj: fetchMaven { version = "1.4.9"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -69,8 +69,8 @@ rec { plexusUtils_1_5_1 = map (obj: fetchMaven { version = "1.5.1"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -80,8 +80,8 @@ rec { plexusUtils_1_5_5 = map (obj: fetchMaven { version = "1.5.5"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -91,8 +91,8 @@ rec { plexusUtils_1_5_6 = map (obj: fetchMaven { version = "1.5.6"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -102,8 +102,8 @@ rec { plexusUtils_1_5_8 = map (obj: fetchMaven { version = "1.5.8"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -113,8 +113,8 @@ rec { plexusUtils_1_5_15 = map (obj: fetchMaven { version = "1.5.15"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -124,8 +124,8 @@ rec { plexusUtils_2_0_5 = map (obj: fetchMaven { version = "2.0.5"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -135,8 +135,8 @@ rec { plexusUtils_2_0_6 = map (obj: fetchMaven { version = "2.0.6"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -146,8 +146,8 @@ rec { plexusUtils_3_0 = map (obj: fetchMaven { version = "3.0"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -157,8 +157,8 @@ rec { plexusUtils_3_0_5 = map (obj: fetchMaven { version = "3.0.5"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ @@ -168,8 +168,8 @@ rec { plexusUtils_3_0_8 = map (obj: fetchMaven { version = "3.0.8"; - baseName = "plexus-utils"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 7feff9548a1..610f98a7e46 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -3,848 +3,848 @@ rec { aether_0_9_0_M2 = fetchMaven { version = "0.9.0.M2"; - baseName = "aether"; - package = "/org/eclipse/aether"; + artifactId = "aether"; + groupId = "org.eclipse.aether"; sha512 = "0ampl2jkkc1f5cbigmi1b5nnxhb9qqzz0nyfb5a2vzbw3ri7ry8dj6xgjznlpxib46zxgaxcsvhxq2yx6a9i8chnzvgghccwpl808yi"; type = "pom"; }; animalSnifferParent_1_11 = fetchMaven { version = "1.11"; - baseName = "animal-sniffer-parent"; - package = "/org/codehaus/mojo"; + artifactId = "animal-sniffer-parent"; + groupId = "org.codehaus.mojo"; sha512 = "3w9l3b4qxzmlwmaqppn1d794ycqf5piilv44fc74jccbgahdsq1as8dvyknnj2610yklwxx3146s7f0c3ms8y93alv02wybjwk5fd07"; type = "pom"; }; antParent_1_8_2 = fetchMaven { version = "1.8.2"; - baseName = "ant-parent"; - package = "/org/apache/ant"; + artifactId = "ant-parent"; + groupId = "org.apache.ant"; sha512 = "1q560n9xbqk9qpprvm0nigd5nhm9s8m027qxjmzhay083sjrazscpaly4mzgry5lpdmr3xyhly1r1s88879y04qr5xqzqh0j45j943x"; type = "pom"; }; apache_1 = fetchMaven { version = "1"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "0vbf7mbs61n13dmxndvzkafr0sg9p7g45ng9j1917cz8a9m4zflqf7xvpp9wfprmb4d1wd3ay2hhy9brxryqmvx41wfjlk9ahg34k0h"; type = "pom"; }; apache_3 = fetchMaven { version = "3"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "3vvqxycj7zxa9dfxa6f8i2azdvxc7ci68fk3nlkjvhsglmwr39wf6cwgj6qqlrw3mabzs714lgz0wdacsidncadxzfw774ck20dq1rf"; type = "pom"; }; apache_4 = fetchMaven { version = "4"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6"; type = "pom"; }; apache_5 = fetchMaven { version = "5"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "11l6b46mwm404vahylssab5mj4a1fw3zrjhsz3mcj5x3awnqa03131j8phias2n0rppn53xcg2p2xgr9mbp7llwabwx8jm0kz2mpgh0"; type = "pom"; }; apache_6 = fetchMaven { version = "6"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "2nvwk7fhiqcbr4vrwl0d3g4wz25vll24ga9kyc89fzq6b9nr6bqfphrm5a73kdih97l5cqlszw8xc847viw2ss1mwabn590f01ykhj0"; type = "pom"; }; apache_7 = fetchMaven { version = "7"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "2yvwxxifqypmpgxyx10ggj6l52jnl64f9554kyfdph7z56n02bcalj3cr43m6br0as6yc67k5p23l2k3gvdr66c5dfw1l8rwhahk9lr"; type = "pom"; }; apache_9 = fetchMaven { version = "9"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "0wak95l7zlizrildiji9763zzs10dmhflxaqzg8r9qw2j8a20f2nmns03skvd8na2p12zzvrxa15p952gdfkvrynmvcv2vi1qz822g9"; type = "pom"; }; apache_10 = fetchMaven { version = "10"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "0kmva6f2q5rq7rk9ljwn3rxa4w2j7sjkxsmvambzqpj61cagdnq4vj9jk0xxx8448kqckdh5w2xkr5lr33sgfl67jy9l5h2s6h13v6m"; type = "pom"; }; apache_11 = fetchMaven { version = "11"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "09v6sghdaxinrk3pnpnc36x24z62gqn65v25q83mc0q6n49l0xir55xk21qzc8kc6hrdr9khnr7jxkqz207cyv6wky6sy7c3pqg0na0"; type = "pom"; }; apache_13 = fetchMaven { version = "13"; - baseName = "apache"; - package = "/org/apache"; + artifactId = "apache"; + groupId = "org.apache"; sha512 = "0sf86l1457wwp8czg32xhh96l5nlw8v84lbi59nfdxxzcrsn8b1ysgwda3r1ck0d86c5gjmh3qg7kbwlrspwa71w9zn9sby3bszj99v"; type = "pom"; }; asmParent_4_0 = fetchMaven { version = "4.0"; - baseName = "asm-parent"; - package = "/org/ow2/asm"; + artifactId = "asm-parent"; + groupId = "org.ow2.asm"; sha512 = "2vysz9nn1pn1qzd40n7d2njmcpz7qi37pi73k9ajjmmbzwza6h8gc1pvadfqxlnih47gzc1wn3hqrc1sqd3b84kh8nrznwjcp10y0lf"; type = "pom"; }; backportUtilConcurrent_3_1 = fetchMaven { version = "3.1"; - baseName = "backport-util-concurrent"; - package = "/backport-util-concurrent"; + artifactId = "backport-util-concurrent"; + groupId = "backport-util-concurrent"; sha512 = "38i04cb0dggdjjsvl32wpxfbczl1d696nlpzissjlq9ya197rwa0g0704p7vz71xsylvpdjssb0cyx916xsigcyb95k8c84b2hmdhvr"; type = "pom"; }; beanshell_2_0_b4 = fetchMaven { version = "2.0b4"; - baseName = "beanshell"; - package = "/org/beanshell"; + artifactId = "beanshell"; + groupId = "org.beanshell"; sha512 = "2xwgqmfwli40lvlgjx00ki5zm1290jhjvqg7wnq869kxkw9iam239zxb0jz46jcpbgy10qg6sd86cjw5g38njywcz33501f6byd0n3w"; type = "pom"; }; codehausParent_4 = fetchMaven { version = "4"; - baseName = "codehaus-parent"; - package = "/org/codehaus"; + artifactId = "codehaus-parent"; + groupId = "org.codehaus"; sha512 = "11dacs4155xc3rn3crdayg1yp15abw81lbk6qwi7207009rnyk1kxvs56am9pllkybgja53ri0k084k2ppp4dlhxrg6w3zccbafxlgp"; type = "pom"; }; commonsParent_11 = fetchMaven { version = "11"; - baseName = "commons-parent"; - package = "/org/apache/commons"; + artifactId = "commons-parent"; + groupId = "org.apache.commons"; sha512 = "3986i0mnawni27fqf74zfb1n9wvyn502nvslfmbwz5m3rgvhfdb7r1wj7qz8g3wznfvh3wd99h83d94300yvy6cilqy5sj9gfwxk3jv"; type = "pom"; }; commonsParent_17 = fetchMaven { version = "17"; - baseName = "commons-parent"; - package = "/org/apache/commons"; + artifactId = "commons-parent"; + groupId = "org.apache.commons"; sha512 = "31ijvmfj2yybfy0n4qh7ga8192wg75hs5v26vwm98hgvlppxs9irik4qlqzh4iqq0azp0xl8idz6nn6yb9vzsjxax4c3v5wyk3yvyfy"; type = "pom"; }; commonsParent_22 = fetchMaven { version = "22"; - baseName = "commons-parent"; - package = "/org/apache/commons"; + artifactId = "commons-parent"; + groupId = "org.apache.commons"; sha512 = "1sm8g7iwyc5gi4w73yx3p1f1l81kw8d5wzqzqgdgy7k7hfvmsxlm5r9n99h9r0g5y494ad46hjzf8cwjf8am4rv0qzhrmsqkxyd24wk"; type = "pom"; }; doxia_1_0_alpha6 = fetchMaven { version = "1.0-alpha-6"; - baseName = "doxia"; - package = "/org/apache/maven/doxia"; + artifactId = "doxia"; + groupId = "org.apache.maven.doxia"; sha512 = "0ya69g2xfzawf30r2n45n85h2bag0ihd2cbkd0896ykwndx62jyagc594f9pkvb8x9vwgq1dkhfc5lfw1sjcmsxm9dmyzvy2nmykpsy"; type = "pom"; }; doxia_1_0_alpha7 = fetchMaven { version = "1.0-alpha-7"; - baseName = "doxia"; - package = "/org/apache/maven/doxia"; + artifactId = "doxia"; + groupId = "org.apache.maven.doxia"; sha512 = "0fg3l7dyi0c7r1h9rzjn23gv57kc67jpzlcji6yh4nawp3byfbz1rq8wnbj3av3wd29v9h2ff34p06ia9wxbs8q3kz4xy31w7sw7fxg"; type = "pom"; }; doxia_1_0_alpha10 = fetchMaven { version = "1.0-alpha-10"; - baseName = "doxia"; - package = "/org/apache/maven/doxia"; + artifactId = "doxia"; + groupId = "org.apache.maven.doxia"; sha512 = "3by91czdkjn4myc6xwzap37ydmhvic4myr8p2zflnpawrph00jkz9pivd84k2qykvmc5gxzbmklf1inwvkq1f5bsyhh440mlvsfsn1s"; type = "pom"; }; doxia_1_0 = fetchMaven { version = "1.0"; - baseName = "doxia"; - package = "/org/apache/maven/doxia"; + artifactId = "doxia"; + groupId = "org.apache.maven.doxia"; sha512 = "3z04h87dwn5panpr68ajzflw5n4wgi98isl5snz6vrd2vz9744fdqggmn6698wljw9h4pzkvjyrxf9b7w4km6w7kma28akvn951vw99"; type = "pom"; }; enforcer_1_3_1 = fetchMaven { version = "1.3.1"; - baseName = "enforcer"; - package = "/org/apache/maven/enforcer"; + artifactId = "enforcer"; + groupId = "org.apache.maven.enforcer"; sha512 = "1m84z5x2gxlbj9bl2jrfzh26pl7nz1d79sv72clp565z4lr2r1abih2c7aigbd95zik948dqrbh2vzm7vp1iv0d23vk89rx4nmfg0rv"; type = "pom"; }; googleParent_1 = fetchMaven { version = "1"; - baseName = "google"; - package = "/com/google"; + artifactId = "google"; + groupId = "com.google"; sha512 = "22whj7li6dvh4xjcdx1hwlh13ar8c8d9snal6ynnbsd566n9g0kif2fx75q5j4kwmqzb2yj3c3vxdfzg82650gkyvjm2x6cb35vdi30"; type = "pom"; }; hamcrestParent_1_3 = fetchMaven { version = "1.3"; - baseName = "hamcrest-parent"; - package = "/org/hamcrest"; + artifactId = "hamcrest-parent"; + groupId = "org.hamcrest"; sha512 = "1da3ivp9n1h3hl35vhgd7avi4xh8p0802qj7xrk93gbz01s2av28p6ycdwiwp7kja0151wm5jvbgpnkxd8azqwkh7dh83w22k7jpwh3"; type = "pom"; }; jclOverSlf4j_1_5_6 = fetchMaven { version = "1.5.6"; - baseName = "jcl-over-slf4j"; - package = "/org/slf4j"; + artifactId = "jcl-over-slf4j"; + groupId = "org.slf4j"; sha512 = "3ync9p7ws4p8p494jifarwpqblmbkkl6r6rw4bms8fk6ija0ifxn6q5za3pxvp690p5lzw2zkgidr51rqxk8w1ms69pb1nib1r4j578"; type = "pom"; }; maven_2_0_1 = fetchMaven { version = "2.0.1"; - baseName = "maven"; - package = "/org/apache/maven"; + artifactId = "maven"; + groupId = "org.apache.maven"; sha512 = "02n3kpll7w5iqaijawmm4rzr35sbv826c9vp1fzfnrgbvpfw22yrsjv2z416pzk2qyjh3wx7pc5xxxxdchmpzcxm694vsdl67ki2rrz"; type = "pom"; }; maven_2_0_6 = fetchMaven { version = "2.0.6"; - baseName = "maven"; - package = "/org/apache/maven"; + artifactId = "maven"; + groupId = "org.apache.maven"; sha512 = "2k58pvcrdc52zsq6id4vl8a45srxllm2m49namqkzix4356haphk3i06px9jcc2cmkqw7bcpqh5xvvmkds5vhp2b9y9b0i2lcfgx8jw"; type = "pom"; }; maven_2_0_8 = fetchMaven { version = "2.0.8"; - baseName = "maven"; - package = "/org/apache/maven"; + artifactId = "maven"; + groupId = "org.apache.maven"; sha512 = "0mzlba0vbanxvdgfvj3kq6xw211j40b6hk6w0b7lc686m2c26vgxks9iisgm10888lq140i6510813326bs9yb053hqfvnz3m72lkss"; type = "pom"; }; maven_2_0_9 = fetchMaven { version = "2.0.9"; - baseName = "maven"; - package = "/org/apache/maven"; + artifactId = "maven"; + groupId = "org.apache.maven"; sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0"; type = "pom"; }; maven_2_2_1 = fetchMaven { version = "2.2.1"; - baseName = "maven"; - package = "/org/apache/maven"; + artifactId = "maven"; + groupId = "org.apache.maven"; sha512 = "1bdf85rb7b3dvw9gjv376pk908jgvb35hs8p6fp4pzp19pj71150if09lmhw07gvy7sdd92daw7jmijmi1f9w4gxhkbqhvzkb7qx1rs"; type = "pom"; }; maven_3_0_3 = fetchMaven { version = "3.0.3"; - baseName = "maven"; - package = "/org/apache/maven"; + artifactId = "maven"; + groupId = "org.apache.maven"; sha512 = "397qqkh9qd2aj346v4nvxrhaqz6k75l5xnm1xcqd0d4mmxg0p7jlz54yzkshqli2w5df9f7p8pavpkiw5xkl8ipxmp87vfcanvkx4x4"; type = "pom"; }; mavenParent_5 = fetchMaven { version = "5"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "1810h5ziij9awpf2c6sgqlwd93dd3c54rxbnjxar97idw2zkmwqfxvxi74qjcpbqqam3ypxb893k3958jmhbrzmwhwbkhxyyiqgjsx0"; type = "pom"; }; mavenParent_6 = fetchMaven { version = "6"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "2z9rkv875yx64mpbf1mgyb3hcxqbhr0ndczwqlmkgd05a679d4vyi92fndaz1bcfwc5bmmxf4s6zrg58swv05j2j9d6vqd2b0x385dq"; type = "pom"; }; mavenParent_8 = fetchMaven { version = "8"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp"; type = "pom"; }; mavenParent_11 = fetchMaven { version = "11"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "21lz2qb0sl9akirk7fcbj7ldfgnq5nqy90s3hfvmfvz2spk1ppa5yq3702m7z72l3jpbm9vrcm4dvarar314lwjp3477p558gwcpkqf"; type = "pom"; }; mavenParent_13 = fetchMaven { version = "13"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "0vgjwpmnvcjfif84s5x19ixlxg4413mfma9f10v7klv88b08vwvkpwjnffgzrlqvp5524d8zyswshqkwpdqb0klgppxiipd52d546vw"; type = "pom"; }; mavenParent_15 = fetchMaven { version = "15"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "390z5v0nygsw075fa5jzl5baxb0bripiiy6arqk550zlg8dw8mcg6cyscwnh3zw4gxyr1qbcy0v8wsj375xc65i2agkzg1qbv5z6xxp"; type = "pom"; }; mavenParent_21 = fetchMaven { version = "21"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "2dph51qjkmh9sixd12rgxhrvl3w5r7nmr4n3ra4y1lifml6h0md0indj3qw4lxm0db811p3hxf2f9l0gf6w4q5ypjp20lk9ia2xm5s0"; type = "pom"; }; mavenParent_22 = fetchMaven { version = "22"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "112xv5inpan05vkm12g2lpz37pgga1nm8rar2bqhibvwljg4yv1myx8z99g0nkd3gzbgw5098aagm006w6bnmwsibwd1js8is5d4r88"; type = "pom"; }; mavenParent_23 = fetchMaven { version = "23"; - baseName = "maven-parent"; - package = "/org/apache/maven"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; sha512 = "3c6ydqi3sf5aq3aj42kxgrjpcf8wpl0rf6hmr6vkas04w0h4dyvjb78ipyxsqzqgzjm6cmdfhxzx8hjb2lwvy3ipf1x39j6cj7dwdy8"; type = "pom"; }; mavenPlugins_22 = fetchMaven { version = "22"; - baseName = "maven-plugins"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-plugins"; + groupId = "org.apache.maven.plugins"; sha512 = "14xy4s69dvqllkspc5b8q1gdbi0wn494ghwcdfcvjzvgczjhhxbr1h698amv3zmg59gb7liz77ws4vmcar8j9lazywcv13cy1myiywa"; type = "pom"; }; mavenPlugins_23 = fetchMaven { version = "23"; - baseName = "maven-plugins"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-plugins"; + groupId = "org.apache.maven.plugins"; sha512 = "1vh7izahb4sskja66hqrygv1r8iwpl97kp65yx6z3fnm761brag89fdcl4jl9hypvm57alf283gvq9rsy5kqnqcdki20k5vw26y1b1a"; type = "pom"; }; mavenPlugins_24 = fetchMaven { version = "24"; - baseName = "maven-plugins"; - package = "/org/apache/maven/plugins"; + artifactId = "maven-plugins"; + groupId = "org.apache.maven.plugins"; sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs"; type = "pom"; }; mavenPluginTools_3_1 = fetchMaven { version = "3.1"; - baseName = "maven-plugin-tools"; - package = "/org/apache/maven/plugin-tools"; + artifactId = "maven-plugin-tools"; + groupId = "org.apache.maven.plugin-tools"; sha512 = "2410rvvhnpwdg67slwb05v7vnpbvq00d36mbsc77parw4v9n3sr1hqai803g8q54lzv05zzcm7knkjv5ip5wcbvzrh0dr4f5lm904wy"; type = "pom"; }; mavenPluginTools_3_2 = fetchMaven { version = "3.2"; - baseName = "maven-plugin-tools"; - package = "/org/apache/maven/plugin-tools"; + artifactId = "maven-plugin-tools"; + groupId = "org.apache.maven.plugin-tools"; sha512 = "28qhbacsb69rcp86l3lkc3d83267qdwwpl0zm134rxi58wy4y4rd8nz2yzk6yx4x8h0drq776b2qnr4ps1da1ybsvsi2sc655scx3lf"; type = "pom"; }; mavenReporting_2_0_1 = fetchMaven { version = "2.0.1"; - baseName = "maven-reporting"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting"; + groupId = "org.apache.maven.reporting"; sha512 = "3ns0j0w3g3xzvi4y2nbz7yl3w0bq6npvkpy56c2s2m8z0b0007vw97qm3z7b6iicwck69g9001qqqanhzr35x1qbzlqzrx5v271hvfa"; type = "pom"; }; mavenReporting_2_0_6 = fetchMaven { version = "2.0.6"; - baseName = "maven-reporting"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting"; + groupId = "org.apache.maven.reporting"; sha512 = "3bi678sg28yxhlby4d3a6mq9fhg1qnjb57kbkhi7dfx9g0c1p6cxhg8cixjz9wv31lkjpspbpp1fq0z29a93lqrjqczlg8a7i1sg554"; type = "pom"; }; mavenReporting_2_0_9 = fetchMaven { version = "2.0.9"; - baseName = "maven-reporting"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting"; + groupId = "org.apache.maven.reporting"; sha512 = "0cg49pq6rvk7c84xwnpq2p47b7y973sy9qfgzcq06bnrqm6cj26h8k7d9kpp3q3rd2hlw10db4sjfx0crlai27cbbz41i5m22lq21s5"; type = "pom"; }; mavenReporting_2_2_1 = fetchMaven { version = "2.2.1"; - baseName = "maven-reporting"; - package = "/org/apache/maven/reporting"; + artifactId = "maven-reporting"; + groupId = "org.apache.maven.reporting"; sha512 = "02gs0nk2hihvayh7gxn1ncbq7nq1hbpr40whby6c58adk7g6jq3cn84fi8svcv10w915f696drav1cimjpizcyjn00if1iql59dmfda"; type = "pom"; }; mavenSharedComponents_7 = fetchMaven { version = "7"; - baseName = "maven-shared-components"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-components"; + groupId = "org.apache.maven.shared"; sha512 = "35zwvraafv86jpyfvfmi76n9bzmahq5z90j9axb3b6d0wfvildz5qb43kw27si2ldwghiwsfh2jikd3gf9ms553pfillf4baab13dp6"; type = "pom"; }; mavenSharedComponents_11 = fetchMaven { version = "11"; - baseName = "maven-shared-components"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-components"; + groupId = "org.apache.maven.shared"; sha512 = "3g30bgx3nhw1pwq5nq7ns17vs53cck3zrk6b4sqh56my7vhdv08v0n94l326q9f51sxvnsn11zmpnn8zri8hz2ci1g61ymgi2d0mxyd"; type = "pom"; }; mavenSharedComponents_12 = fetchMaven { version = "12"; - baseName = "maven-shared-components"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-components"; + groupId = "org.apache.maven.shared"; sha512 = "1x5q96gigd54qp60i20kvmwi604ga55fc70gkz1nwn5fjmy36rlxldhhdij3kcpnxpwqp4dwxq717ai8rqv3lzjif8pxd06wzmz0q09"; type = "pom"; }; mavenSharedComponents_17 = fetchMaven { version = "17"; - baseName = "maven-shared-components"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-components"; + groupId = "org.apache.maven.shared"; sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy"; type = "pom"; }; mavenSharedComponents_18 = fetchMaven { version = "18"; - baseName = "maven-shared-components"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-components"; + groupId = "org.apache.maven.shared"; sha512 = "2qqabrvgs4kb14v28qkfwj16n715mj5mh4m8aw0dybi5igmrvwh1d8jsjggdfbh929m6499w8x5s6aw0gbzmfzr3wjkz54dqxnm49p0"; type = "pom"; }; mavenSharedComponents_19 = fetchMaven { version = "19"; - baseName = "maven-shared-components"; - package = "/org/apache/maven/shared"; + artifactId = "maven-shared-components"; + groupId = "org.apache.maven.shared"; sha512 = "1na6rh2mlwq6yrg7jxxnkcjj4ki0lqcihwiq2cy2ygsd6q0z8fn755frrd1j1jvd5dnh8jxjqp1m5mpwwv13hxhy8lmq95a5pp2a2qh"; type = "pom"; }; mojoParent_32 = fetchMaven { version = "32"; - baseName = "mojo-parent"; - package = "/org/codehaus/mojo"; + artifactId = "mojo-parent"; + groupId = "org.codehaus.mojo"; sha512 = "15pzaqpdcr8c2w2b2ms3qc5d3r0flmzqav6h45nmg1l8nv7529lp6dkilhkwqag1i94vh8dvqnkxm475j9v2hxmz981azrvz7984z8w"; type = "pom"; }; ow2_1_3 = fetchMaven { version = "1.3"; - baseName = "ow2"; - package = "/org/ow2"; + artifactId = "ow2"; + groupId = "org.ow2"; sha512 = "1jqfqqmh19lvrjk45zzzp895jbxb8giw8sn1qdvwhh1yqxr1z5vkv98n4g0ib2l359qmb9fal4d21ba57zmbl0rqxqlggv9c5l87gfs"; type = "pom"; }; plexus_1_0_4 = fetchMaven { version = "1.0.4"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "22zsqss9aws73zvgqaz1brnvhk8bqn0flzd644nikprbb9dh1jyv1jig7xaxj942wq1w8h6ybx6b3v1ysfr8kw1z70sb5yrb4zd4kkm"; type = "pom"; }; plexus_1_0_8 = fetchMaven { version = "1.0.8"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "1nwv49smddfvqn1fhi8aj993pkzsxa033a9g97z7sc3aia5wzwz86azzyrklgxywc26c3k3mw8vfzv758rv3v7cn0hfmyfzfkrg8vwp"; type = "pom"; }; plexus_1_0_11 = fetchMaven { version = "1.0.11"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "20fb1yvg26wg3lih55m8m4i1idiffyg3jlkvazmxqqvnahz2llgd5cfvqcrzg8lkinnypr4ic5glci4lza46k1sfl5nrviyfx0n7kgr"; type = "pom"; }; plexus_1_0_12 = fetchMaven { version = "1.0.12"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "2ckzb1z4hgmp2r61a05v3aqapkfnyfs4b7wrf60aiymrz57kliyq3nn50h7bj6ak9hlpyzxpqgqps0chzfpizr8v0abdkjmbplvw2ai"; type = "pom"; }; plexus_2_0_2 = fetchMaven { version = "2.0.2"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "095kxnh9238wlnxsbsl7wj3zsp2ijwx8p8bvbmsvj3iacw9fsvddv263j485zfjf4ipvp5dwqc3sc8mqkwbhx1qj7k1x1hj14nl6r8z"; type = "pom"; }; plexus_2_0_3 = fetchMaven { version = "2.0.3"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "15adqpm0gz7c0jwjd4yk0k8h4h7vnz15v1fdmzb6rgs6avl1dx84r5l0fqs6b02kw008rg68inii7nl4m5xwqrj807wr8qzrjm02cam"; type = "pom"; }; plexus_2_0_6 = fetchMaven { version = "2.0.6"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "07rrw1yldy4c2qvwv3hcf9rdbr0jf57qsnnv2ai9fajwhjyjkgjixm2zlsid41bm2w8hacg9crzy6nfz8yh1sdh5p767niy9jripq2h"; type = "pom"; }; plexus_2_0_7 = fetchMaven { version = "2.0.7"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "2ddbjp60y8g7n56hya5qa59f980a8sdj0d1dicv3na3pbc6k4wgdrix78lgg32sp4fzmxl7fyzw9gy3z2vpzf65zkj3c9yh030jcysr"; type = "pom"; }; plexus_3_0_1 = fetchMaven { version = "3.0.1"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "3rjh4msw1qjpj0vmc90f89zjkzcyahzh93jrpw25qb2wn0v18jgw65g0ai7ynssdh113kxi816syqcw8vbqwvhlr2b0acrmszy0jnps"; type = "pom"; }; plexus_3_1 = fetchMaven { version = "3.1"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "1zyyzy6zvf73bnv8c76x2lmffllqqrgk1k8kpravcrd809acfslip1w7w8kr0rg3sc7554875wsq8fbhq3zdvxwjpzwgz4l5rjr3lmr"; type = "pom"; }; plexus_3_2 = fetchMaven { version = "3.2"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "07y1vwz55l9yzfhix5w5fw5xvdj854c1ri1wws6r23xzyp5bqwrrz0x5ln26w05w78vpj1rvrq1mkk192vfr80si3ccr063aschf6ld"; type = "pom"; }; plexus_3_3_1 = fetchMaven { version = "3.3.1"; - baseName = "plexus"; - package = "/org/codehaus/plexus"; + artifactId = "plexus"; + groupId = "org.codehaus.plexus"; sha512 = "1q1p0sfzkhdpknaf0ysq7vzd0qip9q86z62nwamfh9gdsp7lh99kh6hmxav2daha462c3jra6clfniyqrbvs07jwjhf4c79rwhnqc2q"; type = "pom"; }; plexusCipher_1_4 = fetchMaven { version = "1.4"; - baseName = "plexus-cipher"; - package = "/org/sonatype/plexus"; + artifactId = "plexus-cipher"; + groupId = "org.sonatype.plexus"; sha512 = "1m4f7n6ch8gbwgvz7h8iab0jkan8ws3qq9776qc10k0kj6i3227kskk5s8pxlq9vrxw498jmjnkiga41fy33khrgvsvls2hrj9vv1g1"; type = "pom"; }; plexusCompiler_2_2 = fetchMaven { version = "2.2"; - baseName = "plexus-compiler"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-compiler"; + groupId = "org.codehaus.plexus"; sha512 = "26sr1hg214qf65nym85viv1z4nk1bgqahx7n4bq3did49s9ymgz2c08vw7zdlcqws5jndz9n2xlyq285plgv3xx2mxrrsi2r24zmw29"; type = "pom"; }; plexusCompilers_2_2 = fetchMaven { version = "2.2"; - baseName = "plexus-compilers"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-compilers"; + groupId = "org.codehaus.plexus"; sha512 = "0yvvc8mdz1vd7mpw9h568mhlfxh3qpbz4qpyr5iw7f5ifm46gxsmnfd36ah6mn9hxh6lpra3mi536y5cv1k5mrbr128a1lwyr8p14rg"; type = "pom"; }; plexusComponents_1_1_4 = fetchMaven { version = "1.1.4"; - baseName = "plexus-components"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-components"; + groupId = "org.codehaus.plexus"; sha512 = "02kdl9z8nz26h4qf9mrdm8s1y2gy1f57n825yy0y3qifavlv51k2yxza7mjsdl1dwrq84c4qlj79iqlisnhrppfy0ncbbblnbir1yln"; type = "pom"; }; plexusComponents_1_1_6 = fetchMaven { version = "1.1.6"; - baseName = "plexus-components"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-components"; + groupId = "org.codehaus.plexus"; sha512 = "1m6f5xzp6mk1n0svznqc8l5x3klr9kk75223ms31q65llx765dxvrsmkjlzgshb0ipb9nfxwk9hs5fvf5dgh0xlzrnc1w2pnqdi8jnh"; type = "pom"; }; plexusComponents_1_1_7 = fetchMaven { version = "1.1.7"; - baseName = "plexus-components"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-components"; + groupId = "org.codehaus.plexus"; sha512 = "2mh1qfbaf6f6nv0nj0g8skgv82jv1l2zg7iivd2jjrzrwnpkc58ajfl1wmylwpz035d9dd713h9szkwy2hdd6pardbc4ja2w4qv5s91"; type = "pom"; }; plexusComponents_1_1_14 = fetchMaven { version = "1.1.14"; - baseName = "plexus-components"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-components"; + groupId = "org.codehaus.plexus"; sha512 = "2gf578c23wz38cnjnp8w80b6hzmfnzrv6is1yf52qrfcijk84fnj4k8wrqg0jms9yz6l5rkkv40zm2j7kkbxgn862mnh4i4qxcb604g"; type = "pom"; }; plexusComponents_1_1_15 = fetchMaven { version = "1.1.15"; - baseName = "plexus-components"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-components"; + groupId = "org.codehaus.plexus"; sha512 = "0lfzdq1wlsnkiapzjs8cqi2kzkaw9lfjhdhmf1pz2x83m5njfx2y59v14wgcs2k4cig8kjr45v4qnmd7mp03k8gginzflc1qi1y7yv6"; type = "pom"; }; plexusComponents_1_1_19 = fetchMaven { version = "1.1.19"; - baseName = "plexus-components"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-components"; + groupId = "org.codehaus.plexus"; sha512 = "01mllmbwfrimvsgmc3wfxp60nm999xa4abp0ywpxdrvbb88dwr4g7sg3mlz22xhc8pky72mif882ppgrdxj01lx3lmm84p3g5f51bii"; type = "pom"; }; plexusComponents_1_3_1 = fetchMaven { version = "1.3.1"; - baseName = "plexus-components"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-components"; + groupId = "org.codehaus.plexus"; sha512 = "16bnfja035zb508f340y64v4vk7pkldn8bvnxvbk0grk8a76rirsn4dl60x3hgmasgkb0y75gr9qp4y72m079klhgg0mbvcfvslkxqb"; type = "pom"; }; plexusContainers_1_0_3 = fetchMaven { version = "1.0.3"; - baseName = "plexus-containers"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-containers"; + groupId = "org.codehaus.plexus"; sha512 = "39sw2lxlrgbj1zlf67qz14j53sxd45p1qmna5cfizqikrwiqrnb6xwdxr2rsp3h2kadwwpz6id2ls6x3hr93znkad404rg4lg11v9nj"; type = "pom"; }; plexusContainers_1_5_5 = fetchMaven { version = "1.5.5"; - baseName = "plexus-containers"; - package = "/org/codehaus/plexus"; + artifactId = "plexus-containers"; + groupId = "org.codehaus.plexus"; sha512 = "1dzg3ry73scisq02p1c96rn04rvdpyf9v6cbvvmy6hvcaw11y8mmjwjnlayljhr9za5hhq5bwv2vssmp683v3qjr5750f9aa62jxw0w"; type = "pom"; }; plexusSecDispatcher_1_3 = fetchMaven { version = "1.3"; - baseName = "plexus-sec-dispatcher"; - package = "/org/sonatype/plexus"; + artifactId = "plexus-sec-dispatcher"; + groupId = "org.sonatype.plexus"; sha512 = "09blh68dwrh3zix33cbfbvmxbbm7ck80pwp9x4v1ilf11y6hgm065jx39viqm0zlr86kwngrlm4skrgjw5v67aj2q7d7kd5jgj5s0qc"; type = "pom"; }; sisuInject_2_1_1 = fetchMaven { version = "2.1.1"; - baseName = "sisu-inject"; - package = "/org/sonatype/sisu"; + artifactId = "sisu-inject"; + groupId = "org.sonatype.sisu"; sha512 = "0720p7ai7l1wqs2rfcgpvgd1rc3p2bdpp51a57jmqbgh9msr54iy0c6n0ipybd9lrl88iz4l8cc1s73qj5appf8r481bbwgv4wxi19v"; type = "pom"; }; sisuInjectGuiceBean_2_1_1 = fetchMaven { version = "2.1.1"; - baseName = "guice-bean"; - package = "/org/sonatype/sisu/inject"; + artifactId = "guice-bean"; + groupId = "org.sonatype.sisu.inject"; sha512 = "2arva9197d03whnavfspz8wm7fw8iqrhacp10984lxwig221m34p5bb9vmhn8bbswf7d8whzf9q5lsq9mxbmd2c90kc1m7n7qja6qq5"; type = "pom"; }; sisuInjectGuicePlexus_2_1_1 = fetchMaven { version = "2.1.1"; - baseName = "guice-plexus"; - package = "/org/sonatype/sisu/inject"; + artifactId = "guice-plexus"; + groupId = "org.sonatype.sisu.inject"; sha512 = "0gspz9n6vbnlbx33xynm4sg0wxlr89i8490gcl0y0qw6mvjjqfwv1dqgncm9xp41mb21i00gxq0ml6d4wfr0sdayk9m736b826lrvq4"; type = "pom"; }; sisuParent_2_1_1 = fetchMaven { version = "2.1.1"; - baseName = "sisu-parent"; - package = "/org/sonatype/sisu"; + artifactId = "sisu-parent"; + groupId = "org.sonatype.sisu"; sha512 = "2z006ib6azrxf5s02ixv5plc1db0rglnv2m8k4il0s144v63ay98wjxawcc1chld64iribhhby6wnlv2fxvv8sl9mr03qb2q2isflgc"; type = "pom"; }; slf4jApi_1_5_6 = fetchMaven { version = "1.5.6"; - baseName = "slf4j-api"; - package = "/org/slf4j"; + artifactId = "slf4j-api"; + groupId = "org.slf4j"; sha512 = "3ahxd5zfxpwrp97yq74xfhrh02a7hnmcdxk5rwjn4v5hcms9b98iizsgd2ssjxa1vy784jh45f6k8qby1c1bdcwk9y18mkcw79zhl2n"; type = "pom"; }; slf4jJdk14_1_5_6 = fetchMaven { version = "1.5.6"; - baseName = "slf4j-jdk14"; - package = "/org/slf4j"; + artifactId = "slf4j-jdk14"; + groupId = "org.slf4j"; sha512 = "11yiy09mlm5dq2ir05n97nka3sqwn48k47x4d2vqmgjsk3vz255m8ilxvq5hjjzygyw0prcrp4zbwkphb5his00pw8f4hczd1w16nvr"; type = "pom"; }; slf4jParent_1_5_6 = fetchMaven { version = "1.5.6"; - baseName = "slf4j-parent"; - package = "/org/slf4j"; + artifactId = "slf4j-parent"; + groupId = "org.slf4j"; sha512 = "036cizr5vh557l65jiv706iiy1q1s3lkr1xqa1hd5yspawd111d5iq8q3qdsw07c3rmxq7n9sflgcj08bhs149ni119fdr7hn9cx0nl"; type = "pom"; }; sonatypeForgeParent_3 = fetchMaven { version = "3"; - baseName = "forge-parent"; - package = "/org/sonatype/forge"; + artifactId = "forge-parent"; + groupId = "org.sonatype.forge"; sha512 = "20x89zl6k0wgd1gb6ysxm6bmgqxwyz3d7zyjn8bwzkz93k7lxnxm0k7skvha283q9ay4cd2vkjisi5avl1f3wvz89rrwg136gmdlksv"; type = "pom"; }; sonatypeForgeParent_4 = fetchMaven { version = "4"; - baseName = "forge-parent"; - package = "/org/sonatype/forge"; + artifactId = "forge-parent"; + groupId = "org.sonatype.forge"; sha512 = "0j13rfddklh25sdwppxvdn97y3l8vy809g2w5zpflh74v0rh0q04ylm3j2nj5hf3ypmgx3lhdp161jbv3l47gl7gh60fk3rnq17kfbq"; type = "pom"; }; sonatypeForgeParent_5 = fetchMaven { version = "5"; - baseName = "forge-parent"; - package = "/org/sonatype/forge"; + artifactId = "forge-parent"; + groupId = "org.sonatype.forge"; sha512 = "1l3nll0i5cpf2rh5f4gqriwy2737n9sccr605nx1swn1qafbxbvvs4jl7argdzz0mkzrr8sir7vnksm9a273vrdica9l35nxivm6vrx"; type = "pom"; }; sonatypeForgeParent_7 = fetchMaven { version = "7"; - baseName = "forge-parent"; - package = "/org/sonatype/forge"; + artifactId = "forge-parent"; + groupId = "org.sonatype.forge"; sha512 = "3l6c336cm6wnrw2l7lr0wg83w1304bggvw4qydh5bqbbyfpdgwqa3pbfkq4x760k3wqwarnlpf31fz2dp6abrynjl4rr1lv68j1hhyn"; type = "pom"; }; sonatypeForgeParent_10 = fetchMaven { version = "10"; - baseName = "forge-parent"; - package = "/org/sonatype/forge"; + artifactId = "forge-parent"; + groupId = "org.sonatype.forge"; sha512 = "3fpnvrxfkxpxqdsn6g7w1zyql4v0z9iqbjprhh4c6rldrbvq4h3yh7dl5sw4h7av516zhmb3bkc9ycfdr5gs34sfb6f6x5hk7qc374a"; type = "pom"; }; sonatypeParent_7 = fetchMaven { version = "7"; - baseName = "oss-parent"; - package = "/org/sonatype/oss"; + artifactId = "oss-parent"; + groupId = "org.sonatype.oss"; sha512 = "3xk0q7y2kdarr3l42dqjzq9qz1r840abqw9zhvl4gpc8jw5xcbqd781fp8z41i3hrkyaf740f2kppji9l77ci7f759d5s9yg4grbc33"; type = "pom"; }; sonatypeSpiceParent_10 = fetchMaven { version = "10"; - baseName = "spice-parent"; - package = "/org/sonatype/spice"; + artifactId = "spice-parent"; + groupId = "org.sonatype.spice"; sha512 = "0gg2cxqvfmg6jk7qi2f4hcgskpd1ysnf1d5vay8dza40wfbk2vy7qvhgjhg55dpbjkadmsj483hg81qdzwqbxmagd2xr9j9062hbja8"; type = "pom"; }; sonatypeSpiceParent_12 = fetchMaven { version = "12"; - baseName = "spice-parent"; - package = "/org/sonatype/spice"; + artifactId = "spice-parent"; + groupId = "org.sonatype.spice"; sha512 = "3bx63k5frr99ma5wcjlqlym7qr6x1m031hns35rpvz039s9cxcn8r3f7slwqaa7s19i3j46kwgxirnhs4ylcddql4rsibaqjwy9lh0d"; type = "pom"; }; sonatypeSpiceParent_16 = fetchMaven { version = "16"; - baseName = "spice-parent"; - package = "/org/sonatype/spice"; + artifactId = "spice-parent"; + groupId = "org.sonatype.spice"; sha512 = "0awfi8vf4xc5c9510sas7xqlik4g8ljivay372cksvlcwlgyrgliikak0xxbxj72df5b9jzc9fzvjxd9rlllnnlnm4zllw5p2hakb0g"; type = "pom"; }; sonatypeSpiceParent_17 = fetchMaven { version = "17"; - baseName = "spice-parent"; - package = "/org/sonatype/spice"; + artifactId = "spice-parent"; + groupId = "org.sonatype.spice"; sha512 = "1jqqp5xylm9bjz33wab7mj49xqczvkhpp4aysrcngszxmil61kanpjmn5ks5r0hq4waj0bqnr91p2p9a7ylqnqjs6ib1x9psl5c9cyw"; type = "pom"; }; surefire_2_12_4 = fetchMaven { version = "2.12.4"; - baseName = "surefire"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire"; + groupId = "org.apache.maven.surefire"; sha512 = "1zyppjqqwpzcp16g7v49r9fsgdvrny325r583kpis5497ic0qbcczxn53x7s1hnmhgcs33dr0k3alrwl7m574lm2qdgj0s8x18pl6gb"; type = "pom"; }; surefire_2_17 = fetchMaven { version = "2.17"; - baseName = "surefire"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire"; + groupId = "org.apache.maven.surefire"; sha512 = "3yraw37xwayyrvwa62y6li3wbzrha08j389psz16j1dawxmg78zlm2x1jmgz3nzdb60n9kk143606bgs3vrf7ri9d5pwkg9lvw7hk92"; type = "pom"; }; surefireProviders_2_12_4 = fetchMaven { version = "2.12.4"; - baseName = "surefire-providers"; - package = "/org/apache/maven/surefire"; + artifactId = "surefire-providers"; + groupId = "org.apache.maven.surefire"; sha512 = "08di6wgiihz9svrdpkdvhlipdp83byd1s844fnjqfk3z0g5a72lpq718zy27rk41jma3hclmr4pv0g5dvbhf3v8hy92iby8w5rcxv5x"; type = "pom"; }; xbean_3_4 = fetchMaven { version = "3.4"; - baseName = "xbean"; - package = "/org/apache/xbean"; + artifactId = "xbean"; + groupId = "org.apache.xbean"; sha512 = "2qdd1srj7ahskmxp1cb3gkxgdmy0ms4m5mi43mvfrl085fp58f67ip2y0w4r0xfwzds12727yili6hciiwix9i6hx7wasi5sa9djcp6"; type = "pom"; }; diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix index 9fb70fad446..51a004ed545 100644 --- a/pkgs/development/java-modules/sisu/guice.nix +++ b/pkgs/development/java-modules/sisu/guice.nix @@ -3,8 +3,8 @@ rec { sisuGuice_2_9_4 = map (obj: fetchMaven { version = "2.9.4"; - baseName = "sisu-guice"; - package = "/org/sonatype/sisu"; + artifactId = "sisu-guice"; + groupId = "org.sonatype.sisu"; suffix = "-no_aop"; sha512 = obj.sha512; type = obj.type; diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix index fba7130cfbd..bca16ccd114 100644 --- a/pkgs/development/java-modules/sisu/inject-bean.nix +++ b/pkgs/development/java-modules/sisu/inject-bean.nix @@ -3,8 +3,8 @@ rec { sisuInjectBean_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; - baseName = "sisu-inject-bean"; - package = "/org/sonatype/sisu"; + artifactId = "sisu-inject-bean"; + groupId = "org.sonatype.sisu"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix index 73335ec951e..0a181dc1a1e 100644 --- a/pkgs/development/java-modules/sisu/inject-plexus.nix +++ b/pkgs/development/java-modules/sisu/inject-plexus.nix @@ -3,8 +3,8 @@ rec { sisuInjectPlexus_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; - baseName = "sisu-inject-plexus"; - package = "/org/sonatype/sisu"; + artifactId = "sisu-inject-plexus"; + groupId = "org.sonatype.sisu"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix index 7b04e21f50e..11295b3128f 100644 --- a/pkgs/development/java-modules/xerces/impl.nix +++ b/pkgs/development/java-modules/xerces/impl.nix @@ -3,8 +3,8 @@ rec { xercesImpl_2_8_0 = map (obj: fetchMaven { version = "2.8.0"; - baseName = "xercesImpl"; - package = "/xerces"; + artifactId = "xercesImpl"; + groupId = "xerces"; sha512 = obj.sha512; type = obj.type; }) [ diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix index 44044a35a57..a96e3670b40 100644 --- a/pkgs/development/java-modules/xml-apis/default.nix +++ b/pkgs/development/java-modules/xml-apis/default.nix @@ -3,8 +3,8 @@ rec { xmlApis_1_3_03 = map (obj: fetchMaven { version = "1.3.03"; - baseName = "xml-apis"; - package = "/xml-apis"; + artifactId = "xml-apis"; + groupId = "xml-apis"; sha512 = obj.sha512; type = obj.type; }) [ From f4d188b37a8750a3d2dd28efbfb2a6aaf7d482e5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 23 Feb 2017 15:56:28 +0800 Subject: [PATCH 011/274] msmtp: 1.6.4 -> 1.6.6 --- pkgs/applications/networking/msmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 0754d4f2815..8e3668a9823 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }: stdenv.mkDerivation rec { - version = "1.6.4"; + version = "1.6.6"; name = "msmtp-${version}"; src = fetchurl { url = "mirror://sourceforge/msmtp/${name}.tar.xz"; - sha256 = "1kfihblm769s4hv8iah5mqynqd6hfwlyz5rcg2v423a4llic0jcv"; + sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs"; }; buildInputs = [ openssl pkgconfig gnutls gsasl libidn ] From 1c466059d187b13665d258dbb4daafbcb4d557ec Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 23 Feb 2017 15:57:53 +0800 Subject: [PATCH 012/274] msmtp: clean up msmtpq - replace relative bin paths with absolute filenames in the nix store - make the log and queue paths configurable - log to the journal on linux --- .../applications/networking/msmtp/default.nix | 45 ++++++--- .../applications/networking/msmtp/paths.patch | 96 +++++++++++++++++++ 2 files changed, 128 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/networking/msmtp/paths.patch diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 8e3668a9823..1eab140e1d7 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,30 +1,49 @@ -{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }: +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +, openssl, netcat, gnutls, gsasl, libidn, Security, systemd }: -stdenv.mkDerivation rec { - version = "1.6.6"; +let + tester = "n"; # {x| |p|P|n|s} + journal = if stdenv.isLinux then "y" else "n"; + +in stdenv.mkDerivation rec { name = "msmtp-${version}"; + version = "1.6.6"; src = fetchurl { url = "mirror://sourceforge/msmtp/${name}.tar.xz"; sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs"; }; - buildInputs = [ openssl pkgconfig gnutls gsasl libidn ] + patches = [ + ./paths.patch + ]; + + buildInputs = [ openssl gnutls gsasl libidn ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' - cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/ - chmod +x $prefix/bin/msmtp-queue $prefix/bin/msmtpq + substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \ + --replace @msmtp@ $out/bin/msmtp \ + --replace @nc@ ${netcat}/bin/nc \ + --replace @journal@ ${journal} \ + ${lib.optionalString (journal == "y") "--replace @systemdcat@ ${systemd}/bin/systemd-cat" } \ + --replace @test@ ${tester} + + substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \ + --replace @msmtpq@ $out/bin/msmtpq + + chmod +x $out/bin/* ''; - meta = { - description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = "http://msmtp.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.unix; - }; + meta = with stdenv.lib; { + description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; + homepage = "http://msmtp.sourceforge.net/"; + license = licenses.gpl3; + maintainers = with maintainers; [ garbas peterhoeg ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch new file mode 100644 index 00000000000..38e4155a113 --- /dev/null +++ b/pkgs/applications/networking/msmtp/paths.patch @@ -0,0 +1,96 @@ +diff --git a/scripts/msmtpq/msmtp-queue b/scripts/msmtpq/msmtp-queue +index 1dc220d..d834241 100755 +--- a/scripts/msmtpq/msmtp-queue ++++ b/scripts/msmtpq/msmtp-queue +@@ -27,4 +27,4 @@ + ## change the below line to be + ## exec /path/to/msmtpq --q-mgmt + +-exec msmtpq --q-mgmt "$1" ++exec @msmtpq@ --q-mgmt "$1" +diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq +index bdb4fb8..1363a67 100755 +--- a/scripts/msmtpq/msmtpq ++++ b/scripts/msmtpq/msmtpq +@@ -59,7 +59,7 @@ err() { dsp '' "$@" '' ; exit 1 ; } + ## enter the location of the msmtp executable (no quotes !!) + ## e.g. ( MSMTP=/path/to/msmtp ) + ## and uncomment the test for its existence +-MSMTP=msmtp ++MSMTP=@msmtp@ + #[ -x "$MSMTP" ] || \ + # log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit + ## +@@ -70,9 +70,8 @@ MSMTP=msmtp + ## ( chmod 0700 msmtp.queue ) + ## + ## the queue dir - modify this to reflect where you'd like it to be (no quotes !!) +-Q=~/.msmtp.queue +-[ -d "$Q" ] || \ +- err '' "msmtpq : can't find msmtp queue directory [ $Q ]" '' # if not present - complain ; quit ++Q=${MSMTP_QUEUE:-~/.msmtp.queue} ++test -d "$Q" || mkdir -p "$Q" + ## + ## set the queue log file var to the location of the msmtp queue log file + ## where it is or where you'd like it to be +@@ -84,7 +83,10 @@ Q=~/.msmtp.queue + ## (doing so would be inadvisable under most conditions, however) + ## + ## the queue log file - modify (or comment out) to taste (but no quotes !!) +-LOG=~/log/msmtp.queue.log ++LOG=${MSMTP_LOG:-~/log/msmtp.queue.log} ++test -d "$(dirname $LOG)" || mkdir -p "$(dirname $LOG)" ++ ++JOURNAL=@journal@ + ## ====================================================================================== + + ## msmtpq can use the following environment variables : +@@ -108,7 +110,7 @@ LOG=~/log/msmtp.queue.log + ## + #EMAIL_CONN_NOTEST=y # deprecated ; use below var + #EMAIL_CONN_TEST={x| |p|P|n|s} # see settings above for EMAIL_CONN_TEST +-EMAIL_CONN_TEST=n ++EMAIL_CONN_TEST=@test@ + #EMAIL_QUEUE_QUIET=t + ## ====================================================================================== + +@@ -138,6 +140,7 @@ on_exit() { # unlock the queue on exit if the lock was + ## display msg to user, as well + ## + log() { ++ local NAME=msmtpq + local ARG RC PFX="$('date' +'%Y %d %b %H:%M:%S')" + # time stamp prefix - "2008 13 Mar 03:59:45 " + if [ "$1" = '-e' ] ; then # there's an error exit code +@@ -154,10 +157,19 @@ log() { + done + fi + ++ if [ "$JOURNAL" == "y" ] ; then ++ for ARG ; do ++ [ -n "$ARG" ] && \ ++ echo "$PFX : $ARG" | @systemdcat@ -t $NAME -p info ++ done ++ fi ++ + if [ -n "$RC" ] ; then # an error ; leave w/error return + [ -n "$LKD" ] && lock_queue -u # unlock here (if locked) + [ -n "$LOG" ] && \ + echo " exit code = $RC" >> "$LOG" # logging ok ; send exit code to log ++ [ "$JOURNAL" == "y" ] && \ ++ echo "exit code= $RC" | @systemdcat@ -t $NAME -p emerg + exit $RC # exit w/return code + fi + } +@@ -207,10 +219,7 @@ connect_test() { + ping -qnc1 -w4 8.8.8.8 >/dev/null 2>&1 || return 1 + + elif [ "$EMAIL_CONN_TEST" = 'n' ] ; then # use netcat (nc) test +- # must, of course, have netcat (nc) installed +- which nc >/dev/null 2>&1 || \ +- log -e 1 "msmtpq : can't find netcat executable [ nc ]" # if not found - complain ; quit +- 'nc' -vz www.debian.org 80 >/dev/null 2>&1 || return 1 ++ @nc@ -vz www.debian.org 80 >/dev/null 2>&1 || return 1 + + elif [ "$EMAIL_CONN_TEST" = 's' ] ; then # use sh sockets test + # note that this does not work on debian systems From 8103499e9d3444de8ebc9d9e0974cfc8b6344fce Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 20 Feb 2017 16:31:01 +0100 Subject: [PATCH 013/274] pythonPackages.channels: 1.0.2 -> 1.0.3 --- .../python-modules/channels/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------------- 2 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/channels/default.nix diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix new file mode 100644 index 00000000000..c7466d242c7 --- /dev/null +++ b/pkgs/development/python-modules/channels/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchurl, + asgiref, django, daphne +}: +buildPythonPackage rec { + name = "channels-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://pypi/c/channels/${name}.tar.gz"; + sha256 = "1bwlqnfc27p1qnjmdl8jnr941gpl8ggnxxfy8anh9qgmg20q9pfd"; + }; + + # Files are missing in the distribution + doCheck = false; + + propagatedBuildInputs = [ asgiref django daphne ]; + + meta = with stdenv.lib; { + description = "Brings event-driven capabilities to Django with a channel system"; + license = licenses.bsd3; + homepage = https://github.com/django/channels; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 224aae7b574..659da2c66f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2391,26 +2391,7 @@ in { }; }; - channels = buildPythonPackage rec { - name = "channels-${version}"; - version = "1.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/channels/${name}.tar.gz"; - sha256 = "0d8fywg416p851i8vz26pmz8b47akg5z10yw7xc7i51cpmp7y5zj"; - }; - - # Files are missing in the distribution - doCheck = false; - - propagatedBuildInputs = with self ; [ asgiref django daphne ]; - - meta = { - description = "Brings event-driven capabilities to Django with a channel system"; - license = licenses.bsd3; - homepage = https://github.com/django/channels; - }; - }; + channels = callPackage ../development/python-modules/channels {}; circus = buildPythonPackage rec { name = "circus-0.11.1"; From 4d5093f5e1bccd8d8762e7e88ba1749ec6aaee95 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 20 Feb 2017 16:31:36 +0100 Subject: [PATCH 014/274] pythonPackages.daphne: 1.0.1 -> 1.0.3 --- .../python-modules/daphne/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------------- 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/daphne/default.nix diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix new file mode 100644 index 00000000000..6e19d9d9e86 --- /dev/null +++ b/pkgs/development/python-modules/daphne/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchurl, + asgiref, autobahn, twisted +}: +buildPythonPackage rec { + name = "daphne-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://pypi/d/daphne/${name}.tar.gz"; + sha256 = "1bpavq3sxr66mqwnnfg67pcchyaq7siqyin2r89aqadf6nab58d2"; + }; + + propagatedBuildInputs = [ asgiref autobahn twisted ]; + + meta = with stdenv.lib; { + description = "Django ASGI (HTTP/WebSocket) server"; + license = licenses.bsd3; + homepage = https://github.com/django/daphne; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 659da2c66f5..50a9e792dfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5895,23 +5895,7 @@ in { }; }); - daphne = buildPythonPackage rec { - name = "daphne-${version}"; - version = "1.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/daphne/${name}.tar.gz"; - sha256 = "0l62bd9swv0k9qcpl2s8kj4mgl6qayi0krwkkg1x73a9y48xpi9z"; - }; - - propagatedBuildInputs = with self; [ asgiref autobahn ]; - - meta = { - description = "Django ASGI (HTTP/WebSocket) server"; - license = licenses.bsd3; - homepage = https://github.com/django/daphne; - }; - }; + daphne = callPackage ../development/python-modules/daphne { }; dateparser = buildPythonPackage rec { name = "dateparser-${version}"; From 19e65c4c46d1464488fe1fab6265803ba279d5d5 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 22 Feb 2017 21:39:29 +0800 Subject: [PATCH 015/274] crystal: 0.20.5 -> 0.21.0 --- pkgs/development/compilers/crystal/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 6202a8e968b..b8cbceb9767 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }: stdenv.mkDerivation rec { - version = "0.20.5"; + version = "0.21.0"; name = "crystal-${version}-1"; arch = { @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "fd077c0a727419e131b1be6198a5aa5820ecbdaafd2d2bb38be5716ba75b5100"; - "i686-linux" = "e3a890f11833c57c9004655d108f981c7c630cd7a939f828d9a6c571705bc3e7"; - "x86_64-darwin" = "79462c8ff994b36cff219c356967844a17e8cb2817bb24a196a960a08b8c9e47"; + "x86_64-linux" = "0a44539df3813baea4381c314ad5f782b13cf1596e478851c52cd84193cc7a1f"; + "i686-linux" = "9a45287f94d329f5ebe77f5a0d71cd0e09c3db79b0b56f6fe4a5166beed707ef"; + "x86_64-darwin" = "e92abb33a9a592febb4e629ad68375b2577acd791a71220b8dc407904be469ee"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "ee1e5948c6e662ccb1e62671cf2c91458775b559b23d74ab226dc2a2d23f7707"; + sha256 = "4dd01703f5304a0eda7f02fc362fba27ba069666097c0f921f8a3ee58808779c"; }; # crystal on Darwin needs libiconv to build From 65a228a2b1b74c2132e629534303bcb8deecddb5 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 25 Feb 2017 17:38:38 -0500 Subject: [PATCH 016/274] haskellPackages: use makeExtensible --- pkgs/development/haskell-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index d2ecc338128..2ee01bf9e11 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -6,7 +6,7 @@ let - inherit (stdenv.lib) fix' extends; + inherit (stdenv.lib) fix' extends makeExtensible; haskellPackages = self: let @@ -109,7 +109,7 @@ let in - fix' + makeExtensible (extends overrides (extends packageSetConfig (extends compilerConfig From 60b9948229b3bb9e0c6c9c3a2a868b88e8bdd14f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 27 Feb 2017 11:03:17 +0100 Subject: [PATCH 017/274] pythonPackages.djangorestframework: 3.2.3 -> 3.5.4 --- .../djangorestframework/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/djangorestframework/default.nix diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix new file mode 100644 index 00000000000..5ad026a8255 --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchurl, django }: +buildPythonPackage rec { + name = "djangorestframework-${version}"; + version = "3.5.4"; + + src = fetchurl { + url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; + sha256 = "1rays9d8jxqng13fv18ldf11y44w0ln6vvj2k8m4sd9gw9da75gr"; + }; + + # Test settings are missing + doCheck = false; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Web APIs for Django, made easy"; + homepage = http://www.django-rest-framework.org/; + maintainers = with maintainers; [ desiderius ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a1488740bc7..99c3e1b09ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10617,26 +10617,7 @@ in { }; }; - djangorestframework = buildPythonPackage rec { - name = "djangorestframework-${version}"; - version = "3.2.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "06kp4hg3y4bqy2ixlb1q6bw81gwgsb86l4lanbav7bp1grrbbnj1"; - }; - - doCheck = false; - - propagatedBuildInputs = with self; [ django ]; - - meta = { - description = "Web APIs for Django, made easy"; - homepage = http://www.django-rest-framework.org/; - maintainers = with maintainers; [ desiderius ]; - license = licenses.bsd2; - }; - }; + djangorestframework = callPackage ../development/python-modules/djangorestframework { }; django_raster = buildPythonPackage rec { name = "django-raster-${version}"; From c1f8c0879cb9e4d21f18b2332111ef1191753c41 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 27 Feb 2017 19:36:30 +0100 Subject: [PATCH 018/274] nodePackages.yo: init at 1.8.5 --- .../node-packages/node-packages-v4.nix | 3588 +++++++++++++---- .../node-packages/node-packages-v6.nix | 2677 ++++++++---- .../node-packages/node-packages.json | 1 + 3 files changed, 4574 insertions(+), 1692 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index ceebd52b61c..af5e09054e2 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -67,22 +67,22 @@ let sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; }; }; - "uglify-js-2.4.15" = { + "uglify-js-2.6.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.4.15"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; - sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; - "resolve-1.2.0" = { + "resolve-1.3.2" = { name = "resolve"; packageName = "resolve"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"; - sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"; + sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235"; }; }; "global-paths-0.1.2" = { @@ -112,13 +112,13 @@ let sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; }; }; - "moment-2.10.6" = { + "moment-2.17.1" = { name = "moment"; packageName = "moment"; - version = "2.10.6"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"; - sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77"; + url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; + sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; "node.extend-1.0.10" = { @@ -202,22 +202,13 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "source-map-0.1.34" = { + "source-map-0.5.6" = { name = "source-map"; packageName = "source-map"; - version = "0.1.34"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; - sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; - }; - }; - "optimist-0.3.7" = { - name = "optimist"; - packageName = "optimist"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; "uglify-to-browserify-1.0.2" = { @@ -229,22 +220,139 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "wordwrap-0.0.3" = { + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; - version = "0.0.3"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "kind-of-3.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; + sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "is-buffer-1.1.4" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; + sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + }; + }; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; }; }; "array-unique-0.2.1" = { @@ -337,6 +445,15 @@ let sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; }; }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; "xml2js-0.2.8" = { name = "xml2js"; packageName = "xml2js"; @@ -490,13 +607,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.17.0" = { + "azure-arm-network-0.18.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz"; - sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz"; + sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -643,13 +760,13 @@ let sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; - "azure-arm-storage-0.13.1-preview" = { + "azure-arm-storage-0.15.0-preview" = { name = "azure-arm-storage"; packageName = "azure-arm-storage"; - version = "0.13.1-preview"; + version = "0.15.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.13.1-preview.tgz"; - sha1 = "9342515a44e632c48f1d0d9c7a98214ed563d8f7"; + url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz"; + sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e"; }; }; "azure-asm-sb-0.10.1" = { @@ -697,13 +814,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-1.3.0" = { + "azure-storage-2.0.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "1.3.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz"; - sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz"; + sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0"; }; }; "azure-arm-batch-0.3.0" = { @@ -850,40 +967,31 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "kuduscript-1.0.9" = { + "kuduscript-1.0.13" = { name = "kuduscript"; packageName = "kuduscript"; - version = "1.0.9"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.9.tgz"; - sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz"; + sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e"; }; }; - "moment-2.17.1" = { - name = "moment"; - packageName = "moment"; - version = "2.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; - sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; - }; - }; - "ms-rest-1.15.4" = { + "ms-rest-1.15.5" = { name = "ms-rest"; packageName = "ms-rest"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz"; - sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz"; + sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d"; }; }; - "ms-rest-azure-1.15.4" = { + "ms-rest-azure-1.15.5" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz"; - sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz"; + sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611"; }; }; "node-forge-0.6.23" = { @@ -895,13 +1003,13 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "omelette-0.1.0" = { + "omelette-0.3.2" = { name = "omelette"; packageName = "omelette"; - version = "0.1.0"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/omelette/-/omelette-0.1.0.tgz"; - sha1 = "31cc7eb472a513c07483d24d3e1bf164cb0d23b8"; + url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz"; + sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; }; }; "openssl-wrapper-0.2.1" = { @@ -1048,15 +1156,6 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -1246,15 +1345,6 @@ let sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; }; }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - }; "browserify-mime-1.2.9" = { name = "browserify-mime"; packageName = "browserify-mime"; @@ -1264,6 +1354,15 @@ let sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; }; }; + "extend-1.2.1" = { + name = "extend"; + packageName = "extend"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + }; "json-edm-parser-0.1.2" = { name = "json-edm-parser"; packageName = "json-edm-parser"; @@ -1273,6 +1372,15 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; + "md5.js-1.3.4" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + }; + }; "readable-stream-2.0.6" = { name = "readable-stream"; packageName = "readable-stream"; @@ -1291,13 +1399,13 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; + "hash-base-3.0.3" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.3.tgz"; + sha1 = "87ec48734bfe354275535150b14821566b083807"; }; }; "inherits-2.0.3" = { @@ -1309,6 +1417,15 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1525,13 +1642,13 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "rimraf-2.5.4" = { + "rimraf-2.6.1" = { name = "rimraf"; packageName = "rimraf"; - version = "2.5.4"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; - sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; + sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; }; }; "minimist-0.0.8" = { @@ -1813,13 +1930,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.2.1" = { + "qs-6.2.2" = { name = "qs"; packageName = "qs"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz"; + sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586"; }; }; "stringstream-0.0.5" = { @@ -1858,13 +1975,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.1.4" = { + "async-2.1.5" = { name = "async"; packageName = "async"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; - sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; "lodash-4.17.4" = { @@ -1894,13 +2011,13 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "is-my-json-valid-2.15.0" = { + "is-my-json-valid-2.16.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; - sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz"; + sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693"; }; }; "pinkie-promise-2.0.1" = { @@ -2299,13 +2416,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.2" = { + "readable-stream-2.2.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz"; + sha1 = "9cf49463985df016c8ae8813097a9293a9b33729"; }; }; "buffer-shims-1.0.0" = { @@ -2335,13 +2452,13 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; - "qs-6.3.0" = { + "qs-6.3.1" = { name = "qs"; packageName = "qs"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; - sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz"; + sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d"; }; }; "asap-2.0.5" = { @@ -2713,15 +2830,6 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -3145,13 +3253,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.3.0" = { + "JSONStream-1.3.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz"; - sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; + sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; }; }; "assert-1.4.1" = { @@ -3199,13 +3307,13 @@ let sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; - "cached-path-relative-1.0.0" = { + "cached-path-relative-1.0.1" = { name = "cached-path-relative"; packageName = "cached-path-relative"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz"; - sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; }; }; "concat-stream-1.5.2" = { @@ -3334,13 +3442,13 @@ let sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "module-deps-4.0.8" = { + "module-deps-4.1.1" = { name = "module-deps"; packageName = "module-deps"; - version = "4.0.8"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz"; - sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; "os-browserify-0.1.2" = { @@ -3568,15 +3676,6 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -3784,13 +3883,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.3" = { + "elliptic-6.4.0" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz"; - sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; "parse-asn1-5.0.0" = { @@ -3802,13 +3901,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.7" = { + "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; - version = "1.0.7"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz"; - sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; "hash.js-1.0.3" = { @@ -3820,6 +3919,24 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; + "hmac-drbg-1.0.0" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; + sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; "asn1.js-4.9.1" = { name = "asn1.js"; packageName = "asn1.js"; @@ -3865,15 +3982,6 @@ let sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; }; }; - "is-buffer-1.1.4" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; - }; - }; "lexical-scope-1.2.0" = { name = "lexical-scope"; packageName = "lexical-scope"; @@ -4684,6 +4792,15 @@ let sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; }; }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -5215,22 +5332,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.2.2" = { + "simple-peer-6.4.3" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.2.2"; + version = "6.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz"; - sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz"; + sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a"; }; }; - "simple-websocket-4.3.0" = { + "simple-websocket-4.3.1" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz"; - sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz"; + sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; "string2compact-1.2.2" = { @@ -5242,13 +5359,13 @@ let sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; }; }; - "ws-1.1.1" = { + "ws-1.1.2" = { name = "ws"; packageName = "ws"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; - sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; + url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; + sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; }; }; "ipaddr.js-1.2.0" = { @@ -5269,13 +5386,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.0.3" = { + "ws-2.1.0" = { name = "ws"; packageName = "ws"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz"; - sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb"; + url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz"; + sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92"; }; }; "ultron-1.1.0" = { @@ -6493,6 +6610,15 @@ let sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"; }; }; + "abbrev-1.1.0" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; + sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; + }; + }; "abbrev-1.0.9" = { name = "abbrev"; packageName = "abbrev"; @@ -6826,6 +6952,15 @@ let sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; }; }; + "rimraf-2.5.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; + sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + }; + }; "sha-2.0.1" = { name = "sha"; packageName = "sha"; @@ -7645,22 +7780,22 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.1.6" = { + "rc-1.1.7" = { name = "rc"; packageName = "rc"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz"; - sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9"; + url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz"; + sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"; }; }; - "strip-json-comments-1.0.4" = { + "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; - version = "1.0.4"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; "clone-2.1.0" = { @@ -9080,22 +9215,22 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.14.0" = { + "globals-9.16.0" = { name = "globals"; packageName = "globals"; - version = "9.14.0"; + version = "9.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz"; - sha1 = "8859936af0038741263053b39d0e76ca241e4034"; + url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz"; + sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80"; }; }; - "ignore-3.2.2" = { + "ignore-3.2.4" = { name = "ignore"; packageName = "ignore"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz"; - sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz"; + sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8"; }; }; "inquirer-0.12.0" = { @@ -9188,15 +9323,6 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - }; "table-3.8.3" = { name = "table"; packageName = "table"; @@ -9773,13 +9899,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.0.17" = { + "fsevents-1.1.1" = { name = "fsevents"; packageName = "fsevents"; - version = "1.0.17"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz"; - sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz"; + sha1 = "f19fd28f43eeaf761680e519a203c4d0b3d31aff"; }; }; "micromatch-2.3.11" = { @@ -9845,15 +9971,6 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "kind-of-3.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; - sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; - }; - }; "normalize-path-2.0.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -9962,15 +10079,6 @@ let sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"; }; }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -9980,13 +10088,13 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; - "for-own-0.1.4" = { + "for-own-0.1.5" = { name = "for-own"; packageName = "for-own"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz"; - sha1 = "0149b41a39088c7515f51ebe1c1386d45f935072"; + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; }; }; "is-extendable-0.1.1" = { @@ -9998,13 +10106,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.6" = { + "for-in-1.0.1" = { name = "for-in"; packageName = "for-in"; - version = "0.1.6"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; - sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz"; + sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa"; }; }; "glob-base-0.3.0" = { @@ -10260,13 +10368,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.3" = { + "coffee-script-1.12.4" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; - sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; + sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; }; }; "jade-1.11.0" = { @@ -10305,13 +10413,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.24" = { + "clean-css-3.4.25" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.24"; + version = "3.4.25"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz"; - sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz"; + sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"; }; }; "commander-2.6.0" = { @@ -10476,85 +10584,13 @@ let sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }; }; "acorn-globals-1.0.9" = { @@ -11358,6 +11394,15 @@ let sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; }; }; + "strip-json-comments-1.0.4" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + }; "xml-1.0.0" = { name = "xml"; packageName = "xml"; @@ -11583,13 +11628,13 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.5.0" = { + "connect-3.6.0" = { name = "connect"; packageName = "connect"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; - sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz"; + sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e"; }; }; "core-js-2.4.1" = { @@ -11664,22 +11709,22 @@ let sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; }; }; - "socket.io-1.7.2" = { + "socket.io-1.7.3" = { name = "socket.io"; packageName = "socket.io"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz"; - sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz"; + sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; - "tmp-0.0.28" = { + "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; - version = "0.0.28"; + version = "0.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; - sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; }; }; "useragent-2.1.12" = { @@ -11709,6 +11754,15 @@ let sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; + "qs-6.2.1" = { + name = "qs"; + packageName = "qs"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + }; + }; "raw-body-2.2.0" = { name = "raw-body"; packageName = "raw-body"; @@ -11718,13 +11772,13 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; - "finalhandler-0.5.0" = { + "finalhandler-1.0.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz"; + sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755"; }; }; "custom-event-1.0.1" = { @@ -11817,13 +11871,13 @@ let sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "engine.io-1.8.2" = { + "engine.io-1.8.3" = { name = "engine.io"; packageName = "engine.io"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz"; - sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz"; + sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4"; }; }; "has-binary-0.1.7" = { @@ -11853,13 +11907,13 @@ let sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; }; }; - "socket.io-client-1.7.2" = { + "socket.io-client-1.7.3" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz"; - sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz"; + sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377"; }; }; "socket.io-parser-2.3.1" = { @@ -11961,13 +12015,13 @@ let sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; - "engine.io-client-1.8.2" = { + "engine.io-client-1.8.3" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz"; - sha1 = "c38767547f2a7d184f5752f6f0ad501006703766"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz"; + sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab"; }; }; "object-component-0.0.3" = { @@ -12753,13 +12807,13 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "convert-source-map-1.3.0" = { + "convert-source-map-1.4.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz"; - sha1 = "e9f3e9c6e2728efc2676696a70eb382f73106a67"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz"; + sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3"; }; }; "express-2.5.11" = { @@ -13113,6 +13167,15 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; + "serve-favicon-2.4.0" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz"; + sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0"; + }; + }; "strong-data-uri-1.0.4" = { name = "strong-data-uri"; packageName = "strong-data-uri"; @@ -13221,6 +13284,24 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; + "etag-1.8.0" = { + name = "etag"; + packageName = "etag"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; + sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; + }; + }; + "fresh-0.4.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.4.0.tgz"; + sha1 = "475626a934a8d3480b2101a1d6ecef7dafd7c553"; + }; + }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -13563,6 +13644,15 @@ let sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; }; }; + "ws-1.1.1" = { + name = "ws"; + packageName = "ws"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; + sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; + }; + }; "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; @@ -13572,13 +13662,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.16" = { + "node-red-node-email-0.1.21" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.16"; + version = "0.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz"; - sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz"; + sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; }; }; "node-red-node-twitter-0.1.9" = { @@ -13770,6 +13860,15 @@ let sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; }; }; + "finalhandler-0.5.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; + sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + }; + }; "send-0.14.1" = { name = "send"; packageName = "send"; @@ -13788,13 +13887,13 @@ let sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; }; }; - "cookies-0.6.2" = { + "cookies-0.7.0" = { name = "cookies"; packageName = "cookies"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz"; - sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.0.tgz"; + sha1 = "0bc961d910c35254980fc7c9eff5da12011bbf00"; }; }; "i18next-client-1.10.3" = { @@ -14733,15 +14832,6 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "aproba-1.0.4" = { - name = "aproba"; - packageName = "aproba"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; - sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; - }; - }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14751,6 +14841,15 @@ let sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; }; }; + "lazy-property-1.0.0" = { + name = "lazy-property"; + packageName = "lazy-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz"; + sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -14841,13 +14940,13 @@ let sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df"; }; }; - "opener-1.4.2" = { + "opener-1.4.3" = { name = "opener"; packageName = "opener"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; - sha1 = "b32582080042af8680c389a499175b4c54fff523"; + url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz"; + sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; "read-cmd-shim-1.0.1" = { @@ -15255,6 +15354,15 @@ let sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; }; }; + "aproba-1.0.4" = { + name = "aproba"; + packageName = "aproba"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; + sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + }; + }; "request-2.75.0" = { name = "request"; packageName = "request"; @@ -15519,13 +15627,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.15" = { + "service-runner-2.2.4" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.15"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz"; - sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz"; + sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c"; }; }; "simplediff-0.1.1" = { @@ -15645,13 +15753,13 @@ let sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; }; }; - "limitation-0.1.9" = { + "limitation-0.2.0" = { name = "limitation"; packageName = "limitation"; - version = "0.1.9"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz"; - sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; + url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz"; + sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; }; }; "yargs-6.6.0" = { @@ -15663,6 +15771,15 @@ let sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; + "dnscache-1.0.1" = { + name = "dnscache"; + packageName = "dnscache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz"; + sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; + }; + }; "dtrace-provider-0.8.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -15844,6 +15961,24 @@ let sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; + "lodash.clone-4.3.2" = { + name = "lodash.clone"; + packageName = "lodash.clone"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz"; + sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9"; + }; + }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; "lodash.assign-4.2.0" = { name = "lodash.assign"; packageName = "lodash.assign"; @@ -16807,13 +16942,13 @@ let sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.21" = { + "recast-0.11.22" = { name = "recast"; packageName = "recast"; - version = "0.11.21"; + version = "0.11.22"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz"; - sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz"; + sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa"; }; }; "ast-types-0.9.5" = { @@ -17177,6 +17312,15 @@ let sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; }; }; + "http-errors-1.6.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; + sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; + }; + }; "fs-ext-0.5.0" = { name = "fs-ext"; packageName = "fs-ext"; @@ -17294,6 +17438,15 @@ let sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; }; }; + "setprototypeof-1.0.3" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + }; + }; "lru-cache-2.2.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -17681,6 +17834,15 @@ let sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; }; }; + "acorn-4.0.11" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; + }; + }; "enhanced-resolve-2.3.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -17870,15 +18032,6 @@ let sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; }; }; - "uglify-js-2.6.1" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; - sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; - }; - }; "xmldom-0.1.22" = { name = "xmldom"; packageName = "xmldom"; @@ -17888,13 +18041,13 @@ let sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; }; }; - "qs-6.0.2" = { + "qs-6.0.3" = { name = "qs"; packageName = "qs"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz"; + sha1 = "95f870b23e70268fba18704e80667515905af06c"; }; }; "blueimp-md5-2.6.0" = { @@ -17987,6 +18140,15 @@ let sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; + "node-cache-4.1.1" = { + name = "node-cache"; + packageName = "node-cache"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz"; + sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; + }; + }; "npm-4.1.2" = { name = "npm"; packageName = "npm"; @@ -18059,13 +18221,13 @@ let sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; }; }; - "color-string-1.4.0" = { + "color-string-1.5.0" = { name = "color-string"; packageName = "color-string"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz"; - sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz"; + sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce"; }; }; "color-name-1.1.1" = { @@ -18320,15 +18482,6 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; - }; - }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -18338,15 +18491,6 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "acorn-4.0.11" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; - sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; - }; - }; "acorn-dynamic-import-2.0.1" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; @@ -18383,13 +18527,13 @@ let sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; - "loader-utils-0.2.16" = { + "loader-utils-0.2.17" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.16"; + version = "0.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; - sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz"; + sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; }; }; "memory-fs-0.4.1" = { @@ -18410,13 +18554,13 @@ let sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; - "watchpack-1.2.0" = { + "watchpack-1.3.1" = { name = "watchpack"; packageName = "watchpack"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz"; - sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz"; + sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87"; }; }; "webpack-sources-0.1.4" = { @@ -18491,13 +18635,13 @@ let sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; }; }; - "babel-runtime-6.22.0" = { + "babel-runtime-6.23.0" = { name = "babel-runtime"; packageName = "babel-runtime"; - version = "6.22.0"; + version = "6.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz"; - sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"; + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"; + sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; }; }; "death-1.1.0" = { @@ -18509,13 +18653,13 @@ let sha1 = "01aa9c401edd92750514470b8266390c66c67318"; }; }; - "detect-indent-4.0.0" = { + "detect-indent-5.0.0" = { name = "detect-indent"; packageName = "detect-indent"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; }; }; "diff-2.2.3" = { @@ -18527,6 +18671,15 @@ let sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; }; }; + "inquirer-3.0.5" = { + name = "inquirer"; + packageName = "inquirer"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz"; + sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65"; + }; + }; "invariant-2.2.2" = { name = "invariant"; packageName = "invariant"; @@ -18545,13 +18698,13 @@ let sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; }; }; - "leven-2.0.0" = { + "leven-2.1.0" = { name = "leven"; packageName = "leven"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz"; - sha1 = "74c45744439550da185801912829f61d22071bc1"; + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; "node-emoji-1.5.1" = { @@ -18563,13 +18716,13 @@ let sha1 = "fd918e412769bf8c448051238233840b2aff16a1"; }; }; - "object-path-0.11.3" = { + "object-path-0.11.4" = { name = "object-path"; packageName = "object-path"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz"; - sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554"; + url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz"; + sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; }; }; "proper-lockfile-2.0.0" = { @@ -18599,13 +18752,58 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; - "regenerator-runtime-0.10.1" = { + "regenerator-runtime-0.10.3" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.10.1"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz"; - sha1 = "257f41961ce44558b18f7814af48c17559f9faeb"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz"; + sha1 = "8c4367a904b51ea62a908ac310bf99ff90a82a3e"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "external-editor-2.0.1" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.1.tgz"; + sha1 = "4c597c6c88fa6410e41dbbaa7b1be2336aa31095"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "onetime-2.0.0" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz"; + sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6"; }; }; "loose-envify-1.3.1" = { @@ -18635,16 +18833,439 @@ let sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; }; }; + "cli-list-0.1.8" = { + name = "cli-list"; + packageName = "cli-list"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz"; + sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a"; + }; + }; + "cross-spawn-3.0.1" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz"; + sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; + }; + }; + "fullname-2.1.0" = { + name = "fullname"; + packageName = "fullname"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz"; + sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350"; + }; + }; + "humanize-string-1.0.1" = { + name = "humanize-string"; + packageName = "humanize-string"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz"; + sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; + }; + }; + "inquirer-0.11.4" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz"; + sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d"; + }; + }; + "insight-0.7.0" = { + name = "insight"; + packageName = "insight"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz"; + sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6"; + }; + }; + "npm-keyword-4.2.0" = { + name = "npm-keyword"; + packageName = "npm-keyword"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz"; + sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0"; + }; + }; + "opn-3.0.3" = { + name = "opn"; + packageName = "opn"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz"; + sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; + }; + }; + "parse-help-0.1.1" = { + name = "parse-help"; + packageName = "parse-help"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz"; + sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda"; + }; + }; + "root-check-1.0.0" = { + name = "root-check"; + packageName = "root-check"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz"; + sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; + }; + }; + "sort-on-1.3.0" = { + name = "sort-on"; + packageName = "sort-on"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz"; + sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840"; + }; + }; + "tabtab-1.3.2" = { + name = "tabtab"; + packageName = "tabtab"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; + sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; + }; + }; + "titleize-1.0.0" = { + name = "titleize"; + packageName = "titleize"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz"; + sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; + }; + }; + "update-notifier-0.6.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; + sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + }; + }; + "yeoman-character-1.1.0" = { + name = "yeoman-character"; + packageName = "yeoman-character"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz"; + sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; + }; + }; + "yeoman-doctor-2.1.0" = { + name = "yeoman-doctor"; + packageName = "yeoman-doctor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz"; + sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; + }; + }; + "yeoman-environment-1.6.6" = { + name = "yeoman-environment"; + packageName = "yeoman-environment"; + version = "1.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz"; + sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671"; + }; + }; + "yosay-1.2.1" = { + name = "yosay"; + packageName = "yosay"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz"; + sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b"; + }; + }; + "npmconf-2.1.2" = { + name = "npmconf"; + packageName = "npmconf"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; + sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; + }; + }; + "execall-1.0.0" = { + name = "execall"; + packageName = "execall"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz"; + sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; + }; + }; + "clone-regexp-1.0.0" = { + name = "clone-regexp"; + packageName = "clone-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz"; + sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c"; + }; + }; + "is-regexp-1.0.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + }; + "is-supported-regexp-flag-1.0.0" = { + name = "is-supported-regexp-flag"; + packageName = "is-supported-regexp-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz"; + sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8"; + }; + }; + "downgrade-root-1.2.2" = { + name = "downgrade-root"; + packageName = "downgrade-root"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz"; + sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; + }; + }; + "sudo-block-1.2.0" = { + name = "sudo-block"; + packageName = "sudo-block"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz"; + sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; + }; + }; + "default-uid-1.0.0" = { + name = "default-uid"; + packageName = "default-uid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz"; + sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e"; + }; + }; + "is-root-1.0.0" = { + name = "is-root"; + packageName = "is-root"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; + sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5"; + }; + }; + "is-docker-1.1.0" = { + name = "is-docker"; + packageName = "is-docker"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz"; + sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; + }; + }; + "dot-prop-2.4.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz"; + sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c"; + }; + }; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; + }; + }; + "bin-version-check-2.1.0" = { + name = "bin-version-check"; + packageName = "bin-version-check"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz"; + sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0"; + }; + }; + "each-async-1.1.1" = { + name = "each-async"; + packageName = "each-async"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"; + sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; + }; + }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; + "object-values-1.0.0" = { + name = "object-values"; + packageName = "object-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz"; + sha1 = "72af839630119e5b98c3b02bb8c27e3237158105"; + }; + }; + "twig-0.8.9" = { + name = "twig"; + packageName = "twig"; + version = "0.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz"; + sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2"; + }; + }; + "bin-version-1.0.4" = { + name = "bin-version"; + packageName = "bin-version"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz"; + sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e"; + }; + }; + "semver-truncate-1.1.2" = { + name = "semver-truncate"; + packageName = "semver-truncate"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz"; + sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; + }; + }; + "find-versions-1.2.1" = { + name = "find-versions"; + packageName = "find-versions"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz"; + sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"; + }; + }; + "semver-regex-1.0.0" = { + name = "semver-regex"; + packageName = "semver-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; + sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + }; + }; + "globby-4.1.0" = { + name = "globby"; + packageName = "globby"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz"; + sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; + }; + }; + "grouped-queue-0.3.3" = { + name = "grouped-queue"; + packageName = "grouped-queue"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; + sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; + }; + }; + "mem-fs-1.1.3" = { + name = "mem-fs"; + packageName = "mem-fs"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz"; + sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; + }; + }; + "vinyl-file-2.0.0" = { + name = "vinyl-file"; + packageName = "vinyl-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz"; + sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"; + }; + }; + "strip-bom-stream-2.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz"; + sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca"; + }; + }; + "first-chunk-stream-2.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + }; + }; + "pad-component-0.0.1" = { + name = "pad-component"; + packageName = "pad-component"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; + sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; + }; + }; + "taketalk-1.0.0" = { + name = "taketalk"; + packageName = "taketalk"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz"; + sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd"; + }; + }; }; in { alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.6"; + version = "1.9.8"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz"; - sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz"; + sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13"; }; dependencies = [ sources."colors-0.6.0-1" @@ -18670,23 +19291,61 @@ in sources."JSV-4.0.2" ]; }) - (sources."uglify-js-2.4.15" // { + (sources."uglify-js-2.6.1" // { dependencies = [ sources."async-0.2.10" - (sources."source-map-0.1.34" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - (sources."optimist-0.3.7" // { - dependencies = [ - sources."wordwrap-0.0.3" - ]; - }) + sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" + (sources."yargs-3.10.0" // { + dependencies = [ + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.1.0" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.1.0" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + ]; + }) + ]; + }) + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" ]; }) - sources."resolve-1.2.0" (sources."global-paths-0.1.2" // { dependencies = [ sources."array-unique-0.2.1" @@ -18727,7 +19386,7 @@ in }) ]; }) - sources."moment-2.10.6" + sources."moment-2.17.1" (sources."node.extend-1.0.10" // { dependencies = [ sources."is-0.3.0" @@ -18745,10 +19404,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz"; - sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz"; + sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -18796,7 +19455,7 @@ in sources."azure-arm-insights-0.11.3" sources."azure-arm-iothub-0.1.4" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.17.0" + sources."azure-arm-network-0.18.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" @@ -18817,7 +19476,7 @@ in }) sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.6.1-preview" - sources."azure-arm-storage-0.13.1-preview" + sources."azure-arm-storage-0.15.0-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" @@ -18827,15 +19486,21 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-1.3.0" // { + (sources."azure-storage-2.0.0" // { dependencies = [ - sources."extend-1.2.1" sources."browserify-mime-1.2.9" + sources."extend-1.2.1" (sources."json-edm-parser-0.1.2" // { dependencies = [ sources."jsonparse-1.2.0" ]; }) + (sources."md5.js-1.3.4" // { + dependencies = [ + sources."hash-base-3.0.3" + sources."inherits-2.0.3" + ]; + }) sources."node-uuid-1.4.7" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -18904,7 +19569,7 @@ in }) sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" - (sources."kuduscript-1.0.9" // { + (sources."kuduscript-1.0.13" // { dependencies = [ (sources."commander-1.1.1" // { dependencies = [ @@ -18915,18 +19580,18 @@ in ]; }) sources."moment-2.17.1" - (sources."ms-rest-1.15.4" // { + (sources."ms-rest-1.15.5" // { dependencies = [ sources."duplexer-0.1.1" ]; }) - (sources."ms-rest-azure-1.15.4" // { + (sources."ms-rest-azure-1.15.5" // { dependencies = [ sources."async-0.2.7" ]; }) sources."node-forge-0.6.23" - sources."omelette-0.1.0" + sources."omelette-0.3.2" (sources."openssl-wrapper-0.2.1" // { dependencies = [ sources."debug-0.7.4" @@ -18949,7 +19614,7 @@ in ]; }) sources."ncp-0.4.2" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -19030,7 +19695,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -19061,7 +19726,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -19123,7 +19788,7 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.2.2" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -19157,7 +19822,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19179,7 +19844,7 @@ in sources."asap-2.0.5" ]; }) - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) ]; @@ -19279,7 +19944,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19304,7 +19969,7 @@ in sources."prepend-http-1.0.4" (sources."read-all-stream-2.2.0" // { dependencies = [ - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19469,7 +20134,7 @@ in sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -19562,13 +20227,13 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.0.0"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz"; - sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; + sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; }; dependencies = [ - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -19604,7 +20269,7 @@ in sources."ieee754-1.1.8" ]; }) - sources."cached-path-relative-1.0.0" + sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ sources."typedarray-0.0.6" @@ -19651,10 +20316,13 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.3" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) (sources."parse-asn1-5.0.0" // { @@ -19678,10 +20346,13 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.3" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) ]; @@ -19699,7 +20370,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" ]; }) ]; @@ -19797,7 +20468,7 @@ in sources."stream-splicer-2.0.0" ]; }) - (sources."module-deps-4.0.8" // { + (sources."module-deps-4.1.1" // { dependencies = [ (sources."detective-4.3.2" // { dependencies = [ @@ -19818,7 +20489,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19827,7 +20498,11 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) (sources."shasum-1.0.2" // { dependencies = [ (sources."json-stable-stringify-0.0.1" // { @@ -20312,7 +20987,7 @@ in }) ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -20395,11 +21070,11 @@ in sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.2.2" // { + (sources."simple-peer-6.4.3" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20411,9 +21086,10 @@ in }) ]; }) - (sources."simple-websocket-4.3.0" // { + (sources."simple-websocket-4.3.1" // { dependencies = [ - (sources."readable-stream-2.2.2" // { + sources."randombytes-2.0.3" + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20423,7 +21099,7 @@ in sources."util-deprecate-1.0.2" ]; }) - (sources."ws-2.0.3" // { + (sources."ws-2.1.0" // { dependencies = [ sources."ultron-1.1.0" ]; @@ -20437,7 +21113,7 @@ in ]; }) sources."uniq-1.0.1" - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -20551,7 +21227,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20603,10 +21279,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; - sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; + sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; }; buildInputs = globalBuildInputs; meta = { @@ -20751,7 +21427,11 @@ in sources."interpret-1.0.1" (sources."rechoir-0.6.2" // { dependencies = [ - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) ]; }) ]; @@ -20762,7 +21442,7 @@ in dependencies = [ (sources."browserify-13.3.0" // { dependencies = [ - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -20799,7 +21479,7 @@ in sources."isarray-1.0.0" ]; }) - sources."cached-path-relative-1.0.0" + sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ sources."typedarray-0.0.6" @@ -20846,10 +21526,13 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.3" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) (sources."parse-asn1-5.0.0" // { @@ -20873,10 +21556,13 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.3" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) ]; @@ -20894,7 +21580,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" ]; }) ]; @@ -20992,7 +21678,7 @@ in sources."stream-splicer-2.0.0" ]; }) - (sources."module-deps-4.0.8" // { + (sources."module-deps-4.1.1" // { dependencies = [ (sources."detective-4.3.2" // { dependencies = [ @@ -21013,7 +21699,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21022,7 +21708,11 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) (sources."shasum-1.0.2" // { dependencies = [ (sources."json-stable-stringify-0.0.1" // { @@ -21327,7 +22017,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npm-2.15.11" // { @@ -21459,7 +22149,7 @@ in (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21563,7 +22253,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -21585,7 +22275,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -21647,7 +22337,7 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.2.2" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -21775,7 +22465,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -21968,7 +22658,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -22029,7 +22719,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tunnel-agent-0.4.3" ]; @@ -22044,7 +22734,7 @@ in }) (sources."nopt-3.0.1" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) sources."q-1.0.1" @@ -22116,7 +22806,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22147,7 +22837,7 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22165,12 +22855,12 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) ]; @@ -22538,7 +23228,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22673,7 +23363,7 @@ in sources."split2-2.1.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22710,7 +23400,7 @@ in }) ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22759,7 +23449,7 @@ in (sources."tar-stream-1.5.2" // { dependencies = [ sources."bl-1.2.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22804,13 +23494,13 @@ in sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d"; }; dependencies = [ - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -22864,7 +23554,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -22925,7 +23615,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -23190,10 +23880,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz"; - sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz"; + sha1 = "9bc31fc7341692cf772e80607508f67d711c5609"; }; dependencies = [ (sources."babel-code-frame-6.22.0" // { @@ -23222,7 +23912,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23313,7 +24003,7 @@ in sources."pinkie-2.0.4" ]; }) - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" ]; }) sources."graceful-fs-4.1.11" @@ -23350,8 +24040,8 @@ in sources."path-is-absolute-1.0.1" ]; }) - sources."globals-9.14.0" - sources."ignore-3.2.2" + sources."globals-9.16.0" + sources."ignore-3.2.4" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { dependencies = [ @@ -23409,7 +24099,7 @@ in sources."through-2.3.8" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -23481,7 +24171,11 @@ in sources."interpret-1.0.1" (sources."rechoir-0.6.2" // { dependencies = [ - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) ]; }) ]; @@ -23700,9 +24394,9 @@ in sources."normalize-path-2.0.1" (sources."object.omit-2.0.1" // { dependencies = [ - (sources."for-own-0.1.4" // { + (sources."for-own-0.1.5" // { dependencies = [ - sources."for-in-0.1.6" + sources."for-in-1.0.1" ]; }) sources."is-extendable-0.1.1" @@ -23740,7 +24434,7 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.11" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23753,7 +24447,7 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.17" // { + (sources."fsevents-1.1.1" // { dependencies = [ sources."nan-2.5.1" (sources."node-pre-gyp-0.6.33" // { @@ -23765,7 +24459,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -23773,7 +24467,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23813,12 +24507,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."request-2.79.0" // { @@ -23862,7 +24556,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -23923,7 +24617,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -24089,7 +24783,7 @@ in ]; }) sources."ncp-0.4.2" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -24206,7 +24900,7 @@ in sources."grunt-known-options-1.1.0" (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) sources."resolve-1.1.7" @@ -24229,11 +24923,11 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.3" + sources."coffee-script-1.12.4" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" - (sources."clean-css-3.4.24" // { + (sources."clean-css-3.4.25" // { dependencies = [ (sources."commander-2.8.1" // { dependencies = [ @@ -24488,7 +25182,7 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -24572,9 +25266,9 @@ in sources."normalize-path-2.0.1" (sources."object.omit-2.0.1" // { dependencies = [ - (sources."for-own-0.1.4" // { + (sources."for-own-0.1.5" // { dependencies = [ - sources."for-in-0.1.6" + sources."for-in-1.0.1" ]; }) sources."is-extendable-0.1.1" @@ -24670,7 +25364,11 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) ]; }) sources."minimist-1.2.0" @@ -25304,10 +26002,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz"; - sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e"; + url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz"; + sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; }; dependencies = [ sources."bluebird-3.4.7" @@ -25403,9 +26101,9 @@ in sources."normalize-path-2.0.1" (sources."object.omit-2.0.1" // { dependencies = [ - (sources."for-own-0.1.4" // { + (sources."for-own-0.1.5" // { dependencies = [ - sources."for-in-0.1.6" + sources."for-in-1.0.1" ]; }) sources."is-extendable-0.1.1" @@ -25443,7 +26141,7 @@ in sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -25456,7 +26154,7 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.17" // { + (sources."fsevents-1.1.1" // { dependencies = [ sources."nan-2.5.1" (sources."node-pre-gyp-0.6.33" // { @@ -25468,7 +26166,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -25476,7 +26174,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -25516,12 +26214,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."request-2.79.0" // { @@ -25565,7 +26263,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -25626,7 +26324,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -25637,6 +26335,7 @@ in sources."uuid-3.0.1" ]; }) + sources."rimraf-2.5.4" sources."semver-5.3.0" (sources."tar-2.2.1" // { dependencies = [ @@ -25683,15 +26382,16 @@ in sources."lodash-4.17.4" ]; }) - (sources."connect-3.5.0" // { + (sources."connect-3.6.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.6.1" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-1.0.0" // { dependencies = [ + sources."encodeurl-1.0.1" sources."escape-html-1.0.3" (sources."on-finished-2.3.0" // { dependencies = [ @@ -25790,16 +26490,16 @@ in }) sources."qjobs-1.1.5" sources."range-parser-1.2.0" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."safe-buffer-5.0.1" - (sources."socket.io-1.7.2" // { + (sources."socket.io-1.7.3" // { dependencies = [ (sources."debug-2.3.3" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."engine.io-1.8.2" // { + (sources."engine.io-1.8.3" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -25821,7 +26521,7 @@ in sources."wtf-8-1.0.0" ]; }) - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -25837,12 +26537,12 @@ in }) sources."object-assign-4.1.0" sources."socket.io-adapter-0.5.0" - (sources."socket.io-client-1.7.2" // { + (sources."socket.io-client-1.7.3" // { dependencies = [ sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.2" // { + (sources."engine.io-client-1.8.3" // { dependencies = [ sources."component-inherit-0.0.3" (sources."engine.io-parser-1.3.2" // { @@ -25873,7 +26573,7 @@ in }) ]; }) - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -25912,7 +26612,7 @@ in ]; }) sources."source-map-0.5.6" - (sources."tmp-0.0.28" // { + (sources."tmp-0.0.31" // { dependencies = [ sources."os-tmpdir-1.0.2" ]; @@ -26254,7 +26954,7 @@ in dependencies = [ (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -26378,9 +27078,9 @@ in sources."normalize-path-2.0.1" (sources."object.omit-2.0.1" // { dependencies = [ - (sources."for-own-0.1.4" // { + (sources."for-own-0.1.5" // { dependencies = [ - sources."for-in-0.1.6" + sources."for-in-1.0.1" ]; }) sources."is-extendable-0.1.1" @@ -26445,7 +27145,7 @@ in sources."graceful-fs-4.1.11" (sources."gulp-sourcemaps-1.6.0" // { dependencies = [ - sources."convert-source-map-1.3.0" + sources."convert-source-map-1.4.0" ]; }) sources."is-valid-glob-0.3.0" @@ -26458,7 +27158,7 @@ in ]; }) sources."object-assign-4.1.1" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -26669,7 +27369,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -26758,7 +27458,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -26819,7 +27519,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -26831,7 +27531,7 @@ in ]; }) sources."retry-0.8.0" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -26863,7 +27563,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -26923,7 +27623,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."once-1.3.3" // { @@ -26952,7 +27652,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -27074,7 +27774,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -27082,7 +27782,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -27170,7 +27870,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27231,7 +27931,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -27242,7 +27942,7 @@ in sources."uuid-3.0.1" ]; }) - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" (sources."tar-2.2.1" // { dependencies = [ @@ -27564,19 +28264,19 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) sources."semver-4.3.6" - (sources."serve-favicon-2.3.2" // { + (sources."serve-favicon-2.4.0" // { dependencies = [ - sources."etag-1.7.0" - sources."fresh-0.3.0" + sources."etag-1.8.0" + sources."fresh-0.4.0" sources."ms-0.7.2" sources."parseurl-1.3.1" ]; @@ -27598,7 +28298,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -27606,7 +28306,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -27688,7 +28388,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27749,7 +28449,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -27865,7 +28565,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -27873,7 +28573,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -27955,7 +28655,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -28016,7 +28716,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -28125,7 +28825,7 @@ in sources."isexe-1.1.2" ]; }) - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -28197,7 +28897,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -28205,7 +28905,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28246,12 +28946,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."request-2.79.0" // { @@ -28295,7 +28995,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -28356,7 +29056,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -28526,9 +29226,9 @@ in sources."normalize-path-2.0.1" (sources."object.omit-2.0.1" // { dependencies = [ - (sources."for-own-0.1.4" // { + (sources."for-own-0.1.5" // { dependencies = [ - sources."for-in-0.1.6" + sources."for-in-1.0.1" ]; }) sources."is-extendable-0.1.1" @@ -28567,7 +29267,7 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.11" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28580,7 +29280,7 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.17" // { + (sources."fsevents-1.1.1" // { dependencies = [ sources."nan-2.5.1" (sources."node-pre-gyp-0.6.33" // { @@ -28592,7 +29292,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -28600,7 +29300,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28640,12 +29340,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."request-2.79.0" // { @@ -28689,7 +29389,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -28750,7 +29450,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -28891,7 +29591,7 @@ in dependencies = [ (sources."nopt-1.0.10" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) ]; @@ -28964,7 +29664,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28995,7 +29695,7 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29013,12 +29713,12 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) ]; @@ -29138,7 +29838,7 @@ in sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29304,7 +30004,7 @@ in }) (sources."i18next-1.10.6" // { dependencies = [ - (sources."cookies-0.6.2" // { + (sources."cookies-0.7.0" // { dependencies = [ sources."depd-1.1.0" sources."keygrip-1.0.1" @@ -29437,9 +30137,9 @@ in sources."normalize-path-2.0.1" (sources."object.omit-2.0.1" // { dependencies = [ - (sources."for-own-0.1.4" // { + (sources."for-own-0.1.5" // { dependencies = [ - sources."for-in-0.1.6" + sources."for-in-1.0.1" ]; }) sources."is-extendable-0.1.1" @@ -29515,7 +30215,7 @@ in sources."process-nextick-args-1.0.7" ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29565,7 +30265,7 @@ in sources."mustache-2.3.0" (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."oauth2orize-1.7.0" // { @@ -29717,7 +30417,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -29748,7 +30448,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -29809,7 +30509,7 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.2.2" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -29821,7 +30521,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.16" // { + (sources."node-red-node-email-0.1.21" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -29967,7 +30667,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -30027,7 +30727,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -30057,7 +30757,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -30098,12 +30798,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."request-2.79.0" // { @@ -30147,7 +30847,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -30207,7 +30907,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -30387,7 +31087,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.12.3" + sources."coffee-script-1.12.4" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -30514,13 +31214,13 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz"; - sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a"; + url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz"; + sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28"; }; dependencies = [ - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -30530,7 +31230,7 @@ in sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."archy-1.0.0" sources."asap-2.0.5" sources."chownr-1.0.1" @@ -30594,7 +31294,7 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -30619,6 +31319,7 @@ in sources."promzard-0.3.0" ]; }) + sources."lazy-property-1.0.0" sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ @@ -30746,7 +31447,7 @@ in ]; }) sources."once-1.4.0" - sources."opener-1.4.2" + sources."opener-1.4.3" (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" @@ -30790,7 +31491,7 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -30833,7 +31534,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -30894,7 +31595,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -31046,7 +31747,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -31107,7 +31808,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -31123,7 +31824,7 @@ in sources."slide-1.1.6" sources."chownr-0.0.2" sources."mkdirp-0.3.5" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -31161,7 +31862,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -31218,7 +31919,7 @@ in sources."osenv-0.0.3" (sources."nopt-2.2.1" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) sources."semver-2.3.2" @@ -31246,7 +31947,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -31308,7 +32009,7 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.12.3" + sources."coffee-script-1.12.4" ]; buildInputs = globalBuildInputs; meta = { @@ -31320,10 +32021,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz"; - sha1 = "9614c58ec84d31702a85881c844c3fb93611a585"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz"; + sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555"; }; dependencies = [ sources."bluebird-3.4.7" @@ -31569,7 +32270,7 @@ in (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -31642,7 +32343,7 @@ in ]; }) sources."once-1.4.0" - sources."opener-1.4.2" + sources."opener-1.4.3" (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" @@ -31724,7 +32425,7 @@ in }) (sources."har-validator-2.0.6" // { dependencies = [ - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -31786,7 +32487,7 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.2.2" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -31958,7 +32659,7 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -31980,24 +32681,24 @@ in }) (sources."registry-auth-token-3.1.0" // { dependencies = [ - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) ]; }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) ]; @@ -32396,7 +33097,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -32457,7 +33158,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -32469,15 +33170,15 @@ in ]; }) sources."semver-5.3.0" - (sources."serve-favicon-2.3.2" // { + (sources."serve-favicon-2.4.0" // { dependencies = [ - sources."etag-1.7.0" - sources."fresh-0.3.0" + sources."etag-1.8.0" + sources."fresh-0.4.0" sources."ms-0.7.2" sources."parseurl-1.3.1" ]; }) - (sources."service-runner-2.1.15" // { + (sources."service-runner-2.2.4" // { dependencies = [ sources."bluebird-3.4.7" (sources."bunyan-1.8.5" // { @@ -32539,7 +33240,7 @@ in ]; }) sources."hot-shots-4.3.1" - (sources."limitation-0.1.9" // { + (sources."limitation-0.2.0" // { dependencies = [ (sources."kad-git+https://github.com/gwicke/kad.git#master" // { dependencies = [ @@ -32564,7 +33265,7 @@ in }) ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -32698,6 +33399,16 @@ in sources."yargs-parser-4.2.1" ]; }) + (sources."dnscache-1.0.1" // { + dependencies = [ + sources."asap-2.0.5" + (sources."lodash.clone-4.3.2" // { + dependencies = [ + sources."lodash._baseclone-4.5.7" + ]; + }) + ]; + }) ]; }) sources."simplediff-0.1.1" @@ -32863,7 +33574,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33140,7 +33851,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33263,12 +33974,12 @@ in ]; }) sources."range-parser-1.2.0" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."torrent-stream-1.0.3" // { @@ -33363,7 +34074,7 @@ in }) ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -33447,11 +34158,11 @@ in sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.2.2" // { + (sources."simple-peer-6.4.3" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33463,9 +34174,10 @@ in }) ]; }) - (sources."simple-websocket-4.3.0" // { + (sources."simple-websocket-4.3.1" // { dependencies = [ - (sources."readable-stream-2.2.2" // { + sources."randombytes-2.0.3" + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33475,7 +34187,7 @@ in sources."util-deprecate-1.0.2" ]; }) - (sources."ws-2.0.3" // { + (sources."ws-2.1.0" // { dependencies = [ sources."ultron-1.1.0" ]; @@ -33489,7 +34201,7 @@ in ]; }) sources."uniq-1.0.1" - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -33744,14 +34456,14 @@ in sources."xtend-4.0.1" ]; }) - (sources."socket.io-1.7.2" // { + (sources."socket.io-1.7.3" // { dependencies = [ (sources."debug-2.3.3" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."engine.io-1.8.2" // { + (sources."engine.io-1.8.3" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -33773,7 +34485,7 @@ in sources."wtf-8-1.0.0" ]; }) - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -33789,12 +34501,12 @@ in }) sources."object-assign-4.1.0" sources."socket.io-adapter-0.5.0" - (sources."socket.io-client-1.7.2" // { + (sources."socket.io-client-1.7.3" // { dependencies = [ sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.2" // { + (sources."engine.io-client-1.8.3" // { dependencies = [ sources."component-inherit-0.0.3" (sources."engine.io-parser-1.3.2" // { @@ -33825,7 +34537,7 @@ in }) ]; }) - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -34014,7 +34726,7 @@ in ]; }) sources."random-access-file-0.3.2" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -34050,7 +34762,7 @@ in }) (sources."fluent-ffmpeg-2.1.0" // { dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -34120,7 +34832,7 @@ in sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -34185,7 +34897,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -34269,7 +34981,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -34366,7 +35078,7 @@ in }) sources."private-0.1.7" sources."q-1.4.1" - (sources."recast-0.11.21" // { + (sources."recast-0.11.22" // { dependencies = [ sources."ast-types-0.9.5" sources."esprima-3.1.3" @@ -34534,7 +35246,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -34595,7 +35307,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -34720,6 +35432,12 @@ in (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" + (sources."http-errors-1.5.1" // { + dependencies = [ + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + ]; + }) sources."mime-1.3.4" sources."ms-0.7.2" sources."statuses-1.3.1" @@ -34760,6 +35478,13 @@ in ]; }) sources."depd-1.1.0" + (sources."http-errors-1.5.1" // { + dependencies = [ + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" + ]; + }) sources."iconv-lite-0.4.15" (sources."on-finished-2.3.0" // { dependencies = [ @@ -34826,7 +35551,7 @@ in sources."esprima-3.1.3" ]; }) - (sources."cookies-0.6.2" // { + (sources."cookies-0.7.0" // { dependencies = [ sources."depd-1.1.0" sources."keygrip-1.0.1" @@ -34868,7 +35593,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -34929,7 +35654,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -35048,7 +35773,7 @@ in }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -35067,7 +35792,7 @@ in ]; }) sources."jju-1.3.0" - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -35079,10 +35804,11 @@ in ]; }) sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.5.1" // { + (sources."http-errors-1.6.1" // { dependencies = [ + sources."depd-1.1.0" sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" ]; }) @@ -35125,7 +35851,7 @@ in sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -35153,7 +35879,7 @@ in }) ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -35189,7 +35915,7 @@ in sources."lru-cache-2.2.0" (sources."nopt-2.0.0" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."restify-4.0.3" // { @@ -35324,7 +36050,7 @@ in (sources."sshpk-agent-1.2.1" // { dependencies = [ sources."assert-plus-0.1.5" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -35526,13 +36252,13 @@ in tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz"; - sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34"; + url = "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz"; + sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7"; }; dependencies = [ - sources."acorn-3.3.0" + sources."acorn-4.0.11" (sources."enhanced-resolve-2.3.0" // { dependencies = [ sources."tapable-0.2.6" @@ -35543,7 +36269,7 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -35560,21 +36286,31 @@ in sources."object-assign-4.1.1" ]; }) - (sources."glob-3.2.11" // { + (sources."glob-7.1.1" // { dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-0.3.0" // { + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { dependencies = [ - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" + sources."wrappy-1.0.2" ]; }) + sources."inherits-2.0.3" + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" ]; }) - (sources."minimatch-0.2.14" // { + (sources."minimatch-3.0.3" // { dependencies = [ - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) ]; }) sources."resolve-from-2.0.0" @@ -35663,7 +36399,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -35694,7 +36430,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -35755,7 +36491,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.0.2" + sources."qs-6.0.3" sources."stringstream-0.0.5" sources."tough-cookie-2.2.2" sources."tunnel-agent-0.4.3" @@ -35857,7 +36593,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -35919,7 +36655,7 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -35961,10 +36697,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.1.6"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz"; - sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz"; + sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9"; }; buildInputs = globalBuildInputs; meta = { @@ -36041,13 +36777,13 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz"; - sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz"; + sha1 = "1519b78475ef5162ef3342c2046889b396add651"; }; dependencies = [ - sources."async-2.1.4" + sources."async-2.1.5" sources."bluebird-3.4.7" sources."blueimp-md5-2.6.0" (sources."body-parser-1.15.2" // { @@ -36098,7 +36834,7 @@ in sources."color-name-1.1.1" ]; }) - (sources."color-string-1.4.0" // { + (sources."color-string-1.5.0" // { dependencies = [ sources."color-name-1.1.1" (sources."simple-swizzle-0.2.2" // { @@ -36124,7 +36860,7 @@ in dependencies = [ (sources."nopt-1.0.10" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) sources."mkdirp-0.3.0" @@ -36358,7 +37094,7 @@ in ]; }) sources."hasher-1.2.0" - sources."ignore-3.2.2" + sources."ignore-3.2.4" (sources."keen.io-0.1.3" // { dependencies = [ sources."underscore-1.5.2" @@ -36372,9 +37108,14 @@ in ]; }) sources."moment-2.17.1" + (sources."node-cache-4.1.1" // { + dependencies = [ + sources."clone-2.1.0" + ]; + }) (sources."npm-4.1.2" // { dependencies = [ - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -36580,7 +37321,7 @@ in ]; }) sources."once-1.4.0" - sources."opener-1.4.2" + sources."opener-1.4.3" (sources."osenv-0.1.4" // { dependencies = [ sources."os-tmpdir-1.0.2" @@ -36623,7 +37364,7 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -36666,7 +37407,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -36727,7 +37468,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -36817,7 +37558,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -36901,7 +37642,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -36962,7 +37703,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -36980,7 +37721,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -37046,12 +37787,12 @@ in sources."stack-trace-0.0.9" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."rimraf-2.5.4" // { @@ -37127,14 +37868,14 @@ in sources."eve-0.4.2" ]; }) - (sources."socket.io-1.7.2" // { + (sources."socket.io-1.7.3" // { dependencies = [ (sources."debug-2.3.3" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."engine.io-1.8.2" // { + (sources."engine.io-1.8.3" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -37156,7 +37897,7 @@ in sources."wtf-8-1.0.0" ]; }) - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -37172,12 +37913,12 @@ in }) sources."object-assign-4.1.0" sources."socket.io-adapter-0.5.0" - (sources."socket.io-client-1.7.2" // { + (sources."socket.io-client-1.7.3" // { dependencies = [ sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.2" // { + (sources."engine.io-client-1.8.3" // { dependencies = [ sources."component-inherit-0.0.3" (sources."engine.io-parser-1.3.2" // { @@ -37208,7 +37949,7 @@ in }) ]; }) - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."options-0.0.6" sources."ultron-1.0.2" @@ -37456,7 +38197,7 @@ in sources."osenv-0.0.3" (sources."nopt-2.2.1" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) sources."semver-2.3.2" @@ -37505,7 +38246,7 @@ in sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -37570,7 +38311,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -37654,7 +38395,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -37728,7 +38469,7 @@ in ]; }) sources."ajv-keywords-1.5.1" - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -37742,7 +38483,7 @@ in sources."interpret-1.0.1" sources."json-loader-0.5.4" sources."loader-runner-2.3.0" - (sources."loader-utils-0.2.16" // { + (sources."loader-utils-0.2.17" // { dependencies = [ sources."big.js-3.1.3" sources."emojis-list-2.1.0" @@ -37757,7 +38498,7 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -37823,10 +38564,13 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.3" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) (sources."parse-asn1-5.0.0" // { @@ -37850,10 +38594,13 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.3" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) ]; @@ -37871,7 +38618,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.7" + sources."brorand-1.1.0" ]; }) ]; @@ -37911,7 +38658,7 @@ in sources."process-0.11.9" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -38015,7 +38762,7 @@ in }) ]; }) - (sources."watchpack-1.2.0" // { + (sources."watchpack-1.3.1" // { dependencies = [ (sources."chokidar-1.6.1" // { dependencies = [ @@ -38068,9 +38815,9 @@ in sources."normalize-path-2.0.1" (sources."object.omit-2.0.1" // { dependencies = [ - (sources."for-own-0.1.4" // { + (sources."for-own-0.1.5" // { dependencies = [ - sources."for-in-0.1.6" + sources."for-in-1.0.1" ]; }) sources."is-extendable-0.1.1" @@ -38118,7 +38865,7 @@ in }) ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -38131,14 +38878,14 @@ in sources."set-immediate-shim-1.0.1" ]; }) - (sources."fsevents-1.0.17" // { + (sources."fsevents-1.1.1" // { dependencies = [ sources."nan-2.5.1" (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -38146,7 +38893,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -38186,12 +38933,12 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."minimist-1.2.0" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; }) (sources."request-2.79.0" // { @@ -38235,7 +38982,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -38296,7 +39043,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -38547,16 +39294,16 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.19.1"; + version = "0.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz"; - sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz"; + sha1 = "575190fee60a27a54d4125a0f7579fc702f01229"; }; dependencies = [ - (sources."babel-runtime-6.22.0" // { + (sources."babel-runtime-6.23.0" // { dependencies = [ sources."core-js-2.4.1" - sources."regenerator-runtime-0.10.1" + sources."regenerator-runtime-0.10.3" ]; }) sources."bytes-2.4.0" @@ -38599,81 +39346,52 @@ in sources."clone-1.0.2" ]; }) - sources."detect-indent-4.0.0" + sources."detect-indent-5.0.0" sources."diff-2.2.3" sources."ini-1.3.4" - (sources."inquirer-1.2.3" // { + (sources."inquirer-3.0.5" // { dependencies = [ sources."ansi-escapes-1.4.0" - (sources."cli-cursor-1.0.2" // { + (sources."cli-cursor-2.1.0" // { dependencies = [ - (sources."restore-cursor-1.0.1" // { + (sources."restore-cursor-2.0.0" // { dependencies = [ - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" + (sources."onetime-2.0.0" // { + dependencies = [ + sources."mimic-fn-1.1.0" + ]; + }) + sources."signal-exit-3.0.2" ]; }) ]; }) sources."cli-width-2.1.0" - (sources."external-editor-1.1.1" // { + (sources."external-editor-2.0.1" // { dependencies = [ - sources."extend-3.0.0" - (sources."spawn-sync-1.0.15" // { - dependencies = [ - (sources."concat-stream-1.6.0" // { - dependencies = [ - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - (sources."readable-stream-2.2.2" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."os-shim-0.1.3" - ]; - }) - (sources."tmp-0.0.29" // { + (sources."tmp-0.0.31" // { dependencies = [ sources."os-tmpdir-1.0.2" ]; }) ]; }) - (sources."figures-1.7.0" // { + (sources."figures-2.0.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" - sources."object-assign-4.1.1" ]; }) sources."lodash-4.17.4" - sources."mute-stream-0.0.6" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) + sources."mute-stream-0.0.7" (sources."run-async-2.3.0" // { dependencies = [ sources."is-promise-2.1.0" ]; }) sources."rx-4.1.0" - (sources."string-width-1.0.2" // { + (sources."string-width-2.0.0" // { dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) + sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."strip-ansi-3.0.1" // { @@ -38703,7 +39421,7 @@ in sources."ci-info-1.0.0" ]; }) - sources."leven-2.0.0" + sources."leven-2.1.0" (sources."loud-rejection-1.6.0" // { dependencies = [ (sources."currently-unhandled-0.4.1" // { @@ -38761,7 +39479,7 @@ in sources."graceful-fs-4.1.11" (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) (sources."npmlog-4.0.2" // { @@ -38769,7 +39487,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -38823,7 +39541,7 @@ in }) ]; }) - sources."object-path-0.11.3" + sources."object-path-0.11.4" (sources."proper-lockfile-2.0.0" // { dependencies = [ sources."graceful-fs-4.1.11" @@ -38835,15 +39553,6 @@ in sources."mute-stream-0.0.7" ]; }) - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" @@ -38863,7 +39572,7 @@ in }) (sources."har-validator-2.0.6" // { dependencies = [ - (sources."is-my-json-valid-2.15.0" // { + (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -38924,7 +39633,7 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -38936,7 +39645,7 @@ in ]; }) sources."request-capture-har-1.1.4" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -38959,11 +39668,7 @@ in }) sources."roadrunner-1.1.0" sources."semver-5.3.0" - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) + sources."strip-bom-3.0.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -38987,7 +39692,7 @@ in }) ]; }) - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -39025,4 +39730,1127 @@ in }; production = true; }; + yo = nodeEnv.buildNodePackage { + name = "yo"; + packageName = "yo"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz"; + sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928"; + }; + dependencies = [ + sources."async-1.5.2" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + sources."cli-list-0.1.8" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."object-assign-4.1.1" + sources."os-tmpdir-1.0.2" + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + sources."uuid-2.0.3" + (sources."write-file-atomic-1.3.1" // { + dependencies = [ + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + ]; + }) + (sources."xdg-basedir-2.0.0" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + ]; + }) + (sources."cross-spawn-3.0.1" // { + dependencies = [ + (sources."lru-cache-4.0.2" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.0.0" + ]; + }) + (sources."which-1.2.12" // { + dependencies = [ + sources."isexe-1.1.2" + ]; + }) + ]; + }) + (sources."figures-1.7.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + sources."object-assign-4.1.1" + ]; + }) + (sources."fullname-2.1.0" // { + dependencies = [ + (sources."npmconf-2.1.2" // { + dependencies = [ + (sources."config-chain-1.1.11" // { + dependencies = [ + sources."proto-list-1.2.4" + ]; + }) + sources."inherits-2.0.3" + sources."ini-1.3.4" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."nopt-3.0.6" // { + dependencies = [ + sources."abbrev-1.1.0" + ]; + }) + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + ]; + }) + sources."semver-4.3.6" + sources."uid-number-0.0.5" + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."got-5.7.1" // { + dependencies = [ + (sources."create-error-class-3.0.2" // { + dependencies = [ + sources."capture-stack-trace-1.0.0" + ]; + }) + sources."duplexer2-0.1.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-1.0.0" + sources."object-assign-4.1.1" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + sources."read-all-stream-3.1.0" + (sources."readable-stream-2.2.3" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" + (sources."url-parse-lax-1.0.0" // { + dependencies = [ + sources."prepend-http-1.0.4" + ]; + }) + ]; + }) + (sources."humanize-string-1.0.1" // { + dependencies = [ + sources."decamelize-1.2.0" + ]; + }) + (sources."inquirer-0.11.4" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + (sources."cli-cursor-1.0.2" // { + dependencies = [ + (sources."restore-cursor-1.0.1" // { + dependencies = [ + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + ]; + }) + ]; + }) + sources."cli-width-1.1.1" + (sources."readline2-1.0.1" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + sources."mute-stream-0.0.5" + ]; + }) + (sources."run-async-0.1.0" // { + dependencies = [ + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + ]; + }) + sources."rx-lite-3.1.2" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."strip-ansi-3.0.1" + sources."through-2.3.8" + ]; + }) + (sources."insight-0.7.0" // { + dependencies = [ + (sources."inquirer-0.10.1" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + (sources."cli-cursor-1.0.2" // { + dependencies = [ + (sources."restore-cursor-1.0.1" // { + dependencies = [ + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + ]; + }) + ]; + }) + sources."cli-width-1.1.1" + (sources."readline2-1.0.1" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + sources."mute-stream-0.0.5" + ]; + }) + (sources."run-async-0.1.0" // { + dependencies = [ + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + ]; + }) + sources."rx-lite-3.1.2" + sources."strip-ansi-3.0.1" + sources."through-2.3.8" + ]; + }) + (sources."lodash.debounce-3.1.1" // { + dependencies = [ + sources."lodash._getnative-3.9.1" + ]; + }) + sources."object-assign-4.1.1" + (sources."os-name-1.0.3" // { + dependencies = [ + (sources."osx-release-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."win-release-1.1.1" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + ]; + }) + (sources."request-2.79.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-2.1.2" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."is-my-json-valid-2.16.0" // { + dependencies = [ + sources."generate-function-2.0.0" + (sources."generate-object-property-1.2.0" // { + dependencies = [ + sources."is-property-1.0.2" + ]; + }) + sources."jsonpointer-4.0.1" + sources."xtend-4.0.1" + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.2" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.1" + sources."getpass-0.1.6" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.14" // { + dependencies = [ + sources."mime-db-1.26.0" + ]; + }) + sources."oauth-sign-0.8.2" + sources."qs-6.3.1" + sources."stringstream-0.0.5" + sources."tunnel-agent-0.4.3" + sources."uuid-3.0.1" + ]; + }) + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + ]; + }) + sources."lodash-3.10.1" + (sources."meow-3.7.0" // { + dependencies = [ + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + (sources."loud-rejection-1.6.0" // { + dependencies = [ + (sources."currently-unhandled-0.4.1" // { + dependencies = [ + sources."array-find-index-1.0.2" + ]; + }) + sources."signal-exit-3.0.2" + ]; + }) + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.2.0" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + sources."object-assign-4.1.1" + (sources."redent-1.0.0" // { + dependencies = [ + sources."indent-string-2.1.0" + (sources."strip-indent-1.0.1" // { + dependencies = [ + sources."get-stdin-4.0.1" + ]; + }) + ]; + }) + sources."trim-newlines-1.0.0" + ]; + }) + (sources."npm-keyword-4.2.0" // { + dependencies = [ + sources."object-assign-4.1.1" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."registry-url-3.1.0" // { + dependencies = [ + (sources."rc-1.1.7" // { + dependencies = [ + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."opn-3.0.3" // { + dependencies = [ + sources."object-assign-4.1.1" + ]; + }) + (sources."package-json-2.4.0" // { + dependencies = [ + (sources."registry-auth-token-3.1.0" // { + dependencies = [ + (sources."rc-1.1.7" // { + dependencies = [ + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" + ]; + }) + ]; + }) + (sources."registry-url-3.1.0" // { + dependencies = [ + (sources."rc-1.1.7" // { + dependencies = [ + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" + ]; + }) + ]; + }) + sources."semver-5.3.0" + ]; + }) + (sources."parse-help-0.1.1" // { + dependencies = [ + (sources."execall-1.0.0" // { + dependencies = [ + (sources."clone-regexp-1.0.0" // { + dependencies = [ + sources."is-regexp-1.0.0" + sources."is-supported-regexp-flag-1.0.0" + ]; + }) + ]; + }) + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.2.0" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.2" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + (sources."root-check-1.0.0" // { + dependencies = [ + (sources."downgrade-root-1.2.2" // { + dependencies = [ + sources."default-uid-1.0.0" + sources."is-root-1.0.0" + ]; + }) + (sources."sudo-block-1.2.0" // { + dependencies = [ + sources."is-docker-1.1.0" + sources."is-root-1.0.0" + ]; + }) + ]; + }) + (sources."sort-on-1.3.0" // { + dependencies = [ + sources."arrify-1.0.1" + (sources."dot-prop-2.4.0" // { + dependencies = [ + sources."is-obj-1.0.1" + ]; + }) + ]; + }) + (sources."string-length-1.0.1" // { + dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + ]; + }) + (sources."tabtab-1.3.2" // { + dependencies = [ + (sources."debug-2.6.1" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + (sources."inquirer-1.2.3" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + (sources."cli-cursor-1.0.2" // { + dependencies = [ + (sources."restore-cursor-1.0.1" // { + dependencies = [ + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + ]; + }) + ]; + }) + sources."cli-width-2.1.0" + (sources."external-editor-1.1.1" // { + dependencies = [ + sources."extend-3.0.0" + (sources."spawn-sync-1.0.15" // { + dependencies = [ + (sources."concat-stream-1.6.0" // { + dependencies = [ + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + (sources."readable-stream-2.2.3" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."os-shim-0.1.3" + ]; + }) + (sources."tmp-0.0.29" // { + dependencies = [ + sources."os-tmpdir-1.0.2" + ]; + }) + ]; + }) + sources."lodash-4.17.4" + sources."mute-stream-0.0.6" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."run-async-2.3.0" // { + dependencies = [ + sources."is-promise-2.1.0" + ]; + }) + sources."rx-4.1.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."through-2.3.8" + ]; + }) + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."npmlog-2.0.4" // { + dependencies = [ + sources."ansi-0.3.1" + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + (sources."readable-stream-2.2.3" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + (sources."gauge-1.2.7" // { + dependencies = [ + sources."has-unicode-2.0.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + ]; + }) + ]; + }) + sources."object-assign-4.1.1" + ]; + }) + sources."titleize-1.0.0" + (sources."update-notifier-0.6.3" // { + dependencies = [ + (sources."boxen-0.3.1" // { + dependencies = [ + sources."filled-array-1.1.0" + sources."object-assign-4.1.1" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + ]; + }) + sources."widest-line-1.0.0" + ]; + }) + (sources."configstore-2.1.0" // { + dependencies = [ + (sources."dot-prop-3.0.0" // { + dependencies = [ + sources."is-obj-1.0.1" + ]; + }) + sources."graceful-fs-4.1.11" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."object-assign-4.1.1" + sources."os-tmpdir-1.0.2" + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + sources."uuid-2.0.3" + (sources."write-file-atomic-1.3.1" // { + dependencies = [ + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + ]; + }) + (sources."xdg-basedir-2.0.0" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + ]; + }) + sources."is-npm-1.0.0" + sources."latest-version-2.0.0" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + ]; + }) + (sources."user-home-2.0.0" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + (sources."yeoman-character-1.1.0" // { + dependencies = [ + (sources."supports-color-3.2.3" // { + dependencies = [ + sources."has-flag-1.0.0" + ]; + }) + ]; + }) + (sources."yeoman-doctor-2.1.0" // { + dependencies = [ + (sources."bin-version-check-2.1.0" // { + dependencies = [ + (sources."bin-version-1.0.4" // { + dependencies = [ + (sources."find-versions-1.2.1" // { + dependencies = [ + sources."array-uniq-1.0.3" + sources."get-stdin-4.0.1" + sources."semver-regex-1.0.0" + ]; + }) + ]; + }) + sources."minimist-1.2.0" + sources."semver-4.3.6" + (sources."semver-truncate-1.1.2" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + ]; + }) + (sources."each-async-1.1.1" // { + dependencies = [ + sources."onetime-1.1.0" + sources."set-immediate-shim-1.0.1" + ]; + }) + sources."log-symbols-1.0.2" + sources."object-values-1.0.0" + sources."semver-5.3.0" + (sources."twig-0.8.9" // { + dependencies = [ + (sources."walk-2.3.9" // { + dependencies = [ + sources."foreachasync-3.0.0" + ]; + }) + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."yeoman-environment-1.6.6" // { + dependencies = [ + (sources."debug-2.6.1" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + sources."diff-2.2.3" + sources."escape-string-regexp-1.0.5" + (sources."globby-4.1.0" // { + dependencies = [ + (sources."array-union-1.0.2" // { + dependencies = [ + sources."array-uniq-1.0.3" + ]; + }) + sources."arrify-1.0.1" + (sources."glob-6.0.4" // { + dependencies = [ + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + sources."object-assign-4.1.1" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + sources."grouped-queue-0.3.3" + (sources."inquirer-1.2.3" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + (sources."cli-cursor-1.0.2" // { + dependencies = [ + (sources."restore-cursor-1.0.1" // { + dependencies = [ + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + ]; + }) + ]; + }) + sources."cli-width-2.1.0" + (sources."external-editor-1.1.1" // { + dependencies = [ + sources."extend-3.0.0" + (sources."spawn-sync-1.0.15" // { + dependencies = [ + (sources."concat-stream-1.6.0" // { + dependencies = [ + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + (sources."readable-stream-2.2.3" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."os-shim-0.1.3" + ]; + }) + (sources."tmp-0.0.29" // { + dependencies = [ + sources."os-tmpdir-1.0.2" + ]; + }) + ]; + }) + sources."mute-stream-0.0.6" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."run-async-2.3.0" // { + dependencies = [ + sources."is-promise-2.1.0" + ]; + }) + sources."rx-4.1.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."through-2.3.8" + ]; + }) + sources."lodash-4.17.4" + sources."log-symbols-1.0.2" + (sources."mem-fs-1.1.3" // { + dependencies = [ + (sources."through2-2.0.3" // { + dependencies = [ + (sources."readable-stream-2.2.3" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + sources."xtend-4.0.1" + ]; + }) + (sources."vinyl-1.2.0" // { + dependencies = [ + sources."clone-1.0.2" + sources."clone-stats-0.0.1" + sources."replace-ext-0.0.1" + ]; + }) + (sources."vinyl-file-2.0.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + (sources."strip-bom-stream-2.0.0" // { + dependencies = [ + (sources."first-chunk-stream-2.0.0" // { + dependencies = [ + (sources."readable-stream-2.2.3" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."text-table-0.2.0" + (sources."untildify-2.1.0" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + ]; + }) + (sources."yosay-1.2.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."cli-boxes-1.0.0" + sources."pad-component-0.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."strip-ansi-3.0.1" + (sources."taketalk-1.0.0" // { + dependencies = [ + sources."get-stdin-4.0.1" + sources."minimist-1.2.0" + ]; + }) + sources."wrap-ansi-2.1.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI tool for running Yeoman generators"; + homepage = http://yeoman.io/; + license = "BSD-2-Clause"; + }; + production = true; + }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index fd7a6ed52fc..dba0e9d82c2 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -67,22 +67,22 @@ let sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; }; }; - "uglify-js-2.4.15" = { + "uglify-js-2.6.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.4.15"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; - sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; - "resolve-1.2.0" = { + "resolve-1.3.2" = { name = "resolve"; packageName = "resolve"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"; - sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"; + sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235"; }; }; "global-paths-0.1.2" = { @@ -112,13 +112,13 @@ let sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; }; }; - "moment-2.10.6" = { + "moment-2.17.1" = { name = "moment"; packageName = "moment"; - version = "2.10.6"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"; - sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77"; + url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; + sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; "node.extend-1.0.10" = { @@ -202,22 +202,13 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "source-map-0.1.34" = { + "source-map-0.5.6" = { name = "source-map"; packageName = "source-map"; - version = "0.1.34"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; - sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; - }; - }; - "optimist-0.3.7" = { - name = "optimist"; - packageName = "optimist"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; "uglify-to-browserify-1.0.2" = { @@ -229,22 +220,139 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "wordwrap-0.0.3" = { + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; - version = "0.0.3"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "kind-of-3.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; + sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "is-buffer-1.1.4" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; + sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + }; + }; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; }; }; "array-unique-0.2.1" = { @@ -337,6 +445,15 @@ let sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; }; }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; "xml2js-0.2.8" = { name = "xml2js"; packageName = "xml2js"; @@ -490,13 +607,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.17.0" = { + "azure-arm-network-0.18.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz"; - sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz"; + sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -643,13 +760,13 @@ let sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; - "azure-arm-storage-0.13.1-preview" = { + "azure-arm-storage-0.15.0-preview" = { name = "azure-arm-storage"; packageName = "azure-arm-storage"; - version = "0.13.1-preview"; + version = "0.15.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.13.1-preview.tgz"; - sha1 = "9342515a44e632c48f1d0d9c7a98214ed563d8f7"; + url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz"; + sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e"; }; }; "azure-asm-sb-0.10.1" = { @@ -697,13 +814,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-1.3.0" = { + "azure-storage-2.0.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "1.3.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz"; - sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz"; + sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0"; }; }; "azure-arm-batch-0.3.0" = { @@ -850,40 +967,31 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "kuduscript-1.0.9" = { + "kuduscript-1.0.13" = { name = "kuduscript"; packageName = "kuduscript"; - version = "1.0.9"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.9.tgz"; - sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz"; + sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e"; }; }; - "moment-2.17.1" = { - name = "moment"; - packageName = "moment"; - version = "2.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; - sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; - }; - }; - "ms-rest-1.15.4" = { + "ms-rest-1.15.5" = { name = "ms-rest"; packageName = "ms-rest"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz"; - sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz"; + sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d"; }; }; - "ms-rest-azure-1.15.4" = { + "ms-rest-azure-1.15.5" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz"; - sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz"; + sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611"; }; }; "node-forge-0.6.23" = { @@ -895,13 +1003,13 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "omelette-0.1.0" = { + "omelette-0.3.2" = { name = "omelette"; packageName = "omelette"; - version = "0.1.0"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/omelette/-/omelette-0.1.0.tgz"; - sha1 = "31cc7eb472a513c07483d24d3e1bf164cb0d23b8"; + url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz"; + sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; }; }; "openssl-wrapper-0.2.1" = { @@ -1048,15 +1156,6 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -1246,15 +1345,6 @@ let sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; }; }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - }; "browserify-mime-1.2.9" = { name = "browserify-mime"; packageName = "browserify-mime"; @@ -1264,6 +1354,15 @@ let sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; }; }; + "extend-1.2.1" = { + name = "extend"; + packageName = "extend"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + }; "json-edm-parser-0.1.2" = { name = "json-edm-parser"; packageName = "json-edm-parser"; @@ -1273,6 +1372,15 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; + "md5.js-1.3.4" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + }; + }; "readable-stream-2.0.6" = { name = "readable-stream"; packageName = "readable-stream"; @@ -1291,13 +1399,13 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; + "hash-base-3.0.3" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.3.tgz"; + sha1 = "87ec48734bfe354275535150b14821566b083807"; }; }; "inherits-2.0.3" = { @@ -1309,6 +1417,15 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1525,13 +1642,13 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "rimraf-2.5.4" = { + "rimraf-2.6.1" = { name = "rimraf"; packageName = "rimraf"; - version = "2.5.4"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; - sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; + sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; }; }; "minimist-0.0.8" = { @@ -1813,13 +1930,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.2.1" = { + "qs-6.2.2" = { name = "qs"; packageName = "qs"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz"; + sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586"; }; }; "stringstream-0.0.5" = { @@ -1858,13 +1975,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.1.4" = { + "async-2.1.5" = { name = "async"; packageName = "async"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; - sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; "lodash-4.17.4" = { @@ -1894,13 +2011,13 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "is-my-json-valid-2.15.0" = { + "is-my-json-valid-2.16.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; - sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz"; + sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693"; }; }; "pinkie-promise-2.0.1" = { @@ -2299,13 +2416,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.2" = { + "readable-stream-2.2.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz"; + sha1 = "9cf49463985df016c8ae8813097a9293a9b33729"; }; }; "buffer-shims-1.0.0" = { @@ -2695,15 +2812,6 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -3127,13 +3235,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.3.0" = { + "JSONStream-1.3.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz"; - sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; + sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; }; }; "assert-1.4.1" = { @@ -3181,13 +3289,13 @@ let sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; - "cached-path-relative-1.0.0" = { + "cached-path-relative-1.0.1" = { name = "cached-path-relative"; packageName = "cached-path-relative"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz"; - sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; }; }; "concat-stream-1.5.2" = { @@ -3316,13 +3424,13 @@ let sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "module-deps-4.0.8" = { + "module-deps-4.1.1" = { name = "module-deps"; packageName = "module-deps"; - version = "4.0.8"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz"; - sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; "os-browserify-0.1.2" = { @@ -3550,15 +3658,6 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -3766,13 +3865,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.3" = { + "elliptic-6.4.0" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz"; - sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; "parse-asn1-5.0.0" = { @@ -3784,13 +3883,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.7" = { + "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; - version = "1.0.7"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz"; - sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; "hash.js-1.0.3" = { @@ -3802,6 +3901,24 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; + "hmac-drbg-1.0.0" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; + sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; "asn1.js-4.9.1" = { name = "asn1.js"; packageName = "asn1.js"; @@ -3847,15 +3964,6 @@ let sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; }; }; - "is-buffer-1.1.4" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; - }; - }; "lexical-scope-1.2.0" = { name = "lexical-scope"; packageName = "lexical-scope"; @@ -4666,6 +4774,15 @@ let sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; }; }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -5197,22 +5314,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.2.2" = { + "simple-peer-6.4.3" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.2.2"; + version = "6.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz"; - sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz"; + sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a"; }; }; - "simple-websocket-4.3.0" = { + "simple-websocket-4.3.1" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz"; - sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz"; + sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; "string2compact-1.2.2" = { @@ -5224,13 +5341,13 @@ let sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; }; }; - "ws-1.1.1" = { + "ws-1.1.2" = { name = "ws"; packageName = "ws"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; - sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; + url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; + sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; }; }; "ipaddr.js-1.2.0" = { @@ -5251,13 +5368,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.0.3" = { + "ws-2.1.0" = { name = "ws"; packageName = "ws"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz"; - sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb"; + url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz"; + sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92"; }; }; "ultron-1.1.0" = { @@ -6484,6 +6601,15 @@ let sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"; }; }; + "abbrev-1.1.0" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; + sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; + }; + }; "abbrev-1.0.9" = { name = "abbrev"; packageName = "abbrev"; @@ -6817,6 +6943,15 @@ let sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; }; }; + "rimraf-2.5.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; + sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + }; + }; "sha-2.0.1" = { name = "sha"; packageName = "sha"; @@ -7042,13 +7177,13 @@ let sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; - "qs-6.3.0" = { + "qs-6.3.1" = { name = "qs"; packageName = "qs"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; - sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz"; + sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d"; }; }; "asynckit-0.4.0" = { @@ -7636,22 +7771,22 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.1.6" = { + "rc-1.1.7" = { name = "rc"; packageName = "rc"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz"; - sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9"; + url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz"; + sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"; }; }; - "strip-json-comments-1.0.4" = { + "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; - version = "1.0.4"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; "clone-2.1.0" = { @@ -9071,22 +9206,22 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.14.0" = { + "globals-9.16.0" = { name = "globals"; packageName = "globals"; - version = "9.14.0"; + version = "9.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz"; - sha1 = "8859936af0038741263053b39d0e76ca241e4034"; + url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz"; + sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80"; }; }; - "ignore-3.2.2" = { + "ignore-3.2.4" = { name = "ignore"; packageName = "ignore"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz"; - sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz"; + sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8"; }; }; "inquirer-0.12.0" = { @@ -9179,15 +9314,6 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - }; "table-3.8.3" = { name = "table"; packageName = "table"; @@ -9764,13 +9890,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.0.17" = { + "fsevents-1.1.1" = { name = "fsevents"; packageName = "fsevents"; - version = "1.0.17"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz"; - sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz"; + sha1 = "f19fd28f43eeaf761680e519a203c4d0b3d31aff"; }; }; "micromatch-2.3.11" = { @@ -9836,15 +9962,6 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "kind-of-3.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; - sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; - }; - }; "normalize-path-2.0.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -9953,15 +10070,6 @@ let sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"; }; }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -9971,13 +10079,13 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; - "for-own-0.1.4" = { + "for-own-0.1.5" = { name = "for-own"; packageName = "for-own"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz"; - sha1 = "0149b41a39088c7515f51ebe1c1386d45f935072"; + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; }; }; "is-extendable-0.1.1" = { @@ -9989,13 +10097,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.6" = { + "for-in-1.0.1" = { name = "for-in"; packageName = "for-in"; - version = "0.1.6"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; - sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz"; + sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa"; }; }; "glob-base-0.3.0" = { @@ -10251,13 +10359,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.3" = { + "coffee-script-1.12.4" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; - sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; + sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; }; }; "jade-1.11.0" = { @@ -10296,13 +10404,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.24" = { + "clean-css-3.4.25" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.24"; + version = "3.4.25"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz"; - sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz"; + sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"; }; }; "commander-2.6.0" = { @@ -10467,85 +10575,13 @@ let sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }; }; "acorn-globals-1.0.9" = { @@ -11349,6 +11385,15 @@ let sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; }; }; + "strip-json-comments-1.0.4" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + }; "xml-1.0.0" = { name = "xml"; packageName = "xml"; @@ -11574,13 +11619,13 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.5.0" = { + "connect-3.6.0" = { name = "connect"; packageName = "connect"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; - sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz"; + sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e"; }; }; "core-js-2.4.1" = { @@ -11655,22 +11700,22 @@ let sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; }; }; - "socket.io-1.7.2" = { + "socket.io-1.7.3" = { name = "socket.io"; packageName = "socket.io"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz"; - sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz"; + sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; - "tmp-0.0.28" = { + "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; - version = "0.0.28"; + version = "0.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; - sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; }; }; "useragent-2.1.12" = { @@ -11700,6 +11745,15 @@ let sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; + "qs-6.2.1" = { + name = "qs"; + packageName = "qs"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + }; + }; "raw-body-2.2.0" = { name = "raw-body"; packageName = "raw-body"; @@ -11709,13 +11763,13 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; - "finalhandler-0.5.0" = { + "finalhandler-1.0.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz"; + sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755"; }; }; "custom-event-1.0.1" = { @@ -11808,13 +11862,13 @@ let sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "engine.io-1.8.2" = { + "engine.io-1.8.3" = { name = "engine.io"; packageName = "engine.io"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz"; - sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz"; + sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4"; }; }; "has-binary-0.1.7" = { @@ -11844,13 +11898,13 @@ let sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; }; }; - "socket.io-client-1.7.2" = { + "socket.io-client-1.7.3" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz"; - sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz"; + sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377"; }; }; "socket.io-parser-2.3.1" = { @@ -11952,13 +12006,13 @@ let sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; - "engine.io-client-1.8.2" = { + "engine.io-client-1.8.3" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz"; - sha1 = "c38767547f2a7d184f5752f6f0ad501006703766"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz"; + sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab"; }; }; "object-component-0.0.3" = { @@ -12744,13 +12798,13 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "convert-source-map-1.3.0" = { + "convert-source-map-1.4.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz"; - sha1 = "e9f3e9c6e2728efc2676696a70eb382f73106a67"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz"; + sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3"; }; }; "express-2.5.11" = { @@ -13104,6 +13158,15 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; + "serve-favicon-2.4.0" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz"; + sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0"; + }; + }; "strong-data-uri-1.0.4" = { name = "strong-data-uri"; packageName = "strong-data-uri"; @@ -13212,6 +13275,24 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; + "etag-1.8.0" = { + name = "etag"; + packageName = "etag"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; + sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; + }; + }; + "fresh-0.4.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.4.0.tgz"; + sha1 = "475626a934a8d3480b2101a1d6ecef7dafd7c553"; + }; + }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -13563,6 +13644,15 @@ let sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; }; }; + "ws-1.1.1" = { + name = "ws"; + packageName = "ws"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; + sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; + }; + }; "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; @@ -13572,13 +13662,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.16" = { + "node-red-node-email-0.1.21" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.16"; + version = "0.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz"; - sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz"; + sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; }; }; "node-red-node-twitter-0.1.9" = { @@ -13770,6 +13860,15 @@ let sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; }; }; + "finalhandler-0.5.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; + sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + }; + }; "send-0.14.1" = { name = "send"; packageName = "send"; @@ -13788,13 +13887,13 @@ let sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; }; }; - "cookies-0.6.2" = { + "cookies-0.7.0" = { name = "cookies"; packageName = "cookies"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz"; - sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.0.tgz"; + sha1 = "0bc961d910c35254980fc7c9eff5da12011bbf00"; }; }; "i18next-client-1.10.3" = { @@ -14733,15 +14832,6 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "aproba-1.0.4" = { - name = "aproba"; - packageName = "aproba"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; - sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; - }; - }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14751,6 +14841,15 @@ let sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; }; }; + "lazy-property-1.0.0" = { + name = "lazy-property"; + packageName = "lazy-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz"; + sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -14841,13 +14940,13 @@ let sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df"; }; }; - "opener-1.4.2" = { + "opener-1.4.3" = { name = "opener"; packageName = "opener"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; - sha1 = "b32582080042af8680c389a499175b4c54fff523"; + url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz"; + sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; "read-cmd-shim-1.0.1" = { @@ -15255,6 +15354,15 @@ let sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; }; }; + "aproba-1.0.4" = { + name = "aproba"; + packageName = "aproba"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; + sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + }; + }; "request-2.75.0" = { name = "request"; packageName = "request"; @@ -15519,13 +15627,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.15" = { + "service-runner-2.2.4" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.15"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz"; - sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz"; + sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c"; }; }; "simplediff-0.1.1" = { @@ -15645,13 +15753,13 @@ let sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; }; }; - "limitation-0.1.9" = { + "limitation-0.2.0" = { name = "limitation"; packageName = "limitation"; - version = "0.1.9"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz"; - sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; + url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz"; + sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; }; }; "yargs-6.6.0" = { @@ -15663,6 +15771,15 @@ let sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; + "dnscache-1.0.1" = { + name = "dnscache"; + packageName = "dnscache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz"; + sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; + }; + }; "dtrace-provider-0.8.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -15844,6 +15961,24 @@ let sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; + "lodash.clone-4.3.2" = { + name = "lodash.clone"; + packageName = "lodash.clone"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz"; + sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9"; + }; + }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; "lodash.assign-4.2.0" = { name = "lodash.assign"; packageName = "lodash.assign"; @@ -16807,13 +16942,13 @@ let sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.21" = { + "recast-0.11.22" = { name = "recast"; packageName = "recast"; - version = "0.11.21"; + version = "0.11.22"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz"; - sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz"; + sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa"; }; }; "ast-types-0.9.5" = { @@ -17177,6 +17312,15 @@ let sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; }; }; + "http-errors-1.6.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; + sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; + }; + }; "fs-ext-0.5.0" = { name = "fs-ext"; packageName = "fs-ext"; @@ -17294,6 +17438,15 @@ let sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; }; }; + "setprototypeof-1.0.3" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + }; + }; "lru-cache-2.2.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -17681,6 +17834,15 @@ let sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; }; }; + "acorn-4.0.11" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; + }; + }; "enhanced-resolve-2.3.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -17870,15 +18032,6 @@ let sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; }; }; - "uglify-js-2.6.1" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; - sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; - }; - }; "xmldom-0.1.22" = { name = "xmldom"; packageName = "xmldom"; @@ -17888,13 +18041,13 @@ let sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; }; }; - "qs-6.0.2" = { + "qs-6.0.3" = { name = "qs"; packageName = "qs"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz"; + sha1 = "95f870b23e70268fba18704e80667515905af06c"; }; }; "blueimp-md5-2.6.0" = { @@ -17987,6 +18140,15 @@ let sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; + "node-cache-4.1.1" = { + name = "node-cache"; + packageName = "node-cache"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz"; + sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; + }; + }; "npm-4.1.2" = { name = "npm"; packageName = "npm"; @@ -18059,13 +18221,13 @@ let sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; }; }; - "color-string-1.4.0" = { + "color-string-1.5.0" = { name = "color-string"; packageName = "color-string"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz"; - sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz"; + sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce"; }; }; "color-name-1.1.1" = { @@ -18320,15 +18482,6 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; - }; - }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -18338,15 +18491,6 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "acorn-4.0.11" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; - sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; - }; - }; "acorn-dynamic-import-2.0.1" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; @@ -18383,13 +18527,13 @@ let sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; - "loader-utils-0.2.16" = { + "loader-utils-0.2.17" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.16"; + version = "0.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; - sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz"; + sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; }; }; "memory-fs-0.4.1" = { @@ -18410,13 +18554,13 @@ let sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; - "watchpack-1.2.0" = { + "watchpack-1.3.1" = { name = "watchpack"; packageName = "watchpack"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz"; - sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz"; + sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87"; }; }; "webpack-sources-0.1.4" = { @@ -18491,13 +18635,13 @@ let sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; }; }; - "babel-runtime-6.22.0" = { + "babel-runtime-6.23.0" = { name = "babel-runtime"; packageName = "babel-runtime"; - version = "6.22.0"; + version = "6.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz"; - sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"; + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"; + sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; }; }; "death-1.1.0" = { @@ -18509,13 +18653,13 @@ let sha1 = "01aa9c401edd92750514470b8266390c66c67318"; }; }; - "detect-indent-4.0.0" = { + "detect-indent-5.0.0" = { name = "detect-indent"; packageName = "detect-indent"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; }; }; "diff-2.2.3" = { @@ -18527,6 +18671,15 @@ let sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; }; }; + "inquirer-3.0.5" = { + name = "inquirer"; + packageName = "inquirer"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz"; + sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65"; + }; + }; "invariant-2.2.2" = { name = "invariant"; packageName = "invariant"; @@ -18545,13 +18698,13 @@ let sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; }; }; - "leven-2.0.0" = { + "leven-2.1.0" = { name = "leven"; packageName = "leven"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz"; - sha1 = "74c45744439550da185801912829f61d22071bc1"; + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; "node-emoji-1.5.1" = { @@ -18563,13 +18716,13 @@ let sha1 = "fd918e412769bf8c448051238233840b2aff16a1"; }; }; - "object-path-0.11.3" = { + "object-path-0.11.4" = { name = "object-path"; packageName = "object-path"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz"; - sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554"; + url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz"; + sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; }; }; "proper-lockfile-2.0.0" = { @@ -18599,13 +18752,58 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; - "regenerator-runtime-0.10.1" = { + "regenerator-runtime-0.10.3" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.10.1"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz"; - sha1 = "257f41961ce44558b18f7814af48c17559f9faeb"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz"; + sha1 = "8c4367a904b51ea62a908ac310bf99ff90a82a3e"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "external-editor-2.0.1" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.1.tgz"; + sha1 = "4c597c6c88fa6410e41dbbaa7b1be2336aa31095"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "onetime-2.0.0" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz"; + sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6"; }; }; "loose-envify-1.3.1" = { @@ -18635,16 +18833,439 @@ let sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; }; }; + "cli-list-0.1.8" = { + name = "cli-list"; + packageName = "cli-list"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz"; + sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a"; + }; + }; + "cross-spawn-3.0.1" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz"; + sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; + }; + }; + "fullname-2.1.0" = { + name = "fullname"; + packageName = "fullname"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz"; + sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350"; + }; + }; + "humanize-string-1.0.1" = { + name = "humanize-string"; + packageName = "humanize-string"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz"; + sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; + }; + }; + "inquirer-0.11.4" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz"; + sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d"; + }; + }; + "insight-0.7.0" = { + name = "insight"; + packageName = "insight"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz"; + sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6"; + }; + }; + "npm-keyword-4.2.0" = { + name = "npm-keyword"; + packageName = "npm-keyword"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz"; + sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0"; + }; + }; + "opn-3.0.3" = { + name = "opn"; + packageName = "opn"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz"; + sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; + }; + }; + "parse-help-0.1.1" = { + name = "parse-help"; + packageName = "parse-help"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz"; + sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda"; + }; + }; + "root-check-1.0.0" = { + name = "root-check"; + packageName = "root-check"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz"; + sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; + }; + }; + "sort-on-1.3.0" = { + name = "sort-on"; + packageName = "sort-on"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz"; + sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840"; + }; + }; + "tabtab-1.3.2" = { + name = "tabtab"; + packageName = "tabtab"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; + sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; + }; + }; + "titleize-1.0.0" = { + name = "titleize"; + packageName = "titleize"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz"; + sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; + }; + }; + "update-notifier-0.6.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; + sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + }; + }; + "yeoman-character-1.1.0" = { + name = "yeoman-character"; + packageName = "yeoman-character"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz"; + sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; + }; + }; + "yeoman-doctor-2.1.0" = { + name = "yeoman-doctor"; + packageName = "yeoman-doctor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz"; + sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; + }; + }; + "yeoman-environment-1.6.6" = { + name = "yeoman-environment"; + packageName = "yeoman-environment"; + version = "1.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz"; + sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671"; + }; + }; + "yosay-1.2.1" = { + name = "yosay"; + packageName = "yosay"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz"; + sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b"; + }; + }; + "npmconf-2.1.2" = { + name = "npmconf"; + packageName = "npmconf"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; + sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; + }; + }; + "execall-1.0.0" = { + name = "execall"; + packageName = "execall"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz"; + sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; + }; + }; + "clone-regexp-1.0.0" = { + name = "clone-regexp"; + packageName = "clone-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz"; + sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c"; + }; + }; + "is-regexp-1.0.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + }; + "is-supported-regexp-flag-1.0.0" = { + name = "is-supported-regexp-flag"; + packageName = "is-supported-regexp-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz"; + sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8"; + }; + }; + "downgrade-root-1.2.2" = { + name = "downgrade-root"; + packageName = "downgrade-root"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz"; + sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; + }; + }; + "sudo-block-1.2.0" = { + name = "sudo-block"; + packageName = "sudo-block"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz"; + sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; + }; + }; + "default-uid-1.0.0" = { + name = "default-uid"; + packageName = "default-uid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz"; + sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e"; + }; + }; + "is-root-1.0.0" = { + name = "is-root"; + packageName = "is-root"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; + sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5"; + }; + }; + "is-docker-1.1.0" = { + name = "is-docker"; + packageName = "is-docker"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz"; + sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; + }; + }; + "dot-prop-2.4.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz"; + sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c"; + }; + }; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; + }; + }; + "bin-version-check-2.1.0" = { + name = "bin-version-check"; + packageName = "bin-version-check"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz"; + sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0"; + }; + }; + "each-async-1.1.1" = { + name = "each-async"; + packageName = "each-async"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"; + sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; + }; + }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; + "object-values-1.0.0" = { + name = "object-values"; + packageName = "object-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz"; + sha1 = "72af839630119e5b98c3b02bb8c27e3237158105"; + }; + }; + "twig-0.8.9" = { + name = "twig"; + packageName = "twig"; + version = "0.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz"; + sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2"; + }; + }; + "bin-version-1.0.4" = { + name = "bin-version"; + packageName = "bin-version"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz"; + sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e"; + }; + }; + "semver-truncate-1.1.2" = { + name = "semver-truncate"; + packageName = "semver-truncate"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz"; + sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; + }; + }; + "find-versions-1.2.1" = { + name = "find-versions"; + packageName = "find-versions"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz"; + sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"; + }; + }; + "semver-regex-1.0.0" = { + name = "semver-regex"; + packageName = "semver-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; + sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + }; + }; + "globby-4.1.0" = { + name = "globby"; + packageName = "globby"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz"; + sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; + }; + }; + "grouped-queue-0.3.3" = { + name = "grouped-queue"; + packageName = "grouped-queue"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; + sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; + }; + }; + "mem-fs-1.1.3" = { + name = "mem-fs"; + packageName = "mem-fs"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz"; + sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; + }; + }; + "vinyl-file-2.0.0" = { + name = "vinyl-file"; + packageName = "vinyl-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz"; + sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"; + }; + }; + "strip-bom-stream-2.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz"; + sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca"; + }; + }; + "first-chunk-stream-2.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + }; + }; + "pad-component-0.0.1" = { + name = "pad-component"; + packageName = "pad-component"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; + sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; + }; + }; + "taketalk-1.0.0" = { + name = "taketalk"; + packageName = "taketalk"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz"; + sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd"; + }; + }; }; in { alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.6"; + version = "1.9.8"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz"; - sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz"; + sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13"; }; dependencies = [ sources."colors-0.6.0-1" @@ -18654,16 +19275,16 @@ in sources."wrench-1.3.9" sources."xmldom-0.1.19" sources."jsonlint-1.5.1" - (sources."uglify-js-2.4.15" // { + (sources."uglify-js-2.6.1" // { dependencies = [ - sources."source-map-0.1.34" + sources."source-map-0.5.6" ]; }) - sources."resolve-1.2.0" + sources."resolve-1.3.2" sources."global-paths-0.1.2" sources."source-map-0.1.9" sources."xml2tss-0.0.5" - sources."moment-2.10.6" + sources."moment-2.17.1" sources."node.extend-1.0.10" sources."nomnom-1.8.1" sources."JSV-4.0.2" @@ -18673,10 +19294,22 @@ in sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" sources."async-0.2.10" - sources."optimist-0.3.7" sources."uglify-to-browserify-1.0.2" - sources."amdefine-1.0.1" - sources."wordwrap-0.0.3" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."wordwrap-0.0.2" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.1.0" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."path-parse-1.0.5" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { dependencies = [ @@ -18694,6 +19327,7 @@ in sources."which-1.2.12" sources."parse-passwd-1.0.0" sources."isexe-1.1.2" + sources."amdefine-1.0.1" sources."xml2js-0.2.8" sources."sax-0.5.8" sources."is-0.3.0" @@ -18709,10 +19343,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz"; - sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz"; + sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4"; }; dependencies = [ sources."adal-node-0.1.21" @@ -18734,7 +19368,7 @@ in sources."azure-arm-insights-0.11.3" sources."azure-arm-iothub-0.1.4" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.17.0" + sources."azure-arm-network-0.18.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" @@ -18755,7 +19389,7 @@ in }) sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.6.1-preview" - sources."azure-arm-storage-0.13.1-preview" + sources."azure-arm-storage-0.15.0-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" @@ -18765,7 +19399,7 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-1.3.0" // { + (sources."azure-storage-2.0.0" // { dependencies = [ sources."readable-stream-2.0.6" sources."validator-3.22.2" @@ -18788,21 +19422,21 @@ in sources."jsonlint-1.6.2" sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" - (sources."kuduscript-1.0.9" // { + (sources."kuduscript-1.0.13" // { dependencies = [ sources."commander-1.1.1" sources."streamline-0.4.11" ]; }) sources."moment-2.17.1" - sources."ms-rest-1.15.4" - (sources."ms-rest-azure-1.15.4" // { + sources."ms-rest-1.15.5" + (sources."ms-rest-azure-1.15.5" // { dependencies = [ sources."async-0.2.7" ]; }) sources."node-forge-0.6.23" - sources."omelette-0.1.0" + sources."omelette-0.3.2" sources."openssl-wrapper-0.2.1" sources."progress-1.1.8" (sources."prompt-0.2.14" // { @@ -18865,12 +19499,14 @@ in sources."envconf-0.0.4" sources."duplexer-0.1.1" sources."sax-0.5.2" - sources."extend-1.2.1" sources."browserify-mime-1.2.9" + sources."extend-1.2.1" sources."json-edm-parser-0.1.2" + sources."md5.js-1.3.4" sources."jsonparse-1.2.0" - sources."core-util-is-1.0.2" + sources."hash-base-3.0.3" sources."inherits-2.0.3" + sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18905,7 +19541,7 @@ in sources."i-0.3.5" sources."mkdirp-0.5.1" sources."ncp-0.4.2" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."minimist-0.0.8" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -18931,7 +19567,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.4" + sources."async-2.1.5" ]; }) (sources."har-validator-2.0.6" // { @@ -18948,13 +19584,13 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.2.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."lodash-4.17.4" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -19006,7 +19642,7 @@ in sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" ]; }) sources."http-response-object-1.1.0" @@ -19097,7 +19733,7 @@ in sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" sources."inherits-2.0.3" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" @@ -19168,7 +19804,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ sources."glob-7.1.1" ]; @@ -19200,13 +19836,13 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.0.0"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz"; - sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; + sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; }; dependencies = [ - sources."JSONStream-1.3.0" + sources."JSONStream-1.3.1" sources."assert-1.4.1" sources."browser-pack-6.0.2" (sources."browser-resolve-1.11.2" // { @@ -19216,7 +19852,7 @@ in }) sources."browserify-zlib-0.1.4" sources."buffer-5.0.5" - sources."cached-path-relative-1.0.0" + sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -19241,7 +19877,7 @@ in sources."isarray-0.0.1" ]; }) - sources."module-deps-4.0.8" + sources."module-deps-4.1.1" sources."os-browserify-0.1.2" sources."parents-1.0.1" sources."path-browserify-0.0.0" @@ -19249,8 +19885,8 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.2.2" - sources."resolve-1.2.0" + sources."readable-stream-2.2.3" + sources."resolve-1.3.2" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" @@ -19312,10 +19948,12 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.3" + sources."elliptic-6.4.0" sources."parse-asn1-5.0.0" - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.8" @@ -19343,6 +19981,7 @@ in sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" sources."buffer-shims-1.0.0" + sources."path-parse-1.0.5" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."array-filter-0.0.1" @@ -19589,7 +20228,7 @@ in sources."ip-set-1.0.1" sources."mkdirp-0.3.5" sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" (sources."random-access-file-1.5.0" // { @@ -19650,21 +20289,21 @@ in sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-peer-6.2.2" // { + (sources."simple-peer-6.4.3" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) - (sources."simple-websocket-4.3.0" // { + (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.2" - sources."ws-2.0.3" + sources."readable-stream-2.2.3" + sources."ws-2.1.0" sources."isarray-1.0.0" ]; }) sources."string2compact-1.2.2" - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."ultron-1.0.2" ]; @@ -19710,7 +20349,7 @@ in sources."voc-0.5.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -19732,10 +20371,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; - sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; + sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; }; buildInputs = globalBuildInputs; meta = { @@ -19774,7 +20413,7 @@ in dependencies = [ sources."async-1.5.2" sources."request-2.79.0" - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."nopt-3.0.1" @@ -19840,6 +20479,7 @@ in }) (sources."npm-2.15.11" // { dependencies = [ + sources."abbrev-1.0.9" sources."glob-7.0.6" sources."hosted-git-info-2.1.5" sources."nopt-3.0.6" @@ -19899,13 +20539,14 @@ in sources."interpret-1.0.1" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" - sources."resolve-1.2.0" + sources."resolve-1.3.2" + sources."path-parse-1.0.5" (sources."browserify-13.3.0" // { dependencies = [ sources."glob-7.1.1" ]; }) - sources."JSONStream-1.3.0" + sources."JSONStream-1.3.1" sources."assert-1.4.1" sources."browser-pack-6.0.2" (sources."browser-resolve-1.11.2" // { @@ -19920,7 +20561,7 @@ in sources."isarray-1.0.0" ]; }) - sources."cached-path-relative-1.0.0" + sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -19940,7 +20581,7 @@ in sources."https-browserify-0.0.1" sources."insert-module-globals-7.0.1" sources."labeled-stream-splicer-2.0.0" - sources."module-deps-4.0.8" + sources."module-deps-4.1.1" sources."os-browserify-0.1.2" sources."parents-1.0.1" sources."path-browserify-0.0.0" @@ -19948,7 +20589,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -20010,10 +20651,12 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.3" + sources."elliptic-6.4.0" sources."parse-asn1-5.0.0" - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.8" @@ -20119,7 +20762,7 @@ in sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" sources."builtins-0.0.7" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."archy-1.0.0" @@ -20159,7 +20802,7 @@ in (sources."npm-registry-client-7.2.1" // { dependencies = [ sources."request-2.79.0" - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."npm-user-validate-0.1.5" @@ -20218,7 +20861,7 @@ in sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" @@ -20273,7 +20916,7 @@ in ]; }) sources."node-uuid-1.4.7" - (sources."async-2.1.4" // { + (sources."async-2.1.5" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -20345,9 +20988,9 @@ in ]; }) sources."stream-shift-1.0.0" - sources."rc-1.1.6" + sources."rc-1.1.7" sources."deep-extend-0.4.1" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."is-finite-1.0.2" ]; buildInputs = globalBuildInputs; @@ -20570,7 +21213,7 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -20584,7 +21227,7 @@ in (sources."tar-stream-1.5.2" // { dependencies = [ sources."bl-1.2.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -20608,7 +21251,7 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -20675,8 +21318,8 @@ in sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d"; }; dependencies = [ - sources."JSONStream-1.3.0" - sources."async-2.1.4" + sources."JSONStream-1.3.1" + sources."async-2.1.5" sources."aws4-1.6.0" sources."awscred-1.2.0" sources."ini-1.3.4" @@ -20701,7 +21344,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -20710,7 +21353,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -20876,10 +21519,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.15.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz"; - sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz"; + sha1 = "9bc31fc7341692cf772e80607508f67d711c5609"; }; dependencies = [ sources."babel-code-frame-6.22.0" @@ -20893,11 +21536,11 @@ in sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.1" - sources."globals-9.14.0" - sources."ignore-3.2.2" + sources."globals-9.16.0" + sources."ignore-3.2.4" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."is-resolvable-1.0.0" sources."js-yaml-3.8.1" sources."json-stable-stringify-1.0.1" @@ -20930,7 +21573,7 @@ in sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -20968,7 +21611,7 @@ in sources."is-path-in-cwd-1.0.0" sources."pify-2.3.0" sources."pinkie-promise-2.0.1" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."array-union-1.0.2" sources."arrify-1.0.1" sources."array-uniq-1.0.3" @@ -21020,7 +21663,8 @@ in sources."callsites-0.2.0" sources."interpret-1.0.1" sources."rechoir-0.6.2" - sources."resolve-1.2.0" + sources."resolve-1.3.2" + sources."path-parse-1.0.5" sources."ajv-4.11.3" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" @@ -21150,7 +21794,7 @@ in sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.17" + sources."fsevents-1.1.1" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -21177,16 +21821,16 @@ in sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" - sources."for-own-0.1.4" + sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-0.1.6" + sources."for-in-1.0.1" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21202,7 +21846,7 @@ in }) sources."nopt-3.0.6" sources."npmlog-4.0.2" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -21217,7 +21861,7 @@ in sources."readable-stream-2.1.5" ]; }) - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" (sources."gauge-2.7.3" // { @@ -21239,7 +21883,7 @@ in sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.11.0" @@ -21255,7 +21899,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -21264,7 +21908,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -21391,7 +22035,7 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -21411,7 +22055,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.3" + sources."coffee-script-1.12.4" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ @@ -21421,7 +22065,7 @@ in sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.24" // { + (sources."clean-css-3.4.25" // { dependencies = [ sources."commander-2.8.1" ]; @@ -21547,7 +22191,7 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -21587,7 +22231,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.2.0" + sources."resolve-1.3.2" sources."detect-file-0.1.0" sources."is-glob-2.0.1" sources."micromatch-2.3.11" @@ -21620,9 +22264,9 @@ in sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" - sources."for-own-0.1.4" + sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-0.1.6" + sources."for-in-1.0.1" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."glob-parent-2.0.0" @@ -21649,6 +22293,7 @@ in sources."is-unc-path-0.1.2" sources."unc-path-regex-0.1.2" sources."path-root-regex-0.1.2" + sources."path-parse-1.0.5" sources."end-of-stream-0.1.5" sources."sequencify-0.0.7" sources."stream-consume-0.1.0" @@ -22037,10 +22682,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz"; - sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e"; + url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz"; + sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; }; dependencies = [ sources."bluebird-3.4.7" @@ -22052,12 +22697,7 @@ in sources."lodash-4.17.4" ]; }) - (sources."connect-3.5.0" // { - dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" - ]; - }) + sources."connect-3.6.0" sources."core-js-2.4.1" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -22086,16 +22726,16 @@ in sources."optimist-0.6.1" sources."qjobs-1.1.5" sources."range-parser-1.2.0" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."safe-buffer-5.0.1" - (sources."socket.io-1.7.2" // { + (sources."socket.io-1.7.3" // { dependencies = [ sources."debug-2.3.3" sources."object-assign-4.1.0" ]; }) sources."source-map-0.5.6" - sources."tmp-0.0.28" + sources."tmp-0.0.31" sources."useragent-2.1.12" sources."bytes-2.4.0" sources."content-type-1.0.2" @@ -22123,7 +22763,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.17" + sources."fsevents-1.1.1" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -22150,15 +22790,15 @@ in sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" - sources."for-own-0.1.4" + sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-0.1.6" + sources."for-in-1.0.1" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22166,18 +22806,22 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.33" + (sources."node-pre-gyp-0.6.33" // { + dependencies = [ + sources."rimraf-2.5.4" + ]; + }) sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."minimist-1.2.0" ]; }) (sources."request-2.79.0" // { dependencies = [ - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."semver-5.3.0" @@ -22186,11 +22830,12 @@ in dependencies = [ sources."debug-2.2.0" sources."readable-stream-2.1.5" + sources."rimraf-2.5.4" sources."ms-0.7.1" ]; }) sources."minimist-0.0.8" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" @@ -22209,7 +22854,7 @@ in sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.11.0" @@ -22232,7 +22877,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22282,14 +22927,10 @@ in sources."once-1.3.3" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - (sources."finalhandler-0.5.0" // { - dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" - ]; - }) + sources."finalhandler-1.0.0" sources."parseurl-1.3.1" sources."utils-merge-1.0.0" + sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."custom-event-1.0.1" sources."ent-2.2.0" @@ -22303,7 +22944,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."wordwrap-0.0.3" - (sources."engine.io-1.8.2" // { + (sources."engine.io-1.8.3" // { dependencies = [ sources."debug-2.3.3" ]; @@ -22318,7 +22959,7 @@ in sources."debug-2.3.3" ]; }) - (sources."socket.io-client-1.7.2" // { + (sources."socket.io-client-1.7.3" // { dependencies = [ sources."debug-2.3.3" ]; @@ -22334,7 +22975,7 @@ in sources."accepts-1.3.3" sources."base64id-1.0.0" sources."engine.io-parser-1.3.2" - sources."ws-1.1.1" + sources."ws-1.1.2" sources."cookie-0.3.1" sources."negotiator-0.6.1" sources."after-0.8.2" @@ -22347,7 +22988,7 @@ in sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.2" // { + (sources."engine.io-client-1.8.3" // { dependencies = [ sources."debug-2.3.3" ]; @@ -22547,7 +23188,7 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."xtend-4.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22635,9 +23276,9 @@ in sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" - sources."for-own-0.1.4" + sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-0.1.6" + sources."for-in-1.0.1" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -22652,7 +23293,7 @@ in sources."extend-shallow-2.0.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."convert-source-map-1.3.0" + sources."convert-source-map-1.4.0" sources."minimist-0.0.8" sources."is-utf8-0.2.1" sources."first-chunk-stream-1.0.0" @@ -22812,12 +23453,12 @@ in sources."once-1.4.0" sources."request-2.79.0" sources."retry-0.8.0" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."slide-1.1.6" sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -22848,7 +23489,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -22857,7 +23498,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22933,7 +23574,7 @@ in sources."osenv-0.1.4" sources."uid-number-0.0.5" sources."proto-list-1.2.4" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."block-stream-0.0.9" @@ -22975,7 +23616,7 @@ in sources."npmlog-4.0.2" sources."osenv-0.1.4" sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" sources."which-1.2.12" @@ -22989,13 +23630,13 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23030,7 +23671,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -23039,7 +23680,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23115,14 +23756,19 @@ in }) sources."glob-5.0.15" sources."path-is-absolute-1.0.1" - sources."rc-1.1.6" + sources."rc-1.1.7" sources."semver-4.3.6" - sources."serve-favicon-2.3.2" + (sources."serve-favicon-2.4.0" // { + dependencies = [ + sources."etag-1.8.0" + sources."fresh-0.4.0" + ]; + }) sources."strong-data-uri-1.0.4" sources."v8-debug-0.7.7" sources."v8-profiler-5.6.5" sources."which-1.2.12" - sources."ws-1.1.1" + sources."ws-1.1.2" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" sources."minimist-1.2.0" @@ -23262,7 +23908,7 @@ in sources."concat-map-0.0.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."truncate-1.0.5" sources."nan-2.5.1" (sources."node-pre-gyp-0.6.33" // { @@ -23276,7 +23922,7 @@ in sources."npmlog-4.0.2" (sources."request-2.79.0" // { dependencies = [ - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."tar-2.2.1" @@ -23290,13 +23936,13 @@ in sources."glob-7.1.1" ]; }) - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23332,7 +23978,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -23408,7 +24054,7 @@ in sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -23424,13 +24070,13 @@ in ]; }) sources."minimist-0.0.8" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23451,7 +24097,7 @@ in sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.11.0" @@ -23467,7 +24113,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -23476,7 +24122,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23582,7 +24228,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.17" + sources."fsevents-1.1.1" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -23609,16 +24255,16 @@ in sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" - sources."for-own-0.1.4" + sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-0.1.6" + sources."for-in-1.0.1" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23630,7 +24276,7 @@ in sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -23647,7 +24293,7 @@ in ]; }) sources."minimist-0.0.8" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" @@ -23666,7 +24312,7 @@ in sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.11.0" @@ -23682,7 +24328,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -23691,7 +24337,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23877,12 +24523,12 @@ in sources."ws-1.1.1" sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.7" - sources."node-red-node-email-0.1.16" + sources."node-red-node-email-0.1.21" (sources."node-red-node-twitter-0.1.9" // { dependencies = [ sources."request-2.79.0" sources."form-data-2.1.2" - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."node-red-node-rbe-0.1.6" @@ -23930,7 +24576,7 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23974,7 +24620,7 @@ in sources."klaw-1.3.1" sources."async-0.1.22" sources."retry-0.6.1" - sources."cookies-0.6.2" + sources."cookies-0.7.0" sources."i18next-client-1.10.3" sources."json5-0.2.0" sources."keygrip-1.0.1" @@ -24057,9 +24703,9 @@ in sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.4" - sources."for-own-0.1.4" + sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-0.1.6" + sources."for-in-1.0.1" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -24082,7 +24728,7 @@ in ]; }) sources."stream-shift-1.0.0" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."uid2-0.0.3" sources."passport-strategy-1.0.0" sources."pause-0.0.1" @@ -24126,7 +24772,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.4" + sources."async-2.1.5" ]; }) sources."har-validator-2.0.6" @@ -24142,7 +24788,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -24238,7 +24884,7 @@ in dependencies = [ sources."request-2.79.0" sources."form-data-2.1.2" - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) (sources."mkdirp-0.5.1" // { @@ -24247,7 +24893,7 @@ in ]; }) sources."npmlog-4.0.2" - sources."rc-1.1.6" + sources."rc-1.1.7" (sources."rimraf-2.5.4" // { dependencies = [ sources."glob-7.1.1" @@ -24275,7 +24921,7 @@ in sources."number-is-nan-1.0.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -24354,7 +25000,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.3" + sources."coffee-script-1.12.4" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -24419,18 +25065,18 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz"; - sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a"; + url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz"; + sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28"; }; dependencies = [ - sources."JSONStream-1.3.0" + sources."JSONStream-1.3.1" sources."abbrev-1.0.9" sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."archy-1.0.0" sources."asap-2.0.5" sources."chownr-1.0.1" @@ -24446,7 +25092,7 @@ in sources."glob-7.1.1" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -24456,6 +25102,7 @@ in sources."glob-6.0.4" ]; }) + sources."lazy-property-1.0.0" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" @@ -24479,7 +25126,7 @@ in sources."npm-user-validate-0.1.5" sources."npmlog-4.0.2" sources."once-1.4.0" - sources."opener-1.4.2" + sources."opener-1.4.3" sources."osenv-0.1.4" sources."path-is-inside-1.0.2" sources."read-1.0.7" @@ -24491,7 +25138,7 @@ in ]; }) sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."realize-package-specifier-3.0.3" sources."request-2.79.0" sources."retry-0.10.1" @@ -24610,7 +25257,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -24618,7 +25265,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -24716,7 +25363,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.3" + sources."coffee-script-1.12.4" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.79.0" @@ -24724,7 +25371,7 @@ in sources."slide-1.1.6" sources."chownr-0.0.2" sources."mkdirp-0.3.5" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."retry-0.6.0" sources."couch-login-0.1.20" sources."npmlog-4.0.2" @@ -24743,7 +25390,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -24752,7 +25399,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -24815,7 +25462,7 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -24840,7 +25487,7 @@ in sources."nopt-2.2.1" sources."ini-1.1.0" sources."proto-list-1.2.4" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."block-stream-0.0.9" (sources."fstream-0.1.31" // { dependencies = [ @@ -24870,10 +25517,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz"; - sha1 = "9614c58ec84d31702a85881c844c3fb93611a585"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz"; + sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555"; }; dependencies = [ sources."bluebird-3.4.7" @@ -24969,7 +25616,7 @@ in ]; }) sources."once-1.4.0" - sources."opener-1.4.2" + sources."opener-1.4.3" sources."osenv-0.1.4" sources."path-is-inside-1.0.2" sources."read-1.0.7" @@ -25049,7 +25696,7 @@ in sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" ]; }) sources."typedarray-0.0.6" @@ -25084,13 +25731,13 @@ in sources."mime-types-2.1.14" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.2.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -25172,13 +25819,13 @@ in sources."error-ex-1.3.0" sources."is-arrayish-0.2.1" sources."prepend-http-1.0.4" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."deep-extend-0.4.1" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -25241,12 +25888,17 @@ in sources."prfun-2.1.4" (sources."request-2.79.0" // { dependencies = [ - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."semver-5.3.0" - sources."serve-favicon-2.3.2" - (sources."service-runner-2.1.15" // { + (sources."serve-favicon-2.4.0" // { + dependencies = [ + sources."etag-1.8.0" + sources."fresh-0.4.0" + ]; + }) + (sources."service-runner-2.2.4" // { dependencies = [ sources."gelf-stream-1.1.1" sources."yargs-6.6.0" @@ -25400,7 +26052,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -25450,12 +26102,13 @@ in sources."bunyan-1.8.5" sources."bunyan-syslog-udp-0.1.0" sources."hot-shots-4.3.1" - (sources."limitation-0.1.9" // { + (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) + sources."dnscache-1.0.1" sources."dtrace-provider-0.8.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" @@ -25474,14 +26127,14 @@ in sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -25489,7 +26142,7 @@ in sources."merge-1.2.0" (sources."msgpack5-3.4.1" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -25499,7 +26152,7 @@ in sources."dom-storage-2.0.2" (sources."bl-1.2.0" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."isarray-1.0.0" ]; }) @@ -25542,6 +26195,8 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" + sources."lodash.clone-4.3.2" + sources."lodash._baseclone-4.5.7" sources."lodash.assign-4.2.0" ]; buildInputs = globalBuildInputs; @@ -25585,7 +26240,7 @@ in }) sources."pump-1.0.2" sources."range-parser-1.2.0" - sources."rc-1.1.6" + sources."rc-1.1.7" (sources."torrent-stream-1.0.3" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -25614,7 +26269,7 @@ in sources."big-integer-1.6.17" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -25732,7 +26387,7 @@ in }) sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."bitfield-0.1.0" sources."bncode-0.5.3" (sources."fs-chunk-store-1.6.4" // { @@ -25747,7 +26402,7 @@ in sources."ip-set-1.0.1" sources."mkdirp-0.3.5" sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" (sources."random-access-file-1.5.0" // { @@ -25806,14 +26461,14 @@ in sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - sources."simple-peer-6.2.2" - (sources."simple-websocket-4.3.0" // { + sources."simple-peer-6.4.3" + (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."ws-2.0.3" + sources."ws-2.1.0" ]; }) sources."string2compact-1.2.2" - (sources."ws-1.1.1" // { + (sources."ws-1.1.2" // { dependencies = [ sources."ultron-1.0.2" ]; @@ -25853,7 +26508,7 @@ in sources."pump-1.0.2" sources."range-parser-1.2.0" sources."read-torrent-1.3.0" - (sources."socket.io-1.7.2" // { + (sources."socket.io-1.7.3" // { dependencies = [ sources."debug-2.3.3" ]; @@ -25990,7 +26645,7 @@ in sources."boom-0.3.8" sources."cryptiles-0.1.3" sources."sntp-0.1.4" - (sources."engine.io-1.8.2" // { + (sources."engine.io-1.8.3" // { dependencies = [ sources."debug-2.3.3" sources."cookie-0.3.1" @@ -26003,7 +26658,7 @@ in sources."debug-2.3.3" ]; }) - (sources."socket.io-client-1.7.2" // { + (sources."socket.io-client-1.7.3" // { dependencies = [ sources."debug-2.3.3" ]; @@ -26025,7 +26680,7 @@ in }) sources."base64id-1.0.0" sources."engine.io-parser-1.3.2" - sources."ws-1.1.1" + sources."ws-1.1.2" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" @@ -26036,7 +26691,7 @@ in sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.2" // { + (sources."engine.io-client-1.8.3" // { dependencies = [ sources."debug-2.3.3" ]; @@ -26077,7 +26732,7 @@ in }) sources."peer-wire-swarm-0.9.2" sources."random-access-file-0.3.2" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."thunky-0.1.0" sources."addr-to-ip-port-1.4.2" sources."buffer-equal-0.0.1" @@ -26160,7 +26815,7 @@ in sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -26193,7 +26848,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.4" + sources."async-2.1.5" sources."lodash-4.17.4" sources."mime-db-1.26.0" sources."assert-plus-0.2.0" @@ -26229,7 +26884,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -26276,7 +26931,7 @@ in sources."mkdirp-0.5.1" sources."private-0.1.7" sources."q-1.4.1" - sources."recast-0.11.21" + sources."recast-0.11.22" sources."graceful-readlink-1.0.1" sources."acorn-3.3.0" sources."defined-1.0.0" @@ -26377,7 +27032,7 @@ in (sources."openid-2.0.6" // { dependencies = [ sources."request-2.79.0" - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."node-swt-0.1.1" @@ -26410,7 +27065,7 @@ in sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -26495,6 +27150,7 @@ in dependencies = [ sources."bytes-2.4.0" sources."debug-2.6.1" + sources."http-errors-1.5.1" sources."iconv-lite-0.4.15" sources."qs-6.2.1" sources."raw-body-2.2.0" @@ -26508,10 +27164,10 @@ in }) sources."commander-2.9.0" sources."js-yaml-3.8.1" - sources."cookies-0.6.2" + sources."cookies-0.7.0" (sources."request-2.79.0" // { dependencies = [ - sources."qs-6.3.0" + sources."qs-6.3.1" ]; }) sources."async-0.9.2" @@ -26524,10 +27180,14 @@ in sources."lunr-0.7.2" sources."render-readme-1.3.1" sources."jju-1.3.0" - sources."JSONStream-1.3.0" + sources."JSONStream-1.3.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - sources."http-errors-1.5.1" + (sources."http-errors-1.6.1" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" @@ -26560,6 +27220,7 @@ in sources."router-1.1.5" (sources."send-0.14.2" // { dependencies = [ + sources."http-errors-1.5.1" sources."ms-0.7.2" ]; }) @@ -26579,6 +27240,7 @@ in sources."setprototypeof-1.0.2" sources."destroy-1.0.4" sources."mime-1.3.4" + sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" @@ -26611,7 +27273,7 @@ in sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -26671,7 +27333,6 @@ in ]; }) sources."inflight-1.0.6" - sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -26694,7 +27355,7 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" ]; }) sources."regexp-quote-0.0.0" @@ -26736,7 +27397,7 @@ in sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ - sources."async-2.1.4" + sources."async-2.1.5" sources."cli-table-0.3.1" sources."commander-2.9.0" sources."readdirp-2.1.0" @@ -26745,7 +27406,7 @@ in sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.3" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -26823,7 +27484,7 @@ in sources."extsprintf-1.0.0" ]; }) - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."backoff-2.5.0" sources."csv-0.4.6" sources."escape-regexp-component-1.0.2" @@ -26888,7 +27549,7 @@ in ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -26985,27 +27646,23 @@ in tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz"; - sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34"; + url = "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz"; + sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7"; }; dependencies = [ - sources."acorn-3.3.0" + sources."acorn-4.0.11" sources."enhanced-resolve-2.3.0" - (sources."glob-3.2.11" // { - dependencies = [ - sources."minimatch-0.3.0" - ]; - }) - sources."minimatch-0.2.14" + sources."glob-7.1.1" + sources."minimatch-3.0.3" sources."resolve-from-2.0.0" sources."tapable-0.2.6" sources."memory-fs-0.3.0" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -27014,8 +27671,14 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -27055,7 +27718,7 @@ in (sources."request-2.78.0" // { dependencies = [ sources."form-data-2.1.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."tough-cookie-2.3.2" ]; }) @@ -27103,7 +27766,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.0.2" + sources."qs-6.0.3" sources."stringstream-0.0.5" sources."tough-cookie-2.2.2" sources."tunnel-agent-0.4.3" @@ -27117,7 +27780,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -27201,10 +27864,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.1.6"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz"; - sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz"; + sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9"; }; buildInputs = globalBuildInputs; meta = { @@ -27252,13 +27915,13 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz"; - sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz"; + sha1 = "1519b78475ef5162ef3342c2046889b396add651"; }; dependencies = [ - sources."async-2.1.4" + sources."async-2.1.5" sources."bluebird-3.4.7" sources."blueimp-md5-2.6.0" sources."body-parser-1.15.2" @@ -27271,7 +27934,7 @@ in sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.2" + sources."ignore-3.2.4" sources."keen.io-0.1.3" sources."knockout-3.4.1" sources."lodash-4.17.4" @@ -27281,8 +27944,10 @@ in ]; }) sources."moment-2.17.1" + sources."node-cache-4.1.1" (sources."npm-4.1.2" // { dependencies = [ + sources."abbrev-1.0.9" sources."nopt-4.0.1" sources."request-2.79.0" sources."combined-stream-1.0.5" @@ -27291,7 +27956,7 @@ in sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" @@ -27309,7 +27974,7 @@ in sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" @@ -27329,7 +27994,7 @@ in sources."uuid-3.0.0" ]; }) - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -27339,7 +28004,7 @@ in sources."serve-static-1.11.2" sources."signals-1.0.0" sources."snapsvg-0.4.0" - (sources."socket.io-1.7.2" // { + (sources."socket.io-1.7.3" // { dependencies = [ sources."debug-2.3.3" sources."object-assign-4.1.0" @@ -27391,7 +28056,7 @@ in sources."mime-types-2.1.14" sources."mime-db-1.26.0" sources."color-convert-1.9.0" - sources."color-string-1.4.0" + sources."color-string-1.5.0" sources."color-name-1.1.1" sources."simple-swizzle-0.2.2" sources."is-arrayish-0.3.1" @@ -27405,7 +28070,7 @@ in }) sources."whatwg-fetch-2.0.2" sources."nopt-1.0.10" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" @@ -27515,7 +28180,8 @@ in sources."editions-1.3.3" sources."typechecker-4.4.1" sources."underscore-1.5.2" - sources."JSONStream-1.3.0" + sources."clone-2.1.0" + sources."JSONStream-1.3.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" @@ -27568,7 +28234,7 @@ in sources."npm-user-validate-0.1.5" sources."npmlog-4.0.2" sources."once-1.4.0" - sources."opener-1.4.2" + sources."opener-1.4.3" sources."osenv-0.1.4" sources."path-is-inside-1.0.2" sources."read-1.0.7" @@ -27581,7 +28247,7 @@ in ]; }) sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" sources."sha-2.0.1" @@ -27619,8 +28285,11 @@ in sources."jsonparse-1.3.0" sources."through-2.3.8" sources."wcwidth-1.0.1" - sources."defaults-1.0.3" - sources."clone-1.0.2" + (sources."defaults-1.0.3" // { + dependencies = [ + sources."clone-1.0.2" + ]; + }) sources."proto-list-1.2.4" (sources."fstream-ignore-1.0.5" // { dependencies = [ @@ -27694,7 +28363,7 @@ in sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -27745,9 +28414,9 @@ in sources."pause-0.0.1" sources."lsmod-1.0.0" sources."deep-extend-0.4.1" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."eve-0.4.2" - (sources."engine.io-1.8.2" // { + (sources."engine.io-1.8.3" // { dependencies = [ sources."debug-2.3.3" sources."ms-0.7.2" @@ -27764,7 +28433,7 @@ in sources."ms-0.7.2" ]; }) - (sources."socket.io-client-1.7.2" // { + (sources."socket.io-client-1.7.3" // { dependencies = [ sources."debug-2.3.3" sources."ms-0.7.2" @@ -27778,7 +28447,7 @@ in }) sources."base64id-1.0.0" sources."engine.io-parser-1.3.2" - sources."ws-1.1.1" + sources."ws-1.1.2" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" @@ -27789,7 +28458,7 @@ in sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.2" // { + (sources."engine.io-client-1.8.3" // { dependencies = [ sources."debug-2.3.3" sources."ms-0.7.2" @@ -27881,7 +28550,7 @@ in sources."ini-1.1.0" sources."proto-list-1.2.4" sources."wrappy-1.0.2" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" (sources."extract-zip-1.5.0" // { dependencies = [ sources."mkdirp-0.5.0" @@ -27910,7 +28579,7 @@ in sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -27941,7 +28610,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.4" + sources."async-2.1.5" sources."lodash-4.17.4" sources."mime-db-1.26.0" sources."assert-plus-0.2.0" @@ -27977,7 +28646,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -28016,12 +28685,12 @@ in sources."acorn-dynamic-import-2.0.1" sources."ajv-4.11.3" sources."ajv-keywords-1.5.1" - sources."async-2.1.4" + sources."async-2.1.5" sources."enhanced-resolve-3.1.0" sources."interpret-1.0.1" sources."json-loader-0.5.4" sources."loader-runner-2.3.0" - sources."loader-utils-0.2.16" + sources."loader-utils-0.2.17" sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" sources."node-libs-browser-2.0.0" @@ -28034,7 +28703,7 @@ in sources."yargs-3.10.0" ]; }) - sources."watchpack-1.2.0" + sources."watchpack-1.3.1" sources."webpack-sources-0.1.4" (sources."yargs-6.6.0" // { dependencies = [ @@ -28052,7 +28721,7 @@ in sources."emojis-list-2.1.0" sources."json5-0.5.1" sources."errno-0.1.4" - sources."readable-stream-2.2.2" + sources."readable-stream-2.2.3" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28113,10 +28782,12 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.3" + sources."elliptic-6.4.0" sources."parse-asn1-5.0.0" - sources."brorand-1.0.7" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.8" @@ -28150,7 +28821,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.17" + sources."fsevents-1.1.1" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -28173,9 +28844,9 @@ in sources."isobject-2.1.0" sources."randomatic-1.1.6" sources."is-posix-bracket-0.1.1" - sources."for-own-0.1.4" + sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-0.1.6" + sources."for-in-1.0.1" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -28190,7 +28861,7 @@ in sources."node-pre-gyp-0.6.33" sources."nopt-3.0.6" sources."npmlog-4.0.2" - (sources."rc-1.1.6" // { + (sources."rc-1.1.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -28205,7 +28876,7 @@ in sources."readable-stream-2.1.5" ]; }) - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" @@ -28223,7 +28894,7 @@ in sources."ansi-regex-2.1.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.11.0" @@ -28239,7 +28910,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -28252,7 +28923,7 @@ in ]; }) sources."commander-2.9.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -28368,13 +29039,13 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.19.1"; + version = "0.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz"; - sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz"; + sha1 = "575190fee60a27a54d4125a0f7579fc702f01229"; }; dependencies = [ - sources."babel-runtime-6.22.0" + sources."babel-runtime-6.23.0" sources."bytes-2.4.0" sources."camelcase-3.0.0" sources."chalk-1.1.3" @@ -28383,35 +29054,34 @@ in sources."death-1.1.0" sources."debug-2.6.1" sources."defaults-1.0.3" - sources."detect-indent-4.0.0" + sources."detect-indent-5.0.0" sources."diff-2.2.3" sources."ini-1.3.4" - sources."inquirer-1.2.3" + sources."inquirer-3.0.5" sources."invariant-2.2.2" sources."is-builtin-module-1.0.0" sources."is-ci-1.0.10" - sources."leven-2.0.0" + sources."leven-2.1.0" sources."loud-rejection-1.6.0" sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."node-emoji-1.5.1" sources."node-gyp-3.5.0" - sources."object-path-0.11.3" + sources."object-path-0.11.4" sources."proper-lockfile-2.0.0" sources."read-1.0.7" - sources."repeating-2.0.1" sources."request-2.79.0" sources."request-capture-har-1.1.4" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."roadrunner-1.1.0" sources."semver-5.3.0" - sources."strip-bom-2.0.0" + sources."strip-bom-3.0.0" sources."tar-2.2.1" sources."tar-stream-1.5.2" sources."user-home-2.0.0" sources."validate-npm-package-license-3.0.1" sources."core-js-2.4.1" - sources."regenerator-runtime-0.10.1" + sources."regenerator-runtime-0.10.3" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -28423,47 +29093,29 @@ in sources."ms-0.7.2" sources."clone-1.0.2" sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" + sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" - sources."external-editor-1.1.1" - sources."figures-1.7.0" + sources."external-editor-2.0.1" + sources."figures-2.0.0" sources."lodash-4.17.4" - sources."mute-stream-0.0.6" - sources."pinkie-promise-2.0.1" + sources."mute-stream-0.0.7" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."string-width-1.0.2" + sources."string-width-2.0.0" sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - sources."extend-3.0.0" - sources."spawn-sync-1.0.15" - sources."tmp-0.0.29" - sources."concat-stream-1.6.0" - sources."os-shim-0.1.3" - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - sources."readable-stream-2.2.2" - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.0" + sources."signal-exit-3.0.2" + sources."mimic-fn-1.1.0" + sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" - sources."object-assign-4.1.1" - sources."pinkie-2.0.4" sources."is-promise-2.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" + sources."is-fullwidth-code-point-2.0.0" sources."loose-envify-1.3.1" sources."js-tokens-3.0.1" sources."builtin-modules-1.1.1" sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -28476,28 +29128,49 @@ in sources."npmlog-4.0.2" sources."osenv-0.1.4" sources."which-1.2.12" + sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + (sources."gauge-2.7.3" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" + sources."readable-stream-2.2.3" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" - sources."wide-align-1.1.0" + sources."object-assign-4.1.1" + (sources."wide-align-1.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."number-is-nan-1.0.1" sources."os-homedir-1.0.2" sources."isexe-1.1.2" sources."retry-0.10.1" - sources."is-finite-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" + sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" sources."har-validator-2.0.6" @@ -28508,14 +29181,271 @@ in sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.14" sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."qs-6.3.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."is-my-json-valid-2.15.0" + sources."is-my-json-valid-2.16.0" + sources."pinkie-promise-2.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.26.0" + sources."punycode-1.4.1" + sources."block-stream-0.0.9" + sources."bl-1.2.0" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "

\"Yarn\"

"; + homepage = "https://github.com/yarnpkg/yarn#readme"; + license = "BSD-2-Clause"; + }; + production = true; + }; + yo = nodeEnv.buildNodePackage { + name = "yo"; + packageName = "yo"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz"; + sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928"; + }; + dependencies = [ + sources."async-1.5.2" + sources."chalk-1.1.3" + sources."cli-list-0.1.8" + sources."configstore-1.4.0" + sources."cross-spawn-3.0.1" + sources."figures-1.7.0" + sources."fullname-2.1.0" + sources."got-5.7.1" + sources."humanize-string-1.0.1" + sources."inquirer-0.11.4" + (sources."insight-0.7.0" // { + dependencies = [ + sources."inquirer-0.10.1" + ]; + }) + sources."lodash-3.10.1" + (sources."meow-3.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."npm-keyword-4.2.0" + sources."opn-3.0.3" + (sources."package-json-2.4.0" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."parse-help-0.1.1" + sources."read-pkg-up-1.0.1" + sources."repeating-2.0.1" + sources."root-check-1.0.0" + sources."sort-on-1.3.0" + sources."string-length-1.0.1" + (sources."tabtab-1.3.2" // { + dependencies = [ + sources."inquirer-1.2.3" + sources."minimist-1.2.0" + sources."cli-width-2.1.0" + sources."lodash-4.17.4" + sources."mute-stream-0.0.6" + sources."run-async-2.3.0" + ]; + }) + sources."titleize-1.0.0" + (sources."update-notifier-0.6.3" // { + dependencies = [ + sources."configstore-2.1.0" + sources."dot-prop-3.0.0" + ]; + }) + sources."user-home-2.0.0" + (sources."yeoman-character-1.1.0" // { + dependencies = [ + sources."supports-color-3.2.3" + ]; + }) + (sources."yeoman-doctor-2.1.0" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + (sources."yeoman-environment-1.6.6" // { + dependencies = [ + sources."inquirer-1.2.3" + sources."lodash-4.17.4" + sources."cli-width-2.1.0" + sources."mute-stream-0.0.6" + sources."run-async-2.3.0" + ]; + }) + sources."yosay-1.2.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."graceful-fs-4.1.11" + sources."mkdirp-0.5.1" + sources."object-assign-4.1.1" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.4" + sources."uuid-2.0.3" + sources."write-file-atomic-1.3.1" + sources."xdg-basedir-2.0.0" + sources."minimist-0.0.8" + sources."os-homedir-1.0.2" + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + sources."lru-cache-4.0.2" + sources."which-1.2.12" + sources."pseudomap-1.0.2" + sources."yallist-2.0.0" + sources."isexe-1.1.2" + sources."npmconf-2.1.2" + sources."pify-2.3.0" + sources."pinkie-promise-2.0.1" + sources."config-chain-1.1.11" + sources."inherits-2.0.3" + sources."ini-1.3.4" + sources."nopt-3.0.6" + sources."once-1.3.3" + sources."semver-4.3.6" + sources."uid-number-0.0.5" + sources."proto-list-1.2.4" + sources."abbrev-1.1.0" + sources."wrappy-1.0.2" + sources."pinkie-2.0.4" + sources."create-error-class-3.0.2" + sources."duplexer2-0.1.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-1.0.0" + sources."parse-json-2.2.0" + sources."read-all-stream-3.1.0" + sources."readable-stream-2.2.3" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."prepend-http-1.0.4" + sources."decamelize-1.2.0" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."readline2-1.0.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."string-width-1.0.2" + sources."through-2.3.8" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.5" + sources."number-is-nan-1.0.1" + sources."lodash.debounce-3.1.1" + sources."os-name-1.0.3" + (sources."request-2.79.0" // { + dependencies = [ + sources."uuid-3.0.1" + ]; + }) + sources."tough-cookie-2.3.2" + sources."lodash._getnative-3.9.1" + (sources."osx-release-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."win-release-1.1.1" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.2" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.14" + sources."oauth-sign-0.8.2" + sources."qs-6.3.1" + sources."stringstream-0.0.5" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."commander-2.9.0" + sources."is-my-json-valid-2.16.0" + sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -28553,22 +29483,145 @@ in sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" - sources."is-utf8-0.2.1" - sources."block-stream-0.0.9" - sources."bl-1.2.0" - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."camelcase-keys-2.1.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."normalize-package-data-2.3.5" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.2" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.2.0" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."get-stdin-4.0.1" + sources."registry-url-3.1.0" + (sources."rc-1.1.7" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."deep-extend-0.4.1" + sources."strip-json-comments-2.0.1" + sources."registry-auth-token-3.1.0" + sources."execall-1.0.0" + sources."clone-regexp-1.0.0" + sources."is-regexp-1.0.0" + sources."is-supported-regexp-flag-1.0.0" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."strip-bom-2.0.0" + sources."is-utf8-0.2.1" + sources."is-finite-1.0.2" + sources."downgrade-root-1.2.2" + sources."sudo-block-1.2.0" + sources."default-uid-1.0.0" + sources."is-root-1.0.0" + sources."is-docker-1.1.0" + sources."arrify-1.0.1" + sources."dot-prop-2.4.0" + sources."is-obj-1.0.1" + sources."debug-2.6.1" + sources."npmlog-2.0.4" + sources."ms-0.7.2" + sources."external-editor-1.1.1" + sources."rx-4.1.0" + sources."spawn-sync-1.0.15" + sources."tmp-0.0.29" + sources."concat-stream-1.6.0" + sources."os-shim-0.1.3" + sources."typedarray-0.0.6" + sources."is-promise-2.1.0" + sources."ansi-0.3.1" + sources."are-we-there-yet-1.1.2" + sources."gauge-1.2.7" + sources."delegates-1.0.0" + sources."has-unicode-2.0.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."boxen-0.3.1" + sources."is-npm-1.0.0" + sources."latest-version-2.0.0" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."filled-array-1.1.0" + sources."widest-line-1.0.0" + sources."has-flag-1.0.0" + (sources."bin-version-check-2.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."each-async-1.1.1" + sources."log-symbols-1.0.2" + sources."object-values-1.0.0" + sources."twig-0.8.9" + sources."bin-version-1.0.4" + (sources."semver-truncate-1.1.2" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."find-versions-1.2.1" + sources."array-uniq-1.0.3" + sources."semver-regex-1.0.0" + sources."set-immediate-shim-1.0.1" + sources."walk-2.3.9" + sources."minimatch-3.0.3" + sources."foreachasync-3.0.0" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."diff-2.2.3" + sources."globby-4.1.0" + (sources."grouped-queue-0.3.3" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) + sources."mem-fs-1.1.3" + sources."text-table-0.2.0" + sources."untildify-2.1.0" + sources."array-union-1.0.2" + sources."glob-6.0.4" + sources."inflight-1.0.6" + sources."path-is-absolute-1.0.1" + sources."through2-2.0.3" + sources."vinyl-1.2.0" + sources."vinyl-file-2.0.0" + sources."clone-1.0.2" + sources."clone-stats-0.0.1" + sources."replace-ext-0.0.1" + sources."strip-bom-stream-2.0.0" + sources."first-chunk-stream-2.0.0" + sources."cli-boxes-1.0.0" + sources."pad-component-0.0.1" + (sources."taketalk-1.0.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."wrap-ansi-2.1.0" ]; buildInputs = globalBuildInputs; meta = { - description = "

\"Yarn\"

"; - homepage = "https://github.com/yarnpkg/yarn#readme"; + description = "CLI tool for running Yeoman generators"; + homepage = http://yeoman.io/; license = "BSD-2-Clause"; }; production = true; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 5f48cb9b02e..80e6383a6f4 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -66,4 +66,5 @@ , "webpack" , "wring" , "yarn" +, "yo" ] From b7d15edd9e9766612087a112e762b6abb0387b63 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 27 Feb 2017 20:21:13 +0100 Subject: [PATCH 019/274] bump version to 17.10 This will be the Hummingbird release --- .version | 2 +- nixos/modules/misc/version.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 6879fa566dd..6daccccf784 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -17.03 \ No newline at end of file +17.10 diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index bf20e801f61..315c33a462c 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -95,7 +95,7 @@ in nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId)); # Note: code names must only increase in alphabetical order. - nixosCodeName = "Gorilla"; + nixosCodeName = "Hummingbird"; }; # Generate /etc/os-release. See From 81de55118d2994a0097c8a93a965c11b6d339cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 27 Feb 2017 20:09:18 +0100 Subject: [PATCH 020/274] eclipse: add aliases for "latest" versions Add aliases like "eclipse-cpp = eclipse-cpp-46" so that user configurations can point to "eclipse-cpp" and have it not regularly break as nixpkgs is updated. --- pkgs/applications/editors/eclipse/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index cde3475196f..d9d731f3835 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -14,6 +14,8 @@ rec { ### Eclipse CPP + eclipse-cpp = eclipse-cpp-46; # always point to latest + eclipse-cpp-46 = buildEclipse { name = "eclipse-cpp-4.6.0"; description = "Eclipse IDE for C/C++ Developers, Neon release"; @@ -50,6 +52,8 @@ rec { ### Eclipse Modeling + eclipse-modeling = eclipse-modeling-46; # always point to latest + eclipse-modeling-46 = buildEclipse { name = "eclipse-modeling-4.6"; description = "Eclipse Modeling Tools"; @@ -85,7 +89,7 @@ rec { ### Eclipse Platform - eclipse-platform = eclipse-platform-46; + eclipse-platform = eclipse-platform-46; # always point to latest eclipse-platform-46 = buildEclipse { name = "eclipse-platform-4.6.2"; @@ -104,6 +108,8 @@ rec { ### Eclipse Scala SDK + eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest + eclipse-scala-sdk-441 = buildEclipse { name = "eclipse-scala-sdk-4.4.1"; description = "Eclipse IDE for Scala Developers"; @@ -122,6 +128,8 @@ rec { ### Eclipse SDK + eclipse-sdk = eclipse-sdk-46; # always point to latest + eclipse-sdk-46 = buildEclipse { name = "eclipse-sdk-4.6.2"; description = "Eclipse Neon 2 Classic"; From 172a2bbeaf7b0c6a905bdfbb24b5fd67a1e8cbad Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 20:21:33 +0100 Subject: [PATCH 021/274] haskell: ghc710x packages: remove obsolete configurations --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 6263d38a2bb..45199ab9420 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -187,9 +187,7 @@ self: super: { mono-traversable = addBuildDepend super.mono-traversable self.semigroups; attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); Glob = addBuildDepends super.Glob (with self; [semigroups]); - Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; - aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale"; bytes = addBuildDepend super.bytes self.doctest; case-insensitive = addBuildDepend super.case-insensitive self.semigroups; hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); @@ -197,13 +195,11 @@ self: super: { intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); - semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); texmath = addBuildDepend super.texmath self.network-uri; yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); # cereal must have `fail` in pre-ghc-8.0.x versions # also tests require bytestring>=0.10.8.1 cereal = dontCheck (addBuildDepend super.cereal self.fail); - cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail); # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; From 1aa6d77af4a10cf9f66f2bef0b1ad81a2a9c18b6 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 20:25:19 +0100 Subject: [PATCH 022/274] haskell: add semigroups dependency to Quickcheck for GHC < 8 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 45199ab9420..c07ce1e6fe8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -194,6 +194,7 @@ self: super: { hslogger = addBuildDepend super.hslogger self.HUnit; intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); + QuickCheck = addBuildDepend super.QuickCheck self.semigroups; semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); texmath = addBuildDepend super.texmath self.network-uri; yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); From 24c93619e96a24a26d6eefff5595e240a81cb2f1 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 20:26:27 +0100 Subject: [PATCH 023/274] haskell: break dependency cycle between QuickCheck and semigroups for GHC < 8 The cycle: QuickCheck -> semigroups semigroups -> hashable semigroups -> unordered-containers unordered-containers -> hashable unordered-containers -> QuickCheck # test suite only hashable -> QuickCheck # test suite only --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index c07ce1e6fe8..26b3daa25bf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -182,6 +182,10 @@ self: super: { # https://github.com/well-typed/hackage-security/issues/158 hackage-security = dontHaddock (dontCheck super.hackage-security); + # Breaks a dependency cycle between QuickCheck and semigroups + hashable = dontCheck super.hashable; + unordered-containers = dontCheck super.unordered-containers; + # GHC versions prior to 8.x require additional build inputs. distributive = addBuildDepend super.distributive self.semigroups; mono-traversable = addBuildDepend super.mono-traversable self.semigroups; From 386ddc739cd48dbaf57e806096de0ade1f24469f Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 20:30:57 +0100 Subject: [PATCH 024/274] haskell: add semigroups dependency to optparse-applicative for GHC < 8 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 26b3daa25bf..2c1888b5eef 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -198,6 +198,7 @@ self: super: { hslogger = addBuildDepend super.hslogger self.HUnit; intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); texmath = addBuildDepend super.texmath self.network-uri; From 755902b54318b2768971c6ae708c471a176a6b3a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 27 Feb 2017 20:36:13 +0100 Subject: [PATCH 025/274] release-notes: add 17.09 --- .../manual/release-notes/release-notes.xml | 1 + nixos/doc/manual/release-notes/rl-1709.xml | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 nixos/doc/manual/release-notes/rl-1709.xml diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 20d3f74f94b..6065a86f60d 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,6 +9,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml new file mode 100644 index 00000000000..11723f2c145 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -0,0 +1,48 @@ +
+ +Release 17.09 (“Hummingbird”, 2017/03/??) + +In addition to numerous new and upgraded packages, this release +has the following highlights: + + + + + + + + +The following new services were added since the last release: + + + + + + + + +When upgrading from a previous release, please be aware of the +following incompatible changes: + + + + + + + + + +Other notable improvements: + + + + + + + + +
From c710a2d477e8d1bb0f6431c275a3c7af65ace7de Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 27 Feb 2017 20:42:36 +0100 Subject: [PATCH 026/274] version: it's 17.09 not 17.10 --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 6daccccf784..2fdad9f4058 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -17.10 +17.09 From e292d166e8e892dd6ca200245ef114e1db1c9807 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 Feb 2017 15:28:43 -0500 Subject: [PATCH 027/274] fwupd: Fix localstatedir --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 +++- .../firmware/fwupd/localstatedir-check-perms.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 4c88e9c6807..5e109f9f46e 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -15,7 +15,8 @@ let version = "0.8.1"; in polkit gcab appstream-glib gusb sqlite libarchive libsoup docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind ]; - patchPhase = '' + patches = [ ./localstatedir-check-perms.patch ]; + postPatch = '' sed -i -e \ 's|/usr/bin/gpgme-config|${gpgme.dev}/bin/gpgme-config|' -e \ 's|/usr/bin/gpg-error-config|${libgpgerror.dev}/bin/gpg-error-config|' \ @@ -27,6 +28,7 @@ let version = "0.8.1"; in configureFlags = [ "--with-systemdunitdir=$(out)/lib/systemd/system" "--with-udevrulesdir=$(out)/lib/udev/rules.d" + "--localstatedir=/var" ]; enableParallelBuilding = true; meta = diff --git a/pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch b/pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch new file mode 100644 index 00000000000..0c1429d4f2e --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch @@ -0,0 +1,12 @@ +diff -Naur fwupd-0.8.1-orig/src/Makefile.in fwupd-0.8.1/src/Makefile.in +--- fwupd-0.8.1-orig/src/Makefile.in 2017-02-24 02:59:23.000000000 -0500 ++++ fwupd-0.8.1/src/Makefile.in 2017-02-27 15:06:56.218901891 -0500 +@@ -1639,7 +1639,7 @@ + $(srcdir)/fwupd.gresource.xml + + install-data-hook: +- if test -w $(DESTDIR)$(prefix)/; then \ ++ if test -w $$(dirname $(DESTDIR)$(localstatedir)/); then \ + mkdir -p $(DESTDIR)$(localstatedir)/lib/fwupd; \ + chmod 0755 $(DESTDIR)$(localstatedir)/lib/fwupd; \ + mkdir -p $(DESTDIR)$(localstatedir)/cache/app-info/xmls; \ From fa8afc05c0d1abb5ed81bccfa2b65fb06874e863 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 21 Feb 2017 19:01:03 -0500 Subject: [PATCH 028/274] pythonPackages.rootpy: 0.8.3 -> 0.9.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5862289a227..48a2a3e4c0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22807,12 +22807,12 @@ in { }; rootpy = buildPythonPackage rec { - version = "0.8.3"; + version = "0.9.0"; name = "rootpy-${version}"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/d5/40/feddb2c9d1cadfe05d1d9aea1a71be093dc700879c9f6af40a10b1330f34/rootpy-0.8.3.tar.gz"; - sha256 = "14q9bhs2a53598571x8yikj68x2iyl6090wbvdrpbwr238799b0z"; + url = "mirror://pypi/r/rootpy/${name}.tar.gz"; + sha256 = "04alx6afiyahhv816f6zpwnm0sx2jxgqpgqcn6kdw0wnpc9625cr"; }; disabled = isPy3k; From 7992ce65fc46e7153480ac4211c7f65ae3ba6b37 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 27 Feb 2017 19:08:34 +0100 Subject: [PATCH 029/274] gitlab-runner: 1.10.4 -> 1.11.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 7c8c71b2969..5e46b079aaa 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.10.4"; + version = "1.11.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0csaacghcdnkrpxiwsg8166nmdpnddf77c619i558vj0wdglq45k"; + sha256 = "082slksd0fs0gpwi7kzmk2i71y52xccsn2r2j6qxmbzxwhpwli83"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1lsdp4v92v406qiwr435ym4f3zbc1vq6ipwrp7li640frhr2jqpk"; + sha256 = "1c0awx4q27bckk4xpnw7357d5422iz971jkrfin17wrya4dshg64"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0r8f1m9f544ikcknvq1500kfjxbikgqlv7wdayfpazvj6s1zlswg"; + sha256 = "0fvkdiyfp1bf68j3kq721msfhmv8snf968yxgm7d1y6shidghrqb"; }; buildInputs = [ go-bindata ]; From 9e7ce9010c572fcaa41daf2ed821a01cf4f7335a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Feb 2017 22:36:27 +0100 Subject: [PATCH 030/274] lzbench: init at 20170208 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In-memory benchmark of several up-to-date compressors. Signed-off-by: Lluís Batlle i Rossell --- pkgs/tools/compression/lzbench/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/compression/lzbench/default.nix diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix new file mode 100644 index 00000000000..a38e0a67b28 --- /dev/null +++ b/pkgs/tools/compression/lzbench/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, glibc }: + +stdenv.mkDerivation rec { + name = "lzbench-20170208"; + + src = fetchFromGitHub { + owner = "inikep"; + repo = "lzbench"; + rev = "d5e9b58"; + sha256 = "16xj5fldwl639f0ys5rx54csbfvf35ja34bdl5m068hdn6dr47r5"; + }; + + enableParallelBuilding = true; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.static ]; + + installPhase = '' + mkdir -p $out/bin + cp lzbench $out/bin + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "In-memory benchmark of open-source LZ77/LZSS/LZMA compressors"; + license = licenses.free; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b477a9df832..caf54ebf9e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2769,6 +2769,8 @@ with pkgs; lz4 = callPackage ../tools/compression/lz4 { }; + lzbench = callPackage ../tools/compression/lzbench { }; + lzop = callPackage ../tools/compression/lzop { }; macchanger = callPackage ../os-specific/linux/macchanger { }; From 40b9506139d00ed0d3536518daeec6bf45084b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Feb 2017 22:37:39 +0100 Subject: [PATCH 031/274] megatools: 1.9.97 -> 1.9.98 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lluís Batlle i Rossell --- pkgs/tools/networking/megatools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index b06308acfc4..f948ab8eb61 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas -, makeWrapper }: +, asciidoc, makeWrapper }: stdenv.mkDerivation rec { name = "megatools-${version}"; - version = "1.9.97"; + version = "1.9.98"; src = fetchurl { url = "http://megatools.megous.com/builds/${name}.tar.gz"; - sha256 = "1wssf8f2ndh43sdzcfc644azqa7bjppl3b9s26mz1pjswmpca5ik"; + sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv"; }; buildInputs = [ pkgconfig glib fuse curl makeWrapper - gsettings_desktop_schemas ]; + gsettings_desktop_schemas asciidoc ]; postInstall = '' for i in $(find $out/bin/ -type f); do From 81b43ccd5773445a7e7e590b99b5b760a1401e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 27 Feb 2017 23:03:16 +0100 Subject: [PATCH 032/274] 17.09 release notes: fix typos --- nixos/doc/manual/release-notes/rl-1709.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 11723f2c145..b99ce396461 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -2,9 +2,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-17.10"> + xml:id="sec-release-17.09"> -Release 17.09 (“Hummingbird”, 2017/03/??) +Release 17.09 (“Hummingbird”, 2017/09/??) In addition to numerous new and upgraded packages, this release has the following highlights: From e3d58dae7f83998395259824ef83dedc33e9ab62 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 25 Jan 2017 23:21:33 +0100 Subject: [PATCH 033/274] phpfpm service: one service per pool for isolation --- .../services/web-servers/phpfpm/default.nix | 47 ++++++++++++------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 2471a06a3b0..f1161c9e19f 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -7,21 +7,21 @@ let stateDir = "/run/phpfpm"; + poolConfigs = cfg.poolConfigs // mapAttrs mkPool cfg.pools; + mkPool = n: p: '' - [${n}] listen = ${p.listen} ${p.extraConfig} ''; - cfgFile = pkgs.writeText "phpfpm.conf" '' + fpmCfgFile = pool: poolConfig: pkgs.writeText "phpfpm-${pool}.conf" '' [global] error_log = syslog daemonize = no ${cfg.extraConfig} - ${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)} - - ${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)} + [${pool}] + ${poolConfig} ''; phpIni = pkgs.runCommand "php.ini" { @@ -119,18 +119,29 @@ in { }; }; - config = mkIf (cfg.pools != {} || cfg.poolConfigs != {}) { - - systemd.services.phpfpm = { - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -p "${stateDir}" - ''; - serviceConfig = { - Type = "notify"; - ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; - ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; - }; - }; + config = { + systemd.services = flip mapAttrs' poolConfigs (pool: poolConfig: + nameValuePair "phpfpm-${pool}" { + description = "PHP FastCGI Process Manager for pool ${pool}"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p ${stateDir} + ''; + serviceConfig = let + cfgFile = fpmCfgFile pool poolConfig; + in { + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "full"; + ProtectHome = true; + NoNewPrivileges = true; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + Type = "notify"; + ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; + }; + } + ); }; } From ec4ead0bfee965be95e596d39d4b076e9fe01267 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 00:00:57 +0100 Subject: [PATCH 034/274] phpfpm service: add target and slice --- .../services/web-servers/phpfpm/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index f1161c9e19f..488bd3fe0ef 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.phpfpm; + enabled = cfg.poolConfigs != {} || cfg.pools != {}; stateDir = "/run/phpfpm"; @@ -119,18 +120,30 @@ in { }; }; - config = { + config = mkIf enabled { + + systemd.slices.phpfpm = { + description = "PHP FastCGI Process manager pools slice"; + }; + + systemd.targets.phpfpm = { + description = "PHP FastCGI Process manager pools target"; + wantedBy = [ "multi-user.target" ]; + }; + systemd.services = flip mapAttrs' poolConfigs (pool: poolConfig: nameValuePair "phpfpm-${pool}" { - description = "PHP FastCGI Process Manager for pool ${pool}"; + description = "PHP FastCGI Process Manager service for pool ${pool}"; after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "phpfpm.target" ]; + partOf = [ "phpfpm.target" ]; preStart = '' mkdir -p ${stateDir} ''; serviceConfig = let cfgFile = fpmCfgFile pool poolConfig; in { + Slice = "phpfpm.slice"; PrivateTmp = true; PrivateDevices = true; ProtectSystem = "full"; From 3f2566689d14f1d7778d55ca807d1dad2f4695d1 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 14 Feb 2017 23:18:44 +0100 Subject: [PATCH 035/274] modules: add support for module replacement with disabledModules This is based on a prototype Nicolas B. Pierron worked on during a discussion we had at FOSDEM. --- lib/modules.nix | 24 ++++-- lib/tests/modules.sh | 8 ++ lib/tests/modules/default.nix | 1 + lib/tests/modules/disable-declare-enable.nix | 5 ++ lib/tests/modules/disable-define-enable.nix | 5 ++ lib/tests/modules/disable-enable-modules.nix | 5 ++ .../manual/development/replace-modules.xml | 75 +++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + nixos/doc/manual/release-notes/rl-1703.xml | 10 +++ 9 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 lib/tests/modules/disable-declare-enable.nix create mode 100644 lib/tests/modules/disable-define-enable.nix create mode 100644 lib/tests/modules/disable-enable-modules.nix create mode 100644 nixos/doc/manual/development/replace-modules.xml diff --git a/lib/modules.nix b/lib/modules.nix index 4eee41306cd..de9cfc637ae 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -20,7 +20,8 @@ rec { , prefix ? [] , # This should only be used for special arguments that need to be evaluated # when resolving module structure (like in imports). For everything else, - # there's _module.args. + # there's _module.args. If specialArgs.modulesPath is defined it will be + # used as the base path for disabledModules. specialArgs ? {} , # This would be remove in the future, Prefer _module.args option instead. args ? {} @@ -58,10 +59,7 @@ rec { closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs); - # Note: the list of modules is reversed to maintain backward - # compatibility with the old module system. Not sure if this is - # the most sensible policy. - options = mergeModules prefix (reverseList closed); + options = mergeModules prefix (filterModules (specialArgs.modulesPath or "") closed); # Traverse options and extract the option values into the final # config set. At the same time, check whether all option @@ -87,6 +85,16 @@ rec { result = { inherit options config; }; in result; + + # Filter disabled modules. Modules can be disabled allowing + # their implementation to be replaced. + filterModules = modulesPath: modules: + let + moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m; + disabledKeys = map moduleKey (concatMap (m: m.disabledModules) modules); + in + filter (m: !(elem m.key disabledKeys)) modules; + /* Close a set of modules under the ‘imports’ relation. */ closeModules = modules: args: let @@ -111,12 +119,13 @@ rec { else {}; in if m ? config || m ? options then - let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file" "meta"]; in + let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in if badAttrs != {} then throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'." else { file = m._file or file; key = toString m.key or key; + disabledModules = m.disabledModules or []; imports = m.imports or []; options = m.options or {}; config = mkMerge [ (m.config or {}) metaSet ]; @@ -124,9 +133,10 @@ rec { else { file = m._file or file; key = toString m.key or key; + disabledModules = m.disabledModules or []; imports = m.require or [] ++ m.imports or []; options = {}; - config = mkMerge [ (removeAttrs m ["key" "_file" "require" "imports"]) metaSet ]; + config = mkMerge [ (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]) metaSet ]; }; applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 8b476a5d3dc..ba0c67fb7d4 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -99,6 +99,14 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-if-foo-enabl checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enable.nix checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix +# Check disabledModules with config definitions and option declarations. +set -- config.enable ./define-enable.nix ./declare-enable.nix +checkConfigOutput "true" "$@" +checkConfigOutput "false" "$@" ./disable-define-enable.nix +checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix +checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix +checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix + # Check _module.args. set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@" diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix index 5df7d9751ea..5be3af0ffe8 100644 --- a/lib/tests/modules/default.nix +++ b/lib/tests/modules/default.nix @@ -3,5 +3,6 @@ { inherit (lib.evalModules { inherit modules; + specialArgs.modulesPath = ./.; }) config options; } diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix new file mode 100644 index 00000000000..a373ee7e550 --- /dev/null +++ b/lib/tests/modules/disable-declare-enable.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + disabledModules = [ ./declare-enable.nix ]; +} diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix new file mode 100644 index 00000000000..0d84a7c3cb6 --- /dev/null +++ b/lib/tests/modules/disable-define-enable.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + disabledModules = [ ./define-enable.nix ]; +} diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix new file mode 100644 index 00000000000..c325f4e0743 --- /dev/null +++ b/lib/tests/modules/disable-enable-modules.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + disabledModules = [ "define-enable.nix" "declare-enable.nix" ]; +} diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml new file mode 100644 index 00000000000..cc0539ec510 --- /dev/null +++ b/nixos/doc/manual/development/replace-modules.xml @@ -0,0 +1,75 @@ +
+ +Replace Modules + +Modules that are imported can also be disabled. The option + declarations and config implementation of a disabled module will be + ignored, allowing another to take it's place. This can be used to + import a set of modules from another channel while keeping the rest + of the system on a stable release. +disabledModules is a top level attribute like + imports, options and + config. It contains a list of modules that will + be disabled. This can either be the full path to the module or a + string with the filename relative to the modules path + (eg. <nixpkgs/nixos/modules> for nixos). + + +This example will replace the existing postgresql module with + the version defined in the nixos-unstable channel while keeping the + rest of the modules and packages from the original nixos channel. + This only overrides the module definition, this won't use postgresql + from nixos-unstable unless explicitly configured to do so. + + +{ config, lib, pkgs, ... }: + +{ + disabledModules = [ "services/databases/postgresql.nix" ]; + + imports = + [ # Use postgresql service from nixos-unstable channel. + # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable + <nixos-unstable/nixos/modules/services/databases/postgresql.nix> + ]; + + services.postgresql.enable = true; +} + + +This example shows how to define a custom module as a + replacement for an existing module. Importing this module will + disable the original module without having to know it's + implementation details. + + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.man; +in + +{ + disabledModules = [ "services/programs/man.nix" ]; + + options = { + programs.man.enable = mkOption { + type = types.bool; + default = true; + description = "Whether to enable manual pages."; + }; + }; + + config = mkIf cfg.enabled { + warnings = [ "disabled manpages for production deployments." ]; + }; +} + + +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index ef6920160e6..5bdcad5ceb5 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -179,5 +179,6 @@ in { + diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 38693437059..e9d3a65e3ba 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -261,6 +261,16 @@ following incompatible changes: + + + Modules can now be disabled by using + disabledModules, allowing another to take it's place. This can be + used to import a set of modules from another channel while keeping the + rest of the system on a stable release. + + + From 37705ac1b1faa0e613d043da51ad00ea37b85966 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 22 Feb 2017 21:56:19 +0100 Subject: [PATCH 036/274] use relative path for module tests --- lib/tests/modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix index 5be3af0ffe8..5b094710419 100644 --- a/lib/tests/modules/default.nix +++ b/lib/tests/modules/default.nix @@ -1,4 +1,4 @@ -{ lib ? import , modules ? [] }: +{ lib ? import ../.., modules ? [] }: { inherit (lib.evalModules { From d348b80f318388045dc3306a35531b2a7b3b6c4c Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 27 Feb 2017 19:22:37 -0500 Subject: [PATCH 037/274] bazel: Log test errors to stderr during checkPhase Otherwise it's difficult or impossible to retrieve them, particularly from a hydra build. --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 195041f4b28..65c9480b114 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' export TEST_TMPDIR=$(pwd) - ./output/bazel test examples/cpp:hello-success_test - ./output/bazel test examples/java-native/src/test/java/com/example/myproject:hello + ./output/bazel test --test_output=errors examples/cpp:hello-success_test + ./output/bazel test --test_output=errors examples/java-native/src/test/java/com/example/myproject:hello ''; installPhase = '' From 9431e49822eca4829c3075d993d77e10df88bf57 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Feb 2017 18:57:26 +0000 Subject: [PATCH 038/274] ocamlPackages.ppx_tools: init at 5.0+4.05 --- pkgs/development/ocaml-modules/ppx_tools/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index ddc3dec898d..5672300ddab 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: let param = { - "4.02.3" = { + "4.02" = { version = "5.0+4.02.0"; sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; }; - "4.03.0" = { + "4.03" = { version = "5.0+4.03.0"; sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; }; - "4.04.0" = { + "4.04" = { version = "unstable-20161114"; rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac"; sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; }; -}."${ocaml.version}"; + "4.05" = { + version = "5.0+4.05.0"; + sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4"; }; +}."${ocaml.meta.branch}"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ppx_tools-${param.version}"; From 52507b3a9b2f9055594886250994a73871061ca0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Feb 2017 19:11:29 +0000 Subject: [PATCH 039/274] ocamlPackages.ocp-build: 1.99.17-beta -> 1.99.18-beta --- pkgs/development/tools/ocaml/ocp-build/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 503616511e5..931e6989aa1 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }: let - version = "1.99.17-beta"; + version = "1.99.18-beta"; in buildOcaml { @@ -11,7 +11,7 @@ buildOcaml { owner = "OCamlPro"; repo = "ocp-build"; rev = version; - sha256 = "0k1gi5v9as5l8h5illgl5prsd5z1i14y5j2k920ay1a3rv697b02"; + sha256 = "14vzam8p1d2c5qxljrhsfppd8a3j9lxx8kzxlplwclkr2laar0ss"; }; buildInputs = [ ocaml ]; From 22404a068fa3ce2ed28b81a38d082a412eb0a91a Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sun, 26 Feb 2017 02:59:20 -0600 Subject: [PATCH 040/274] musescore: add darwin-specific package This is basically a clone of the Homebrew cask version: https://github.com/caskroom/homebrew-cask/blob/master/Casks/musescore.rb --- pkgs/applications/audio/musescore/darwin.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/musescore/darwin.nix diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix new file mode 100644 index 00000000000..160e84e10a1 --- /dev/null +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, undmg }: + +let + major = "2"; + minor = "0.3"; + patch = "1"; + appName = "MuseScore ${major}"; +in + +stdenv.mkDerivation rec { + name = "musescore-darwin-${version}"; + version = "${major}.${minor}.${patch}"; + + src = fetchurl { + url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${major}.${minor}/MuseScore-${version}.dmg"; + sha256 = "0a9v2nc7sx2az7xpd9i7b84m7xk9zcydfpis5fj334r5yqds4rm1"; + }; + + buildInputs = [ undmg ]; + installPhase = '' + mkdir -p "$out/Applications/${appName}.app" + cp -R . "$out/Applications/${appName}.app" + chmod a+x "$out/Applications/${appName}.app/Contents/MacOS/mscore" + ''; + + meta = with stdenv.lib; { + description = "Music notation and composition software"; + homepage = https://musescore.org/; + license = licenses.gpl2; + platforms = platforms.darwin; + maintainers = with maintainers; [ yurrriq ]; + repositories.git = https://github.com/musescore/MuseScore; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e70ebe4cc7f..f3dc69586dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14542,7 +14542,11 @@ with pkgs; else null; }; - musescore = libsForQt55.callPackage ../applications/audio/musescore { }; + musescore = + if stdenv.isDarwin then + callPackage ../applications/audio/musescore/darwin.nix { } + else + libsForQt55.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { From 0d31a76813532a5a1a1d83b0f92c283206783f00 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Tue, 28 Feb 2017 05:35:52 +0200 Subject: [PATCH 041/274] virtualbox: fix build The issue was caused by upgrading `qt` from `qt56` to `qt57`, which now requires C++11. For more info, see https://github.com/NixOS/nixpkgs/issues/23257. --- pkgs/applications/virtualization/virtualbox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 7512ddb6b0f..14121660fa8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -66,6 +66,7 @@ in stdenv.mkDerivation { set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ + -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ ${optionalString (!headless) '' -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \ ''} -i configure From 86b840d8c97ae00497be0c1d9acbc038960b5d81 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 28 Feb 2017 09:32:30 +0100 Subject: [PATCH 042/274] perl-Data-FormValidator: 4.81 -> 4.85 --- pkgs/top-level/perl-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b58e8d20a7..3689f49c631 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2862,14 +2862,13 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; }; - DataFormValidator = buildPerlModule rec { - name = "Data-FormValidator-4.81"; + DataFormValidator = buildPerlPackage rec { + name = "Data-FormValidator-4.85"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; - sha256 = "f844056231b2eeb4068cafbcab1ddf5d46cb348bd5cfb1d234421c09ee8a0de3"; + url = "mirror://cpan/authors/id/D/DF/DFARRELL/${name}.tar.gz"; + sha256 = "809f15d05434ff5667c3967e71e86308fcfad8fce1057420bd2714300b2a5870"; }; - buildInputs = [ CGI ModuleBuild ]; - propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes Perl6Junction RegexpCommon ]; + propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ]; meta = { description = "Validates user input (usually from an HTML form) based on input profile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 8788bfe762ab30952b67e09be2c001a9c022e1e3 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 28 Feb 2017 09:27:29 +0000 Subject: [PATCH 043/274] haskell-packages: use benchmark over bench --- .../haskell-modules/generic-builder.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a22d2c67dfd..42ea03693ec 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -9,11 +9,11 @@ , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } , buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? [] , buildTarget ? "" -, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchToolDepends ? [] +, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , description ? "" , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) -, doBench ? false +, withBenchmarkDepends ? false , doHoogle ? true , editedCabalFile ? null , enableLibraryProfiling ? false @@ -37,9 +37,9 @@ # TODO Do we care about haddock when cross-compiling? , doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") , passthru ? {} -, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchPkgconfigDepends ? [] +, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] -, benchDepends ? [], benchHaskellDepends ? [], benchSystemDepends ? [] +, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [] , testTarget ? "" , broken ? false , preCompileBuildDriver ? "", postCompileBuildDriver ? "" @@ -141,14 +141,14 @@ let isSystemPkg = x: !isHaskellPkg x; allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ - optionals doCheck testPkgconfigDepends ++ optionals doBench benchPkgconfigDepends; + optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ - optionals doBench (benchDepends ++ benchHaskellDepends ++ benchSystemDepends ++ benchToolDepends); + optionals withBenchmarkDepends (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; @@ -344,7 +344,7 @@ stdenv.mkDerivation ({ // optionalAttrs (preBuild != "") { inherit preBuild; } // optionalAttrs (postBuild != "") { inherit postBuild; } // optionalAttrs (doCheck) { inherit doCheck; } -// optionalAttrs (doBench) { inherit doBench; } +// optionalAttrs (withBenchmarkDepends) { inherit withBenchmarkDepends; } // optionalAttrs (checkPhase != "") { inherit checkPhase; } // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } From 23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 28 Feb 2017 17:57:41 +0800 Subject: [PATCH 044/274] s3fs: minor cleanups --- pkgs/tools/filesystems/s3fs/default.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 051d2732100..fa975790d4a 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,15 +1,22 @@ -{stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }: -stdenv.mkDerivation { - name = "s3fs-fuse-1.80"; +stdenv.mkDerivation rec { + name = "s3fs-fuse-${version}"; + version = "1.80"; - src = fetchurl { - url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.80.tar.gz; - sha256 = "0ddx5khlyyrxm4s8is4gqbczmrcivj11hmkk9s893r3kpp4q30yy"; + src = fetchFromGitHub { + owner = "s3fs-fuse"; + repo = "s3fs-fuse"; + rev = "v${version}"; + sha256 = "0yikqpdyjibbb36rj4118lv9nxgp9f5jhydzxijzxrzw29ypvw76"; }; - preConfigure = "./autogen.sh"; - buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ]; + buildInputs = [ curl openssl libxml2 fuse ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ + "--with-openssl" + ]; postInstall = '' ln -s $out/bin/s3fs $out/bin/mount.s3fs From b5c619cbfec8b319f3a412a39241a9302f58ae82 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Feb 2017 23:36:26 +0100 Subject: [PATCH 045/274] cudatoolkit: 8.0.44 -> 8.0.61 --- pkgs/development/compilers/cudatoolkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 927a1bcdf0b..f2176ed2607 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -110,9 +110,9 @@ in { }; cudatoolkit8 = common { - version = "8.0.44"; - url = https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run; - sha256 = "1w5xmjf40kkis42dqs8dva4xjq7wr5y6vi1m0xlhs6i6cyw4mp34"; + version = "8.0.61"; + url = https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run; + sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; }; } From c2d4b14637547efc602d4f135517c236ae596cfc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 28 Feb 2017 00:11:22 +0100 Subject: [PATCH 046/274] cudatoolkit: Multiple output improvements * Add a "lib" output containing (for the moment) only libOpenCL. This reduces the closure size of opensubdiv and blender by about 2 GiB. * Add a "doc" output (about ~200 MiB). * Remove the "sdk" output since it was worse than useless: all of the "sdk" output was also included in "out", so it actually increased disk space usage. * Run patchelf on ELF binaries only. --- .../compilers/cudatoolkit/default.nix | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index f2176ed2607..da29d918b05 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -22,7 +22,7 @@ let } else throw "cudatoolkit does not support platform ${stdenv.system}"; - outputs = [ "out" "sdk" ]; + outputs = [ "out" "lib" "doc" ]; buildInputs = [ perl ]; @@ -43,24 +43,35 @@ let ''; buildPhase = '' - find . -type f -executable -exec patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - '{}' \; || true - find . -type f -exec patchelf \ - --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - --force-rpath \ - '{}' \; || true + chmod -R u+w . + while IFS= read -r -d ''$'\0' i; do + if ! isELF "$i"; then continue; fi + echo "patching $i..." + if [[ ! $i =~ \.so ]]; then + patchelf \ + --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i + fi + if [[ $i =~ libOpenCL ]]; then + rpath2= + else + rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 + fi + patchelf --set-rpath $rpath2 --force-rpath $i + done < <(find . -type f -print0) ''; installPhase = '' - mkdir $out $sdk + mkdir $out perl ./install-linux.pl --prefix="$out" - rm $out/tools/CUDA_Occupancy_Calculator.xls - perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + + rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? # let's remove the 32-bit libraries, they confuse the lib64->lib mover rm -rf $out/lib + # Remove some cruft. + rm $out/bin/uninstall* + # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them) if [ -d "$out"/cuda-samples ]; then mv "$out"/cuda-samples "$out"/samples @@ -73,6 +84,11 @@ let mkdir -p $out/nix-support echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook + # Move some libraries to the lib output so that programs that + # depend on them don't pull in this entire monstrosity. + mkdir -p $lib/lib + mv -v $out/lib64/libOpenCL* $lib/lib/ + '' + lib.optionalString (lib.versionOlder version "8.0") '' # Hack to fix building against recent Glibc/GCC. echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook From bcdbd637fc76d5dab28820900d2ff85b21c95f7e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Feb 2017 12:05:24 +0100 Subject: [PATCH 047/274] tinycc: 0.9.27pre-20170108 -> 20170220 tinycc has been relicensed to MIT. --- pkgs/development/compilers/tinycc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index d9f33bcc6b2..a8b1ac02673 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170108"; + date = "20170220"; version = "0.9.27pre-${date}"; - rev = "5420bb8a67f5f782ac49c90afb7da178a60c448a"; - sha256 = "0gf1ys4vv5qfkh6462fkdv44mz5chhrchlvgcl0m44f8mm8cjwa3"; + rev = "e209b7dac463e228525499153103ec28173ca365"; + sha256 = "1p8h999aqgy5rlkk47vc86c5lx8280761712nwkcgvydvixd0gd6"; in stdenv.mkDerivation rec { @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.tinycc.org/; - license = licenses.lgpl2Plus; + license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.joachifm ]; From ea0796129485751a9d6d7700b74a9c249786d4fc Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 28 Feb 2017 05:52:25 -0600 Subject: [PATCH 048/274] gitflow: tweak for darwin On Darwin, wrap the git-flow binary and set: FLAGS_GETOPT_CMD=${getopt}/bin/getopt Without this change, I was getting the following error: flags:ERROR short flag required for (showcommands) on this platform --- .../git-and-tools/gitflow/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 3d411a18324..a6ac1958385 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ pkgs, stdenv, fetchFromGitHub }: + +with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; @@ -12,10 +14,17 @@ stdenv.mkDerivation rec { sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg"; }; + buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ]; + preBuild = '' makeFlagsArray+=(prefix="$out") ''; + postInstall = optional (stdenv.isDarwin) '' + wrapProgram $out/bin/git-flow \ + --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt + ''; + meta = with stdenv.lib; { homepage = https://github.com/petervanderdoes/gitflow; description = "Extend git with the Gitflow branching model"; From 3c16812acf590de365d880b4f4b05424957e9d30 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 28 Feb 2017 12:46:07 +0100 Subject: [PATCH 049/274] micropolis: fix build (patch changed) --- pkgs/games/micropolis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix index 57103bb9101..5c91911acaf 100644 --- a/pkgs/games/micropolis/default.nix +++ b/pkgs/games/micropolis/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { url = http://rmdir.de/~michael/micropolis_git.patch; - sha256 = "0sjl61av7lab3a5vif1jpyicmdb2igvqq6nwaw0s3agg6dh69v1d"; + sha256 = "10j0svcs576ip7v5mn99gvqx9ki8jfd5w5yvsxj57xh56dd0by2p"; }) ]; From b31a63d2e50ab96ad5f063568a292e2b44a162d6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 05:59:45 -0600 Subject: [PATCH 050/274] pinentry_qt5: build with C++11 for Qt 5.7 --- pkgs/tools/security/pinentry/qt5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix index 18648633a09..375187a5146 100644 --- a/pkgs/tools/security/pinentry/qt5.nix +++ b/pkgs/tools/security/pinentry/qt5.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { (mkEnable true "pinentry-qt") ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + nativeBuildInputs = [ pkgconfig ]; meta = { From 2cfa9c6af2c5f3719f4dc64e30cda750a47d86c8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 28 Feb 2017 12:38:43 +0100 Subject: [PATCH 051/274] ranger: 1.8.0 -> 1.8.1 --- pkgs/applications/misc/ranger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 9b7aeddc2ff..1371646be27 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, w3m, file, less }: pythonPackages.buildPythonApplication rec { - name = "ranger-1.8.0"; + name = "ranger-1.8.1"; meta = { description = "File manager with minimalistic curses interface"; @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { src = fetchurl { url = "http://ranger.nongnu.org/${name}.tar.gz"; - sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf"; + sha256 = "1d11qw0mr9aj22a7nhr6p2c3yzf359xbffmjsjblq44bjpwzjcql"; }; checkInputs = with pythonPackages; [ pytest ]; From a0b0dd2a3255a69b0208fd8453db99754534d080 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 06:01:12 -0600 Subject: [PATCH 052/274] modemmanager-qt: mark broken on Qt 5.5 --- .../development/libraries/kde-frameworks/modemmanager-qt.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index b4d05678dc2..ea2e112ff67 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -5,7 +5,10 @@ kdeFramework { name = "modemmanager-qt"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ modemmanager ]; From e7b2300a0c88edd981e44c7a1c4257970702b365 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 06:01:52 -0600 Subject: [PATCH 053/274] threadweaver: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/threadweaver.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index bf36a21e9ec..4df3ff510cb 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -4,7 +4,10 @@ kdeFramework { name = "threadweaver"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From 0cb62ab661e19831a427a27446519749160cc76c Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 28 Feb 2017 12:02:41 +0100 Subject: [PATCH 054/274] matrix-synapse: 0.19.1 -> 0.19.2 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 587ec52c421..863f7afd159 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,13 +24,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "1jjfa3vigghnk201zkhp97mh25cx17gic0cjn0fgn7yxs83wrh5c"; + sha256 = "03gnz7rb7yncykqy0irl1y5lhk1cs0b4snpas8s1c9r0vsw1bmhr"; }; patches = [ ./matrix-synapse.patch ]; From 6d9a3f0dcd191e9dfda169b12d9549bfea79385a Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 28 Feb 2017 13:11:21 +0100 Subject: [PATCH 055/274] screen: 4.5.0 -> 4.5.1 for CVE-2017-5618 See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00010.html for release announcement --- pkgs/tools/misc/screen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 27e0270952e..7af602106ff 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "screen-${version}"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "1c7grw03a9iwvqbxfd6hmjb681rp8gb55zsxm7b3apqqcb1sghq1"; + sha256 = "0bbv16gpxrh64sn4bvjy3qjy7jsxjlqlilyysin02fwnvla23nwp"; }; configureFlags= [ From ac9c40643c863abc7081a15182ed14eb5accfc24 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Tue, 28 Feb 2017 14:05:44 +0800 Subject: [PATCH 056/274] emem: 0.2.28 -> 0.2.29 --- pkgs/applications/misc/emem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 00da9bfa5c1..77549ce4df4 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.28"; + version = "0.2.29"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "1hapvvkkwnvg32awx4nj84s2ascpci6x02wf4rckyd1ykbxp2b8m"; + sha256 = "1282m4qwdn6phg5x71l470vs1kld8lfhv5k8yvhp9i7frm29b6w7"; }; buildInputs = [ ]; From 4f981cb3f4a0e7c850e40cffc29b597abb1d2fb5 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 15 Feb 2017 21:15:45 +0100 Subject: [PATCH 057/274] gnome-22: drop bijiben due to dependency on webkitgtk24x --- pkgs/desktops/gnome-3/3.22/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 21e1ecc7a04..c6b2f1a76f5 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -31,7 +31,7 @@ let gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-log gnome-system-monitor - gnome_terminal gnome-user-docs bijiben evolution file-roller gedit + gnome_terminal gnome-user-docs evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool From 3adee0aac90dfce9bef8397b499feebfdd35e25d Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 28 Feb 2017 14:17:44 +0100 Subject: [PATCH 058/274] octave: 4.2.0 -> 4.2.1 See glists.gnu.org/archive/html/info-gnu/2017-02/msg00011.html for release announcements. --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 904ad97648e..1c8644b1889 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.gz"; - sha256 = "0rsmg5i3b5yfvkvrl9mqvn3f2n1a6vqg45phpja1qlzkh8vsffs4"; + sha256 = "0frk0nk3aaic8hj3g45h11rnz3arp7pjsq0frbx50sspk1iqzhl0"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull From 3acf24e67ec030f2687af9d91fb24141a6bbb541 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:35:52 -0600 Subject: [PATCH 059/274] networkmanager-qt: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/networkmanager-qt.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 9d765eac95c..80085bb2072 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -5,7 +5,10 @@ kdeFramework { name = "networkmanager-qt"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ networkmanager ]; From e5283531c4b1a0baacf2178b408c774d8ea48536 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:36:54 -0600 Subject: [PATCH 060/274] kdnssd: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kdnssd.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index ad86b660c74..18a435139f6 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -5,7 +5,10 @@ kdeFramework { name = "kdnssd"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ avahi ]; buildInputs = [ qtbase ]; From 5f372535cda5d6fe1820b32aa9854184c5e3760d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:37:22 -0600 Subject: [PATCH 061/274] kidletime: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kidletime.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 758260517e7..bfec344ca11 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -6,7 +6,10 @@ kdeFramework { name = "kidletime"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qtx11extras ]; } From fca36b617d2d62336735a6a9692f88513eaff826 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:38:57 -0600 Subject: [PATCH 062/274] ipe: build with C++11 for Qt 5.7 --- pkgs/applications/graphics/ipe/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c1c1861cd3d..4a99d0ea4a1 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sed -i -e 's/install -s/install/' common.mak || die ''; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; # build with Qt 5.7 + IPEPREFIX="$$out"; URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; LUA_PACKAGE = "lua"; From 256c4003e4803eafb7bfe692eca59091b9be2f8b Mon Sep 17 00:00:00 2001 From: Robbin C Date: Tue, 28 Feb 2017 21:39:34 +0800 Subject: [PATCH 063/274] haskellPackages.tinc: 20161119 -> 20170228 --- pkgs/development/tools/haskell/tinc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index c35002c3311..9c4b1f63148 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -7,12 +7,12 @@ }: mkDerivation { pname = "tinc"; - version = "20161119"; + version = "20170228"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "8e31ed920ad1660b3bc458b4f6b281bacaf4bd14"; - sha256 = "0y9pvr20p9z4dddbfxgy9hl3ny7pxixxjg8ij7g8l14br6mcak30"; + rev = "e829926a043a68a8a4dc551485c4d666837474af"; + sha256 = "1zdp1mqp3jn2faw0d3jlcbrkp4azgl5ahhq5pxdn24gyq70zkchc"; }; isLibrary = false; isExecutable = true; From e77114e72bc90e0d86ddd5b38bd0d723f9aba4aa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:40:01 -0600 Subject: [PATCH 064/274] kitemmodels: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kitemmodels.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index d6538e57698..e2f0633da8c 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kitemmodels"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From 29d0bf7434ba3faa49ef97b6959485a096704a5c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:40:40 -0600 Subject: [PATCH 065/274] kplotting: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kplotting.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 3fa8283d06c..e132a45976f 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kplotting"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From 34df5c5684f87284ccf4ba16ad558d0721da515d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:41:16 -0600 Subject: [PATCH 066/274] bluez-qt: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/bluez-qt.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 93c945b58ca..261d9471a77 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,11 +1,14 @@ { kdeFramework, lib , extra-cmake-modules -, qtdeclarative +, qtbase, qtdeclarative }: kdeFramework { name = "bluez-qt"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtdeclarative ]; preConfigure = '' From 616e5c1953727c4f91c947b44bbbed3694fa0e3c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 14:40:04 +0100 Subject: [PATCH 067/274] linuxPackages.sch_cake: only supported in linux >= 4.4 cc #23253 --- pkgs/os-specific/linux/sch_cake/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index f459e5bf0b8..390d6ee4703 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -1,5 +1,7 @@ { stdenv, lib, fetchFromGitHub, kernel }: +assert stdenv.lib.versionAtLeast kernel.version "4.4"; + stdenv.mkDerivation { name = "sch_cake-2017-01-28"; From d733d36cc647c2b3b47cf6d1b0dc63370361178c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 14:43:33 +0100 Subject: [PATCH 068/274] linuxPackages.jool: only supported on linux < 4.10 cc #23253 --- pkgs/os-specific/linux/jool/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 79094ebb3e3..260bf412062 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchzip, kernel }: +assert stdenv.lib.versionOlder kernel.version "4.10"; + let sourceAttrs = (import ./source.nix) { inherit fetchzip; }; in From 78b6a1ad141df4b92b9a9aa226ccfc573b7ce6fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:41:58 -0600 Subject: [PATCH 069/274] kwayland: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/kwayland.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index b5255022a86..d34687def3e 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,15 +1,16 @@ -{ kdeFramework -, extra-cmake-modules -, qtbase, wayland +{ + kdeFramework, lib, + extra-cmake-modules, + qtbase, wayland }: kdeFramework { name = "kwayland"; - nativeBuildInputs = [ - extra-cmake-modules - ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; - propagatedBuildInputs = [ - wayland - ]; + propagatedBuildInputs = [ wayland ]; } From e1bd5c96ea501aa837aa0e8b21a3eac3c13f9655 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:42:31 -0600 Subject: [PATCH 070/274] syntax-highlighting: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/syntax-highlighting.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 155e9fb8961..f199321e674 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -4,7 +4,10 @@ kdeFramework { name = "syntax-highlighting"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules perl qttools ]; buildInputs = [ qtbase ]; } From 6ddaa3f7461c914dcccb66749a909083ed87f251 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:43:04 -0600 Subject: [PATCH 071/274] solid: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/solid.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index 330b64035a1..d32acf598eb 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,12 +1,15 @@ { kdeFramework, lib, bison, extra-cmake-modules, flex, - qtdeclarative, qttools + qtbase, qtdeclarative, qttools }: kdeFramework { name = "solid"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ bison extra-cmake-modules flex qttools ]; propagatedBuildInputs = [ qtdeclarative ]; } From be580f91d8a3395d0baa8c2603cad572894e57ba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:43:32 -0600 Subject: [PATCH 072/274] kcodecs: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kcodecs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 482c30b7b57..fa1679519cc 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -2,7 +2,10 @@ kdeFramework { name = "kcodecs"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From ffa8be8a0a66e7a721d1b1b9b2bd7b94e34f2512 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:44:16 -0600 Subject: [PATCH 073/274] kguiaddons: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/kguiaddons.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 6ebfd1104f7..f93aa0967f6 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,11 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras +{ + kdeFramework, lib, + extra-cmake-modules, + qtbase, qtx11extras, }: kdeFramework { name = "kguiaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtx11extras ]; } From c1630b533770dd7c499aecb742239f13ad34699a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:44:43 -0600 Subject: [PATCH 074/274] kdbusaddons: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kdbusaddons.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index bc5aeff556d..2bbbf65f898 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,8 +1,11 @@ -{ kdeFramework, lib, extra-cmake-modules, qttools, qtx11extras }: +{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }: kdeFramework { name = "kdbusaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtx11extras ]; } From 420884558334bf3b0826d3178b8c3b9ae94ffad8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:45:09 -0600 Subject: [PATCH 075/274] kitemviews: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kitemviews.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index f114c007038..df420f8f4b9 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kitemviews"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From eb340b5753b2d3820f52f6a2e23b96bbec6f1685 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:46:08 -0600 Subject: [PATCH 076/274] ki18n: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/ki18n.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 2698a97fd33..68f29c8314f 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,15 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, gettext -, python -, qtdeclarative -, qtscript +{ + kdeFramework, lib, + extra-cmake-modules, gettext, python, + qtbase, qtdeclarative, qtscript, }: kdeFramework { name = "ki18n"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtdeclarative qtscript ]; propagatedNativeBuildInputs = [ gettext python ]; + propagatedBuildInputs = [ qtdeclarative qtscript ]; } From 49f554aae005f825eda28890e78120ffbab78fe7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:46:35 -0600 Subject: [PATCH 077/274] kcoreaddons: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index f5d04a30b1a..4d35c0bbdea 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -2,7 +2,10 @@ kdeFramework { name = "kcoreaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ shared_mime_info ]; From b682464f4e0eba3111f2b5fe0ea14a3d4923ce5d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:47:07 -0600 Subject: [PATCH 078/274] kwidgetsaddons: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index c5c0063c463..ce16e280faa 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kwidgetsaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From 9cd0754191fb91024b91e19fabefc02004437fd8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:47:29 -0600 Subject: [PATCH 079/274] karchive: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/karchive.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index ca3321bef84..71561b1109c 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -2,7 +2,10 @@ kdeFramework { name = "karchive"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From a8cc6d909b4e571fe8a5ea2e036ee9d86e8165d4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:47:53 -0600 Subject: [PATCH 080/274] kconfig: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kconfig.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 981256e75bf..f6d38cd2336 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -2,7 +2,10 @@ kdeFramework { name = "kconfig"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From a821be7a0646adbb5c14dc94b0ace74992cad8f6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:48:14 -0600 Subject: [PATCH 081/274] sonnet: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/sonnet.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 190f2bae1b8..ae3e72e2a46 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -5,7 +5,10 @@ kdeFramework { name = "sonnet"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ hunspell qtbase ]; } From a7d3a084b901bf8128da7e8b196c581827aef26b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:48:43 -0600 Subject: [PATCH 082/274] attica: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/attica.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 6533a05b160..6c120c20d3a 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -2,7 +2,10 @@ kdeFramework { name = "attica"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From cff0e06ed70be6115a98551234e80f2516f20aa1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:49:25 -0600 Subject: [PATCH 083/274] kwindowsystem: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/kwindowsystem.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix index e55c4021b9e..4bfd813ff93 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix @@ -1,11 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qttools, qtx11extras +{ + kdeFramework, lib, + extra-cmake-modules, + qtbase, qttools, qtx11extras }: kdeFramework { name = "kwindowsystem"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtx11extras ]; } From 6784a4429620e6a7581e09abb5da010bff23678a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 15:12:45 +0100 Subject: [PATCH 084/274] clearsilver: fix build fixes CVE-2011-4357 cc @grahamc, @fpletz, @domenkozar, @rbvermaa --- .../libraries/clearsilver/builder.sh | 9 ------- .../libraries/clearsilver/default.nix | 25 ++++++++++++++++--- 2 files changed, 21 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/libraries/clearsilver/builder.sh diff --git a/pkgs/development/libraries/clearsilver/builder.sh b/pkgs/development/libraries/clearsilver/builder.sh deleted file mode 100644 index 2acff02e135..00000000000 --- a/pkgs/development/libraries/clearsilver/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -mkdir -p $out/site-packages - -export PYTHON_SITE=$out/site-packages -configureFlags="--with-python=$python/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp" - -genericBuild diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 34a26e9da86..cd1789a13bb 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, fetchpatch, python }: stdenv.mkDerivation rec { name = "clearsilver-0.10.5"; @@ -8,12 +8,29 @@ stdenv.mkDerivation rec { sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; }; - builder = ./builder.sh; + PYTHON_SITE = "$(out)/site-packages"; - inherit stdenv python; + configureFlags = "--with-python=${python}/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp"; - meta = { + preInstall = '' + mkdir -p $out + mkdir -p $out/site-packages + ''; + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch"; + sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff"; + sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi"; + }) + ]; + + meta = with stdenv.lib; { description = "Fast, powerful, and language-neutral HTML template system"; homepage = http://www.clearsilver.net/; + license = licenses.free; }; } From c4eee0c4f14f8a539515b9e78f1d3eba7addc310 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 28 Feb 2017 15:15:54 +0100 Subject: [PATCH 085/274] retroarch.beetle-saturn: set platforms to x86_64-linux cc #23253. Signed-off-by: Christoph Hrdinka --- pkgs/misc/emulators/retroarch/cores.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 8d02fbfc9bd..b7b720af508 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -99,6 +99,7 @@ in }).override { buildPhase = "make"; name = "beetle-saturn"; + meta.platforms = [ "x86_64-linux" ]; }; bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec { From 044a49febf11ff08fa4bbdee49e110d13ac423cd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 28 Feb 2017 17:15:22 +0300 Subject: [PATCH 086/274] cudatoolkit: remove OpenCL library libOpenCL is provided by ocl-icd with implementation in NVIDIA driver instead. --- .../compilers/cudatoolkit/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index da29d918b05..17965e20d24 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -22,7 +22,7 @@ let } else throw "cudatoolkit does not support platform ${stdenv.system}"; - outputs = [ "out" "lib" "doc" ]; + outputs = [ "out" "doc" ]; buildInputs = [ perl ]; @@ -51,11 +51,7 @@ let patchelf \ --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i fi - if [[ $i =~ libOpenCL ]]; then - rpath2= - else - rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 - fi + rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 patchelf --set-rpath $rpath2 --force-rpath $i done < <(find . -type f -print0) ''; @@ -84,18 +80,19 @@ let mkdir -p $out/nix-support echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook - # Move some libraries to the lib output so that programs that - # depend on them don't pull in this entire monstrosity. - mkdir -p $lib/lib - mv -v $out/lib64/libOpenCL* $lib/lib/ + # Remove OpenCL libraries as they are provided by ocl-icd and driver. + rm -f $out/lib64/libOpenCL* '' + lib.optionalString (lib.versionOlder version "8.0") '' # Hack to fix building against recent Glibc/GCC. echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; - meta = { - license = lib.licenses.unfree; + meta = with stdenv.lib; { + description = "A compiler for NVIDIA GPUs, math libraries, and tools"; + homepage = "https://developer.nvidia.com/cuda-toolkit"; + platforms = platforms.linux; + license = licenses.unfree; }; }; From d7ecf89580f4b50842f64bdfd86220accbbc0616 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 28 Feb 2017 17:16:01 +0300 Subject: [PATCH 087/274] opensubdiv: 3.0.5 -> 3.2.0 Also remove cudatoolkit override as we have cudatoolkit = cudatoolkit8 now. --- .../libraries/opensubdiv/default.nix | 25 ++++++++----------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index b253a27a7db..e91fd0e60ff 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,31 +1,26 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu, mesa_noglu, glew +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu +, mesa_noglu, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: -stdenv.mkDerivation { - name = "opensubdiv-3.0.5"; +stdenv.mkDerivation rec { + name = "opensubdiv-${version}"; + version = "3.2.0"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; - rev = "v3_0_5"; - sha256 = "16xv4cw1k75wgd4ddr0sa87wd46ygbn2k2avh9c1mfd405p80d92"; + rev = "v${lib.replaceChars ["."] ["_"] version}"; + sha256 = "0wk12n1s8za3sz8d6bmfm3rfjyx20j48gy1xp57dvbnjvlvzqy3w"; }; outputs = [ "out" "dev" ]; - patches = - [ # Fix for building with cudatoolkit 7. - (fetchurl { - url = "https://github.com/opeca64/OpenSubdiv/commit/c3c258d00feaeffe1123f6077179c155e71febfb.patch"; - sha256 = "0vazhp35v8vsgnvprkzwvfkbalr0kzcwlin9ygyfb77cz7mwicnf"; - }) - ]; - buildInputs = - [ cmake pkgconfig mesa_glu mesa_noglu + [ cmake pkgconfig mesa_glu mesa_noglu ocl-icd python3 # FIXME: these are not actually needed, but the configure script wants them. - glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama + glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor + xorg.libXinerama xorg.libXi ] ++ lib.optional cudaSupport cudatoolkit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e70ebe4cc7f..90037d30269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9140,7 +9140,7 @@ with pkgs; }; opensubdiv = callPackage ../development/libraries/opensubdiv { - cudatoolkit = cudatoolkit8; + cmake = cmake_2_8; }; openwsman = callPackage ../development/libraries/openwsman {}; @@ -12794,7 +12794,6 @@ with pkgs; bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - cudatoolkit = cudatoolkit8; python = python35; }; From 6f3e0717555bff03321a1751b5eed4eb4d3d4465 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 28 Feb 2017 17:20:27 +0300 Subject: [PATCH 088/274] rPackages: try to unbreak reverse dependencies of cudatoolkit --- pkgs/development/r-modules/default.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ad153a1c382..adc842cf50b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -345,7 +345,7 @@ let seqminer = [ pkgs.zlib.dev pkgs.bzip2 ]; showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ]; simplexreg = [ pkgs.gsl_1 ]; - SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h + SOD = [ pkgs.opencl-headers ]; spate = [ pkgs.fftw.dev ]; sprint = [ pkgs.openmpi ]; ssanv = [ pkgs.proj ]; @@ -380,6 +380,7 @@ let affyio = [ pkgs.zlib.dev ]; VariantAnnotation = [ pkgs.zlib.dev ]; snpStats = [ pkgs.zlib.dev ]; + gputools = [ pkgs.pcre.dev pkgs.lzma.dev pkgs.zlib.dev pkgs.bzip2.dev pkgs.icu.dev ]; }; packagesWithBuildInputs = { @@ -392,7 +393,7 @@ let RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; - gmatrix = [ pkgs.cudatoolkit ]; + gmatrix = [ pkgs.cudatoolkit pkgs.which ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; @@ -692,6 +693,7 @@ let packagesToSkipCheck = [ "Rmpi" # tries to run MPI processes "gmatrix" # requires CUDA runtime + "gputools" # requires CUDA runtime "sprint" # tries to run MPI processes "pbdMPI" # tries to run MPI processes ]; @@ -741,6 +743,7 @@ let "RefNet" # depends on broken package interactiveDisplayBase "pwOmics" # depends on broken package interactiveDisplayBase "grasp2db" # depends on broken package interactiveDisplayBase + "gputools" # broken build "EnsDb_Rnorvegicus_v79" # depends on broken package interactiveDisplayBase "EnsDb_Rnorvegicus_v75" # depends on broken package interactiveDisplayBase "EnsDb_Mmusculus_v79" # depends on broken package interactiveDisplayBase @@ -1089,13 +1092,11 @@ let "GEWIST" # depends on broken package nlopt "ggtree" # broken build "gimme" # depends on broken package nlopt - "gmatrix" # depends on broken package cudatoolkit "gMCP" # build is broken "gmum_r" # broken build "GPC" # broken build "gplm" # depends on broken package nlopt "gpuR" # depends on GPU-specific header files - "gputools" # depends on broken package cudatoolkit "granova" # depends on broken package nlopt "graphicalVAR" # depends on broken package nlopt "GraphPAC" # broken build @@ -1435,7 +1436,6 @@ let "smacof" # broken build "SNAGEE" # build is broken "snm" # depends on broken package nlopt - "SOD" # depends on broken package cudatoolkit "sodium" # broken build "soilphysics" # depends on broken package rpanel "sortinghat" # broken build @@ -1595,18 +1595,6 @@ let PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); - gputools = old.gputools.overrideDerivation (attrs: { - patches = [ ./patches/gputools.patch ]; - CUDA_HOME = "${pkgs.cudatoolkit}"; - }); - - gmatrix = old.gmatrix.overrideDerivation (attrs: { - patches = [ ./patches/gmatrix.patch ]; - CUDA_LIB_PATH = "${pkgs.cudatoolkit}/lib64"; - R_INC_PATH = "${pkgs.R}/lib/R/include"; - CUDA_INC_PATH = "${pkgs.cudatoolkit}/include"; - }); - EMCluster = old.EMCluster.overrideDerivation (attrs: { patches = [ ./patches/EMCluster.patch ]; }); From 477b507a4f1dbcc9700c686126c992450b6db6b1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 28 Feb 2017 17:31:05 +0300 Subject: [PATCH 089/274] rPackages: remove old cuda-related patches gputools doesn't build but because of unrelated linking issues. --- .../r-modules/patches/gmatrix.patch | 48 ------------------- .../r-modules/patches/gputools.patch | 13 ----- 2 files changed, 61 deletions(-) delete mode 100644 pkgs/development/r-modules/patches/gmatrix.patch delete mode 100644 pkgs/development/r-modules/patches/gputools.patch diff --git a/pkgs/development/r-modules/patches/gmatrix.patch b/pkgs/development/r-modules/patches/gmatrix.patch deleted file mode 100644 index 990debb8a42..00000000000 --- a/pkgs/development/r-modules/patches/gmatrix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ru -x '*~' gmatrix_orig/src/Makefile gmatrix/src/Makefile ---- gmatrix_orig/src/Makefile 2014-08-27 02:42:04.000000000 +0900 -+++ gmatrix/src/Makefile 2014-10-25 15:35:29.797202981 +0900 -@@ -21,6 +21,7 @@ - # to the manual on the gmatrix install instructions) - CUDA_LIB_PATH ?= /usr/local/cuda/lib64 - R_INC_PATH ?= /usr/include/R -+CUDA_INC_PATH ?= /usr/local/cuda/include - - - # Nvidia CUDA Compiler -@@ -49,25 +50,25 @@ - # Build rules - build: $(OUT_OBJ) - $(R_CC) $(OUT_OBJ) -o $(OUT_SO) $(LIBS) -L$(CUDA_LIB_PATH) -- -+ - conversions.o: -- $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - manipulation.o: -- $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH) -+ $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} - - general.o: -- $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) -+ $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} - - matrix.o: -- $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - ops.o: -- $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - dist.o: -- $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - - clean: - -rm -f *.o core diff --git a/pkgs/development/r-modules/patches/gputools.patch b/pkgs/development/r-modules/patches/gputools.patch deleted file mode 100644 index 1eb0c8c33ca..00000000000 --- a/pkgs/development/r-modules/patches/gputools.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' gputools_orig/src/Makefile gputools/src/Makefile ---- gputools_orig/src/Makefile 2013-05-09 01:43:32.000000000 +0900 -+++ gputools/src/Makefile 2014-10-21 21:41:23.067148490 +0900 -@@ -6,6 +6,9 @@ - - R_HOME := $(shell R RHOME) - -+CUDA_INC := $(CUDA_HOME)/include -+CUDA_LIB := $(CUDA_HOME)/lib -+ - #compiler/preprocessor options - INCS := -I. -I"$(CUDA_INC)" -I"$(R_INC)" - PARAMS := $(DEVICEOPTS) -Xcompiler $(CPICFLAGS) From af7ccaf8c872fa1325a9aad537fcdafa638ec897 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 28 Feb 2017 15:46:57 +0100 Subject: [PATCH 090/274] exfat-nofuse: build only for kernels < 4.10 --- pkgs/os-specific/linux/exfat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index dcdafbcc8f9..394092b8da9 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchFromGitHub, kernel }: +# Upstream build for kernel > 4.10 is currently broken +# Reference: https://github.com/dorimanx/exfat-nofuse/issues/103 +assert stdenv.lib.versionOlder kernel.version "4.10"; + stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; version = "2017-01-03"; From 768fac6c36c50dc2247767d05af9f5c17220da65 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 15:50:10 +0100 Subject: [PATCH 091/274] btanks: fix build --- pkgs/games/btanks/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 46f5b3d0183..93f341298a8 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib, smpeg, SDL_image, libvorbis, lua5, zip }: +{ stdenv, fetchurl, fetchpatch, scons, pkgconfig, SDL, mesa, zlib, smpeg +, SDL_image, libvorbis, expat, zip, lua5_1 }: stdenv.mkDerivation rec { name = "battle-tanks-0.9.8083"; @@ -8,8 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; }; - buildInputs = [ scons pkgconfig SDL mesa zlib smpeg SDL_image libvorbis lua5 - zip ]; + nativeBuildInputs = [ scons pkgconfig ]; + buildInputs = [ SDL mesa zlib smpeg SDL_image libvorbis expat zip lua5_1 ]; + + NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; + + patches = [ (fetchpatch { + name = "gcc-4.7.patch"; + url = "https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/btanks/debian/patches/gcc-4.7.patch?revision=13641&view=co&pathrev=15758"; + sha256 = "1dxlk1xh69gj10sqcsyckiakb8an3h41206wby4z44mpmvxc7pi4"; + }) ]; buildPhase = '' scons prefix=$out From e748e18dde43b8560ab0f593287b5848d24c691f Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Tue, 28 Feb 2017 15:53:50 +0100 Subject: [PATCH 092/274] mhddfs: fix-format-security (#23276) * mhddfs: fix-format-security * mhddfs: use fputs instead of fprintf --- pkgs/tools/filesystems/mhddfs/default.nix | 4 ++++ .../mhddfs/fix-format-security-error.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index bfd25247b86..54a8f845915 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ fuse pkgconfig attr uthash ]; + patches = [ + ./fix-format-security-error.patch + ]; + installPhase = '' mkdir -p $out/bin cp mhddfs $out/bin/ diff --git a/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch b/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch new file mode 100644 index 00000000000..35e58cf0ce9 --- /dev/null +++ b/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch @@ -0,0 +1,12 @@ +--- mhddfs-0.1.39/src/usage.c.old 2017-02-28 15:00:25.435438622 +0100 ++++ mhddfs-0.1.39/src/usage.c 2017-02-28 15:00:33.847454958 +0100 +@@ -43,7 +43,7 @@ + "\n" + " see fusermount(1) for information about other options\n" + ""; +- fprintf(to, usage); ++ fputs(usage, to); + if (to==stdout) exit(0); + exit(-1); + } + From 163db1bbf9d24a23cae5ca828ad8c2a14b85449e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 15:10:26 +0100 Subject: [PATCH 093/274] linuxPackages.e1000e: 3.3.1 -> 3.3.5.3 cc #23253 --- pkgs/os-specific/linux/e1000e/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index 5406c37522e..ea17c287a29 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, kernel }: -stdenv.mkDerivation { - name = "e1000e-3.3.1-${kernel.version}"; +assert stdenv.lib.versionOlder kernel.version "4.10"; + +stdenv.mkDerivation rec { + name = "e1000e-${version}-${kernel.version}"; + version = "3.3.5.3"; src = fetchurl { - url = "mirror://sourceforge/e1000/e1000e-3.3.1.tar.gz"; - sha256 = "07hg6xxqgqshnys1qs9wbl9qr7d4ixdkd1y1fj27cg6bn8s2n797"; + url = "mirror://sourceforge/e1000/e1000e-${version}.tar.gz"; + sha256 = "1ajz3vdnf1y307k585w95r6jlh4ah8d74bq36gdkjl1z5hgiqi9q"; }; hardeningDisable = [ "pic" ]; From 40e84506ec18f8469e14fe92cb392236e4ac3775 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 15:16:03 +0100 Subject: [PATCH 094/274] linuxPackages.ixgbevf: 3.2.2 -> 4.0.3 cc #23253 --- pkgs/os-specific/linux/ixgbevf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 1f8ced6c2d2..1dbc5c74415 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, kernel, kmod }: +assert stdenv.lib.versionOlder kernel.version "4.10"; + stdenv.mkDerivation rec { name = "ixgbevf-${version}-${kernel.version}"; - version = "3.2.2"; + version = "4.0.3"; src = fetchurl { url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz"; - sha256 = "1i6ry3vd77190sxb47xhbz3v30gighwax6prav4ggs3q80a389c8"; + sha256 = "0f95p2d7yhf57qa6fl8nv1rb4x8vwwgh7qhqcqpag0hz19dc3xff"; }; hardeningDisable = [ "pic" ]; From e0b04b4c37cbdad66491f5ac018166a6d1e100e2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 15:59:14 +0100 Subject: [PATCH 095/274] bzflag: 2.4.2 -> 2.4.8 --- pkgs/games/bzflag/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 7015bf55761..d3792843d47 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,19 +1,24 @@ -{ fetchurl, stdenv, curl, SDL, mesa, glew, ncurses }: +{ stdenv, lib, fetchurl, pkgconfig +, curl, SDL2, mesa, glew, ncurses, c-ares }: stdenv.mkDerivation rec { - name = "bzflag-2.4.2"; + name = "${pname}-${version}"; + pname = "bzflag"; + version = "2.4.8"; src = fetchurl { - url = mirror://sourceforge/bzflag/bzflag-2.4.2.tar.bz2; - sha256 = "04f8c83hfwwh4i74gxqqdbgc2r5hn9ayam986py3jjychhicaysg"; + url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; + sha256 = "08iiw0i0vx68d73hliiylswsm0nvnm849k37xc7iii6sflblvjj3"; }; - buildInputs = [ curl SDL mesa glew ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ curl SDL2 mesa glew ncurses c-ares ]; - meta = { + meta = with lib; { description = "Multiplayer 3D Tank game"; homepage = http://bzflag.org/; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; }; } From be84f410cd2ac6cc39875f14af5387180f52149b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 16:04:44 +0100 Subject: [PATCH 096/274] libcm: remove umaintained, broken and not used for 10 years --- pkgs/development/libraries/libcm/default.nix | 15 --------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/libcm/default.nix diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix deleted file mode 100644 index 1d4e96d55b6..00000000000 --- a/pkgs/development/libraries/libcm/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, xorg, mesa}: - -stdenv.mkDerivation { - name = "libcm-0.1.1"; - src = fetchurl { - url = mirror://gnome/sources/libcm/0.1/libcm-0.1.1.tar.bz2; - sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; - }; - buildInputs = [ - pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite - xorg.libXtst xorg.inputproto - # !!! inputproto should really be propagated by libXtst - ]; - propagatedBuildInputs = [mesa]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90037d30269..97919a70177 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8022,8 +8022,6 @@ with pkgs; libclxclient = callPackage ../development/libraries/libclxclient { }; - libcm = callPackage ../development/libraries/libcm { }; - libconfuse = callPackage ../development/libraries/libconfuse { }; inherit (gnome3) libcroco; From 3fc79cb5ac5bce2589f893042212454ab1b09317 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 28 Feb 2017 14:09:33 +0100 Subject: [PATCH 097/274] ardour: 5.6 -> 5.8 --- pkgs/applications/audio/ardour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 90ab110bf19..57864f863e3 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -16,7 +16,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "5.6"; + tag = "5.8"; in @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; - rev = "08353095dfee421f299d30d5d91259bc2df7e19d"; - sha256 = "1fgvjmvdyh61qn8azpmh19ac58ps5sl2dywwshr56v0svakhwwh9"; + rev = "e5c6f16126e0901654b09ecce990554b1ff73833"; + sha256 = "1lcvslrcw6g4kp9w0h1jx46x6ilz4nzz0k2yrw4gd545k1rwx0c1"; }; buildInputs = From b59fd85dd6ed185b0bc347cbd42dc69301cbf784 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 23:56:26 +0100 Subject: [PATCH 098/274] haskell: ghc710x packages: fix gtk2hs-buildtools --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 2c1888b5eef..ee0fcccd633 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -42,6 +42,8 @@ self: super: { # Build jailbreak-cabal with the latest version of Cabal. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; + gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; }; + Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; From 1a4ec414a4eb9e0ac5ef219705068ccf4341ddef Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 23:56:55 +0100 Subject: [PATCH 099/274] haskell: ghc710x packages: fix megaparsec --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ee0fcccd633..6a7fe29b80f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -44,6 +44,8 @@ self: super: { gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; }; + megaparsec = addBuildDepend super.megaparsec self.fail; + Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; From b4ff1ba4a9f959e23d3181c5a7f7fda5b6a4ec09 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 28 Feb 2017 16:28:23 +0100 Subject: [PATCH 100/274] exfat-nofuse: exclude 4.1 kernel build --- pkgs/os-specific/linux/exfat/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 394092b8da9..fa2939e947e 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel }: # Upstream build for kernel > 4.10 is currently broken # Reference: https://github.com/dorimanx/exfat-nofuse/issues/103 -assert stdenv.lib.versionOlder kernel.version "4.10"; +assert lib.versionOlder kernel.version "4.10"; + +# Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working +assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; @@ -28,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "exfat kernel module"; homepage = https://github.com/dorimanx/exfat-nofuse; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ makefu ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ makefu ]; + platforms = lib.platforms.linux; }; } From 479c6c1ef0c79be40722a0b7dee6c6370b1f209c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Feb 2017 16:12:05 +0100 Subject: [PATCH 101/274] sysdig: 0.14.0 -> 0.15.0 --- pkgs/os-specific/linux/sysdig/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 343e4e80955..8aef1655a01 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -2,14 +2,14 @@ let inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; - version = "0.14.0"; + version = "0.15.0"; in stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "14wy4p1q8rk3q4s8vczfhkk20z3kz8wvyxpi8qx0xc7px7z5da76"; + sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2"; }; buildInputs = [ @@ -18,13 +18,6 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - patches = [ - ]; - - postPatch = '' - sed '1i#include ' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp - ''; - cmakeFlags = [ "-DUSE_BUNDLED_DEPS=OFF" "-DSYSDIG_VERSION=${version}" From 4c04d4e6e29c975d5bae61f5ac8b8d7664a346c1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 16:33:17 +0100 Subject: [PATCH 102/274] libclc: 2015-08-07 -> 2017-02-25 --- pkgs/development/libraries/libclc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 289fa20335a..9c1acf13243 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, python2, llvm, clang }: +{ stdenv, fetchFromGitHub, python2, llvm_40, clang }: stdenv.mkDerivation { - name = "libclc-2015-08-07"; + name = "libclc-2017-02-25"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "f97d9db40718f2e68b3f0b44200760d8e0d50532"; - sha256 = "10n9qk1dild9yjkjjkzpmp9zid3ysdgvqrad554azcf755frch7g"; + rev = "17648cd846390e294feafef21c32c7106eac1e24"; + sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s"; }; - buildInputs = [ python2 llvm clang ]; + buildInputs = [ python2 llvm_40 clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py From efd93313337e4ed687a938d18bc298b96e762e16 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 17:11:32 +0100 Subject: [PATCH 103/274] libjson-rpc-cpp: 0.6.0 -> 0.7.0, fix build --- .../libraries/libjson-rpc-cpp/default.nix | 36 ++++++++----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index ca60f1570bc..6487e9267be 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,26 +1,21 @@ -{ stdenv -, fetchgit -, cmake -, jsoncpp -, argtable -, curl -, libmicrohttpd -, doxygen -, catch +{ stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd +, doxygen, catch, pkgconfig, git, gcc6 }: + stdenv.mkDerivation rec { name = "libjson-rpc-cpp-${version}"; - version = "0.6.0"; + version = "0.7.0"; - src = fetchgit { - url = https://github.com/cinemast/libjson-rpc-cpp.git; - sha256 = "00fxxisg89zgg1wq047n8r8ws48jx35x3s6bbym4kg7dkxv9vv9f"; - rev = "c6e3d7195060774bf95afc6df9c9588922076d3e"; + src = fetchFromGitHub { + owner = "cinemast"; + repo = "libjson-rpc-cpp"; + sha256 = "07bg4nyvx0yyhy8c4x9i22kwqpx5jlv36dvpabgbb46ayyndhr7a"; + rev = "v${version}"; }; - hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-I${catch}/include/catch"; - patchPhase = '' + postPatch = '' for f in cmake/FindArgtable.cmake \ src/stubgenerator/stubgenerator.cpp \ src/stubgenerator/stubgeneratorfactory.cpp @@ -38,13 +33,13 @@ stdenv.mkDerivation rec { cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \ -DCMAKE_BUILD_TYPE=Release ''; - + installPhase = '' mkdir -p $out function fixRunPath { p=$(patchelf --print-rpath $1) - q="$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc jsoncpp argtable libmicrohttpd curl ]}:$out/lib" + q="$p:${stdenv.lib.makeLibraryPath [ gcc6 jsoncpp argtable libmicrohttpd curl ]}:$out/lib" patchelf --set-rpath $q $1 } @@ -54,12 +49,11 @@ stdenv.mkDerivation rec { for f in Install/lib/*.so* $(find Install/bin -executable -type f); do fixRunPath $f done - + cp -r Install/* $out ''; - dontStrip = true; - + nativeBuildInputs = [ pkgconfig gcc6 ]; buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 318415b7512..f790bbf29ed 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -75,6 +75,7 @@ doNotDisplayTwice rec { libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 + libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libtidy = html-tidy; # added 2014-12-21 links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97919a70177..10c06d2e173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8427,7 +8427,7 @@ with pkgs; libjreen = callPackage ../development/libraries/libjreen { }; - libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; + libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; libjson_rpc_cpp_0_2_1 = callPackage ../development/libraries/libjson-rpc-cpp/0.2.1 { }; From 8ddfbe34bcfc9ab5abe36a53117af9be69423732 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 17:14:28 +0100 Subject: [PATCH 104/274] libjson_rpc_cpp_0_2_1: remove --- .../libjson-rpc-cpp/0.2.1/default.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix diff --git a/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix deleted file mode 100644 index 5e0a8560110..00000000000 --- a/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, cmake, curl }: - -let - basename = "libjson-rpc-cpp"; - version = "0.2.1"; -in - -stdenv.mkDerivation { - name = "${basename}-${version}"; - - src = fetchurl { - url = "https://github.com/cinemast/${basename}/archive/${version}.tar.gz"; - sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw"; - }; - - buildInputs = [ cmake curl ]; - - NIX_LDFLAGS = "-lpthread"; - enableParallelBuilding = true; - doCheck = true; - - checkPhase = "LD_LIBRARY_PATH=out/ ctest"; - - meta = { - description = "C++ framework for json-rpc (json remote procedure call)"; - homepage = https://github.com/cinemast/libjson-rpc-cpp; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10c06d2e173..3fd9ecb32b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8429,8 +8429,6 @@ with pkgs; libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; - libjson_rpc_cpp_0_2_1 = callPackage ../development/libraries/libjson-rpc-cpp/0.2.1 { }; - libkate = callPackage ../development/libraries/libkate { }; libksba = callPackage ../development/libraries/libksba { }; From 75707b748ce20c80eb78c4235f96c0bd83ca829a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 17:33:31 +0100 Subject: [PATCH 105/274] lincity: fix build --- pkgs/games/lincity/default.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index dba488016b9..1c433965c78 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -1,20 +1,33 @@ -{ stdenv, fetchurl, libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib }: +{ stdenv, fetchurl, fetchpatch, libX11, libXext, xextproto, libICE, libSM, xproto, libpng12, zlib }: stdenv.mkDerivation rec { name = "lincity-${version}"; - version = "1.12.1"; + version = "1.13.1"; src = fetchurl { url = "mirror://sourceforge/lincity/${name}.tar.gz"; - sha256 = "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj"; + sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v"; }; buildInputs = [ - libICE libpng libSM libX11 libXext + libICE libpng12 libSM libX11 libXext xextproto zlib xproto ]; - meta = { + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/extern-inline-functions-777982"; + sha256 = "06dp3zwk0z5wr5a3xaaj2my75vcjcy98vc22hsag7ggd9jwrkcp0"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/clang-ftbfs-757859"; + sha256 = "098rnywcsyc0m11x4a5m3dza8i0jmfh6pacfgma1vvxpsfkb6ngp"; + }) + ]; + + meta = with stdenv.lib; { description = "City simulation game"; + license = licenses.gpl2Plus; + homepage = "https://sourceforge.net/projects/lincity"; }; } From 17835f14c52acc0ec80e02eb8379ea81b1c58397 Mon Sep 17 00:00:00 2001 From: Itai Zukerman Date: Mon, 27 Feb 2017 23:33:48 -0800 Subject: [PATCH 106/274] bazel: replace patch with patchShebangs and substituteInPlace --- .../build-managers/bazel/bin_to_env.patch | 207 ------------------ .../tools/build-managers/bazel/default.nix | 35 ++- 2 files changed, 28 insertions(+), 214 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bazel/bin_to_env.patch diff --git a/pkgs/development/tools/build-managers/bazel/bin_to_env.patch b/pkgs/development/tools/build-managers/bazel/bin_to_env.patch deleted file mode 100644 index b65bb681f23..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bin_to_env.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff -ur a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java ---- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java 2017-02-19 15:37:06.021759347 -0800 -@@ -242,7 +242,7 @@ - private static Artifact buildCommandLineArtifact(RuleContext ruleContext, String command, - String scriptPostFix) { - String scriptFileName = ruleContext.getTarget().getName() + scriptPostFix; -- String scriptFileContents = "#!/bin/bash\n" + command; -+ String scriptFileContents = "#!/usr/bin/env bash\n" + command; - Artifact scriptFileArtifact = FileWriteAction.createFile( - ruleContext, scriptFileName, scriptFileContents, /*executable=*/true); - return scriptFileArtifact; -diff -ur a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2017-02-19 15:37:06.022759356 -0800 -@@ -73,7 +73,7 @@ - return new PathFragment("/usr/local/bin/bash"); - } - } -- return new PathFragment("/bin/bash"); -+ return new PathFragment("bash"); - } - - @Override -diff -ur a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt 2017-02-19 15:37:06.022759356 -0800 -@@ -1,4 +1,4 @@ --#!/bin/bash --posix -+#!/usr/bin/env bash - # Copyright 2014 The Bazel Authors. All rights reserved. - # - # Licensed under the Apache License, Version 2.0 (the "License"); -diff -ur a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java ---- a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java 2017-02-19 15:37:06.022759356 -0800 -@@ -70,7 +70,7 @@ - } - - try { -- new Command(new String[] {"/bin/true", null}).execute(); -+ new Command(new String[] {"/usr/bin/env", "true", null}).execute(); - fail("Should have thrown NullPointerException"); - } catch (NullPointerException npe) { - // good -@@ -185,7 +185,7 @@ - - @Test - public void testNoStreamingInputForCat() throws Exception { -- final Command command = new Command(new String[]{"/bin/cat"}); -+ final Command command = new Command(new String[]{"/usr/bin/env", "cat"}); - ByteArrayInputStream emptyInput = new ByteArrayInputStream(new byte[0]); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ByteArrayOutputStream err = new ByteArrayOutputStream(); -@@ -198,7 +198,7 @@ - - @Test - public void testNoInputForCat() throws Exception { -- final Command command = new Command(new String[]{"/bin/cat"}); -+ final Command command = new Command(new String[]{"/usr/bin/env", "cat"}); - CommandResult result = command.execute(); - assertTrue(result.getTerminationStatus().success()); - assertThat(new String(result.getStdout(), "UTF-8")).isEmpty(); -@@ -208,7 +208,7 @@ - @Test - public void testProvidedOutputStreamCapturesHelloWorld() throws Exception { - String helloWorld = "Hello, world."; -- final Command command = new Command(new String[]{"/bin/echo", helloWorld}); -+ final Command command = new Command(new String[]{"/usr/bin/env", "echo", helloWorld}); - ByteArrayOutputStream stdOut = new ByteArrayOutputStream(); - ByteArrayOutputStream stdErr = new ByteArrayOutputStream(); - command.execute(Command.NO_INPUT, Command.NO_OBSERVER, stdOut, stdErr); -@@ -250,7 +250,7 @@ - public void testAsynchronousWithOutputStreams() throws Exception { - - final String helloWorld = "Hello, world."; -- final Command command = new Command(new String[]{"/bin/echo", helloWorld}); -+ final Command command = new Command(new String[]{"/usr/bin/env", "echo", helloWorld}); - final ByteArrayInputStream emptyInput = - new ByteArrayInputStream(new byte[0]); - final ByteArrayOutputStream stdOut = new ByteArrayOutputStream(); -@@ -363,12 +363,12 @@ - for (int exit : new int[] { -1, -2, -3 }) { - int expected = 256 + exit; - try { -- String args[] = { "/bin/bash", "-c", "exit " + exit }; -+ String args[] = { "/usr/bin/env", "bash", "-c", "exit " + exit }; - new Command(args).execute(); - fail("Should have exited with status " + expected); - } catch (BadExitStatusException e) { - assertThat(e).hasMessage("Process exited with status " + expected); -- checkCommandElements(e, "/bin/bash", "-c", "exit " + exit); -+ checkCommandElements(e, "/usr/bin/env", "bash", "-c", "exit " + exit); - TerminationStatus status = e.getResult().getTerminationStatus(); - assertFalse(status.success()); - assertTrue(status.exited()); -@@ -471,7 +471,7 @@ - public void testFlushing() throws Exception { - final Command command = new Command( - // On darwin, /bin/sh does not support -n for the echo builtin. -- new String[] {"/bin/bash", "-c", "echo -n Foo; sleep 0.1; echo Bar"}); -+ new String[] {"/usr/bin/env", "bash", "-c", "echo -n Foo; sleep 0.1; echo Bar"}); - // We run this command, passing in a special output stream - // that records when each flush() occurs. - // We test that a flush occurs after writing "Foo" -@@ -541,13 +541,13 @@ - throw new IOException(); - } - }; -- Command command = new Command(new String[] {"/bin/echo", "foo"}); -+ Command command = new Command(new String[] {"/usr/bin/env", "echo", "foo"}); - try { - command.execute(Command.NO_INPUT, Command.NO_OBSERVER, out, out); - fail(); - } catch (AbnormalTerminationException e) { - // Good. -- checkCommandElements(e, "/bin/echo", "foo"); -+ checkCommandElements(e, "/usr/bin/env", "echo", "foo"); - assertThat(e).hasMessage("java.io.IOException"); - } - } -diff -ur a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java ---- a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java 2017-02-19 16:17:42.973071187 -0800 -@@ -60,7 +60,7 @@ - - // We interrupt after 1 sec, so this gives us plenty of time for the library to notice the - // subprocess exit. -- this.command = new Command(new String[] { "/bin/sleep", "20" }); -+ this.command = new Command(new String[] { "/usr/bin/env", "sleep", "20" }); - - interrupter.start(); - } -diff -ur a/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java b/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java ---- a/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java 2017-02-19 15:37:06.022759356 -0800 -@@ -66,7 +66,7 @@ - - @Test - public void testLoad() throws Throwable { -- final Command command = new Command(new String[] {"/bin/cat", -+ final Command command = new Command(new String[] {"/usr/bin/env", "cat", - tempFile.getAbsolutePath()}); - Thread[] threads = new Thread[10]; - List exceptions = Collections.synchronizedList(new ArrayList()); -diff -ur a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java ---- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java 2017-02-19 15:37:06.022759356 -0800 -@@ -523,7 +523,7 @@ - @SuppressWarnings("unchecked") - List argv = (List) (List) (MutableList) lookup("argv"); - assertThat(argv).hasSize(3); -- assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0)); -+ assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0)); - assertThat(argv.get(1)).isEqualTo("-c"); - assertThat(argv.get(2)).isEqualTo("I got the World on a string"); - } -@@ -558,7 +558,7 @@ - @SuppressWarnings("unchecked") - List argv = (List) (List) (MutableList) lookup("argv"); - assertThat(argv).hasSize(3); -- assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0)); -+ assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0)); - assertThat(argv.get(1)).isEqualTo("-c"); - assertMatches("argv[2]", "A.*/mytool .*/mytool.sh B.*file3.dat", argv.get(2)); - } -@@ -588,7 +588,7 @@ - @SuppressWarnings("unchecked") - List argv = (List) (List) (MutableList) lookup("argv"); - assertThat(argv).hasSize(2); -- assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0)); -+ assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0)); - assertMatches("argv[1]", "^.*/resolve_me[.]script[.]sh$", argv.get(1)); - } - -diff -ur a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java ---- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java 1980-01-01 00:00:00.000000000 -0800 -+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java 2017-02-19 16:27:27.851399769 -0800 -@@ -162,16 +162,16 @@ - } - - private static String getFalseCommand() { -- return OS.getCurrent() == OS.DARWIN ? "/usr/bin/false" : "/bin/false"; -+ return OS.getCurrent() == OS.DARWIN ? "/usr/bin/false" : "false"; - } - - private static String getTrueCommand() { -- return OS.getCurrent() == OS.DARWIN ? "/usr/bin/true" : "/bin/true"; -+ return OS.getCurrent() == OS.DARWIN ? "/usr/bin/true" : "true"; - } - - @Test - public void testBinEchoPrintsArguments() throws Exception { -- Spawn spawn = createSpawn("/bin/echo", "Hello,", "world."); -+ Spawn spawn = createSpawn("/usr/bin/env", "echo", "Hello,", "world."); - run(spawn); - assertEquals("Hello, world.\n", out()); - assertThat(err()).isEmpty(); -@@ -179,7 +179,7 @@ - - @Test - public void testCommandRunsInWorkingDir() throws Exception { -- Spawn spawn = createSpawn("/bin/pwd"); -+ Spawn spawn = createSpawn("/usr/bin/env", "pwd"); - run(spawn); - assertEquals(executor.getExecRoot() + "\n", out()); - } diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 65c9480b114..25378135d3d 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, perl }: +{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils }: stdenv.mkDerivation rec { @@ -21,19 +21,31 @@ stdenv.mkDerivation rec { sourceRoot = "."; - patches = [ ./bin_to_env.patch ]; - postPatch = '' - patchShebangs ./compile.sh - for d in scripts src/java_tools src/test src/tools third_party/ijar/test tools; do - patchShebangs $d + patchShebangs . + for f in \ + src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \ + src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \ + src/test/java/com/google/devtools/build/lib/shell/CommandTest.java \ + src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java \ + src/test/java/com/google/devtools/build/lib/shell/LoadTest.java \ + src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java \ + src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java + do + substituteInPlace $f \ + --replace /bin/bash ${bash}/bin/bash \ + --replace /bin/cat ${coreutils}/bin/cat \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace /bin/false ${coreutils}/bin/false \ + --replace /bin/pwd ${coreutils}/bin/pwd \ + --replace /bin/sleep ${coreutils}/bin/sleep \ + --replace /bin/true ${coreutils}/bin/true done ''; buildInputs = [ stdenv.cc stdenv.cc.cc.lib - bash jdk zip unzip @@ -41,6 +53,14 @@ stdenv.mkDerivation rec { binutils ]; + # These must be propagated since the dependency is hidden in a compressed + # archive. + + propagatedBuildInputs = [ + bash + coreutils + ]; + # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). # Change this to $(mktemp -d) as soon as we figure out why. @@ -51,6 +71,7 @@ stdenv.mkDerivation rec { ''; # Build the CPP and Java examples to verify that Bazel works. + doCheck = true; checkPhase = '' export TEST_TMPDIR=$(pwd) From 6405bbe8671c3a184ce09fc42c468604ec0a5fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Feb 2017 17:30:26 +0100 Subject: [PATCH 107/274] cantata: 1.5.1 -> 2.0.1 --- pkgs/applications/audio/cantata/default.nix | 18 ++++++++---------- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 89aadf49fb8..3231e3e5301 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ stdenv, fetchFromGitHub, cmake, vlc , withQt4 ? false, qt4 , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper @@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.5.1"; + version = "2.0.1"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -43,14 +43,15 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - inherit name; - url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8"; - sha256 = "0y7y3nbiqgh1ghb47n4lfyp163wvazvhavlshb1c18ik03fkn5sp"; + src = fetchFromGitHub { + owner = "CDrummond"; + repo = "cantata"; + rev = "v${version}"; + sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36"; }; buildInputs = - [ cmake ] + [ cmake vlc ] ++ stdenv.lib.optional withQt4 qt4 ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] @@ -64,9 +65,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; - unpackPhase = "tar -xvf $src"; - sourceRoot = "${name}"; - cmakeFlags = stdenv.lib.flatten [ (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fd9ecb32b9..3799fbd9638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1101,6 +1101,7 @@ with pkgs; davix = callPackage ../tools/networking/davix { }; cantata = libsForQt5.callPackage ../applications/audio/cantata { + inherit vlc; ffmpeg = ffmpeg_2; }; @@ -10499,7 +10500,7 @@ with pkgs; hbase = callPackage ../servers/hbase {}; hiawatha = callPackage ../servers/http/hiawatha {}; - + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; From ffb0fb51d4b4f29b72008a17292bdc4634873e87 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 28 Feb 2017 11:56:51 +0100 Subject: [PATCH 108/274] blender: 2.78b -> 2.78c --- pkgs/applications/misc/blender/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 76810a6f249..a7b15646f03 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.78b"; + name = "blender-2.78c"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0wgrqwznih6c19y2fpvrk3k6qsaxsy3g7xja87rb4hq7r7j8x22d"; + sha256 = "0f6k3m9yd5yhn7fq9srgzwh2gachlxm03bdrvn2r7xq00grqzab4"; }; buildInputs = @@ -54,7 +54,12 @@ stdenv.mkDerivation rec { "-DWITH_PYTHON_INSTALL_NUMPY=OFF" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" + ++ optionals cudaSupport + [ "-DWITH_CYCLES_CUDA_BINARIES=ON" + # Disable the sm_20 architecture to work around a segfault in + # ptxas, as suggested on #blendercoders. + "-DCYCLES_CUDA_BINARIES_ARCH=sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61" + ] ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; From b13378c47927cbcd7c5b365c1fdc44e3c89a3759 Mon Sep 17 00:00:00 2001 From: Willi Butz Date: Tue, 28 Feb 2017 17:47:21 +0100 Subject: [PATCH 109/274] openconnect_openssl: added missing dependecy gmp --- pkgs/tools/networking/openconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index e1104a88c90..5e38aee7f83 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, stoken, zlib } : +{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } : let xor = a: b: (a || b) && (!(a && b)); @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ vpnc openssl gnutls libxml2 stoken zlib ]; + propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; meta = { description = "VPN Client for Cisco's AnyConnect SSL VPN"; From fc8e0ccc2e170f75a6fbfe4f9fc1b8602ccb0374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 28 Feb 2017 17:53:31 +0100 Subject: [PATCH 110/274] sysdig: give the source tarball a meaningful name --- pkgs/os-specific/linux/sysdig/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 8aef1655a01..b23da5451d1 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,13 +1,15 @@ {stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}: + let inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; version = "0.15.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { + name = "${name}.tar.gz"; url = "https://github.com/draios/sysdig/archive/${version}.tar.gz"; sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2"; }; From a6e2d5fcbb12e018ba36eb184615d32e1b03ca57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 25 Feb 2017 00:58:38 +0100 Subject: [PATCH 111/274] lua5_{2,3}: replace sha1 with sha256 --- pkgs/development/interpreters/lua-5/5.2.nix | 2 +- pkgs/development/interpreters/lua-5/5.3.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index fa5113fd572..d14230c158e 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.lua.org/ftp/${name}.tar.gz"; - sha1 = "926b7907bc8d274e063d42804666b40a3f3c124c"; + sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; }; nativeBuildInputs = [ readline ]; diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 30c26a922ba..a22e162b8e1 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.lua.org/ftp/${name}.tar.gz"; - sha1 = "1c46d1c78c44039939e820126b86a6ae12dadfba"; + sha256 = "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf"; }; nativeBuildInputs = [ readline ]; From be23e983ae1b35c02ad3a54a176d8fcf4c5f00f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 25 Feb 2017 00:55:56 +0100 Subject: [PATCH 112/274] haka: replace sha1 with sha256 --- pkgs/tools/security/haka/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 6c5247a47bb..f9c7f4eaf1c 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "haka_${version}_source.tar.gz"; url = "https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz"; - - # https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz.sha1.txt - sha1 = "87625ed32841cc0b3aa92aa49397ce71ce434bc2"; + sha256 = "0dm39g3k77sa70zrjsqadidg27a6iqq61jzfdxazpllnrw4mjy4w"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; From 49f9c202f6cdfb8ec082e41c6aa1bed85cdaf4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 26 Feb 2017 21:57:07 +0100 Subject: [PATCH 113/274] gpodder: disable iPodSupport by default gpodder has an indirect dependency on libplist (pulled by libgpod), which has known security vulnerabilities. --- pkgs/applications/audio/gpodder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 569326ec375..1fe2c46d236 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, mygpoclient, intltool -, ipodSupport ? true, libgpod +, ipodSupport ? false, libgpod , gnome3 }: From 0e5cce32d82cbfff0f17567e65e5ec97a20e0274 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 11:08:54 -0600 Subject: [PATCH 114/274] qt57: update community releases automatically --- pkgs/development/libraries/qt-5/5.7/fetch.sh | 1 + pkgs/development/libraries/qt-5/5.7/srcs.nix | 24 +++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh index 0f7d123aeb2..6a6a34d520d 100644 --- a/pkgs/development/libraries/qt-5/5.7/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.7/fetch.sh @@ -1,2 +1,3 @@ WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/ \ + http://download.qt.io/community_releases/5.7/5.7.1/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix index fe497555874..3fc4fab4ea5 100644 --- a/pkgs/development/libraries/qt-5/5.7/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.7/srcs.nix @@ -2,14 +2,6 @@ { fetchurl, mirror }: { - qtwebkit = { - version = "5.7.0"; - src = fetchurl { - url = "${mirror}/community_releases/5.7/5.7.0/qtwebkit-opensource-src-5.7.0.tar.xz"; - sha256 = "1prlpl3zslzpr1iv7m3irvxjxn3v8nlxh21v9k2kaq4fpwy2b8y7"; - name = "qtwebkit-opensource-src-5.7.0.tar.xz"; - }; - }; qt3d = { version = "5.7.1"; src = fetchurl { @@ -266,6 +258,22 @@ name = "qtwebengine-opensource-src-5.7.1.tar.xz"; }; }; + qtwebkit = { + version = "5.7.1"; + src = fetchurl { + url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz"; + sha256 = "00szgcra6pf2myfjrdbsr1gmrxycpbjqlzkplna5yr1rjg4gfv54"; + name = "qtwebkit-opensource-src-5.7.1.tar.xz"; + }; + }; + qtwebkit-examples = { + version = "5.7.1"; + src = fetchurl { + url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-examples-opensource-src-5.7.1.tar.xz"; + sha256 = "09c2ni3nf7vdsw1y9yhpbal9zs8jgvi1wndnva6mgdbcnm8h23fm"; + name = "qtwebkit-examples-opensource-src-5.7.1.tar.xz"; + }; + }; qtwebsockets = { version = "5.7.1"; src = fetchurl { From 14ef7c0c59be348c2e27c2d0d5d4ca175962e519 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 28 Feb 2017 12:21:52 -0500 Subject: [PATCH 115/274] bazel: consolidate bazel test invocations This way it can run them in parallel. --- pkgs/development/tools/build-managers/bazel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 25378135d3d..e40e78427c6 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -75,8 +75,9 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' export TEST_TMPDIR=$(pwd) - ./output/bazel test --test_output=errors examples/cpp:hello-success_test - ./output/bazel test --test_output=errors examples/java-native/src/test/java/com/example/myproject:hello + ./output/bazel test --test_output=errors \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello ''; installPhase = '' From c4fd85a451a973745aabe227c1c392c39f14c23d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 16:11:33 +0100 Subject: [PATCH 116/274] phpPackages.redis22: not supported with php >= 7 cc #23253 --- pkgs/top-level/php-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5f1e9a5f24c..e07930a94db 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -176,7 +176,7 @@ let redis = if isPhp7 then redisPhp7 else redis22; - redis22 = buildPecl { + redis22 = assert !isPhp7; buildPecl { name = "redis-2.2.7"; sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm"; }; From a36e1e2c353fea4b58b202308c38298503f6e63a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 16:47:21 +0100 Subject: [PATCH 117/274] youtubeDL: 2017.02.24.1 -> 2017.02.27 --- pkgs/tools/misc/youtube-dl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b3104d6629d..2d942e01475 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,14 +14,15 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.02.24.1"; + version = "2017.02.27"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1m2mmnjf7zw0vsbw6vjl8b4p8wa3jdmdzli970cp26awgkq5c15v"; + sha256 = "0pcrr1bxxw3aar681gj8n5ms69j54namjlw5bj88crs0nm69kspk"; }; - buildInputs = [ zip makeWrapper ] ++ optional generateManPage pandoc; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ zip ] ++ optional generateManPage pandoc; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP From 7c17c10bab7ff0319c983828032d6a10b07b4faa Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 28 Feb 2017 12:44:44 -0500 Subject: [PATCH 118/274] bazel: Wrap so java is present at runtime Bazel can't start up without javac in $PATH. --- pkgs/development/tools/build-managers/bazel/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e40e78427c6..a8ad08feec1 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils }: +{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils, makeWrapper }: stdenv.mkDerivation rec { @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { unzip which binutils + makeWrapper ]; # These must be propagated since the dependency is hidden in a compressed @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin + wrapProgram "$out/bin/bazel" --prefix PATH : "${jdk}/bin" ''; dontStrip = true; From bfa067179e69049a0c458ad28bbf5566f290c2b2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Feb 2017 18:42:08 +0100 Subject: [PATCH 119/274] multisync: remove, no release in > 10 years Upstream suggests to use opensync. cc #23253 --- pkgs/applications/misc/multisync/default.nix | 23 -------------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/applications/misc/multisync/default.nix diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix deleted file mode 100644 index 5c00bddd9d2..00000000000 --- a/pkgs/applications/misc/multisync/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, gtk2, glib, ORBit2, libbonobo, libtool, pkgconfig -, libgnomeui, GConf, automake, autoconf }: - -stdenv.mkDerivation { - name = "multisync-0.82-1"; - - src = fetchurl { - url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2; - sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3"; - }; - - buildInputs = - [ gtk2 glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf - automake autoconf - ]; - - preConfigure = "./autogen.sh"; # install.sh is not contained in the tar - - meta = { - description = "Modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc"; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3799fbd9638..81e0afe5baf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14517,10 +14517,6 @@ with pkgs; multimon-ng = callPackage ../applications/misc/multimon-ng { }; - multisync = callPackage ../applications/misc/multisync { - inherit (gnome2) ORBit2 libbonobo libgnomeui GConf; - }; - inherit (callPackages ../applications/networking/mumble { avahi = avahi.override { withLibdnssdCompat = true; From 62c5f6884720205a442073612d59f7a9969b09d8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 28 Feb 2017 18:28:12 +0100 Subject: [PATCH 120/274] palemoon: 27.0.3 -> 27.1.1 --- pkgs/applications/networking/browsers/palemoon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 73a82841360..b167b59f03c 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.0.3"; + version = "27.1.1"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; - rev = "c09119484da17c682a66e32bacbffb8cff411608"; - sha256 = "1i4hp1lz0xaryy4zpncr67gbqg8v7a2cnyqjwvs2an86rk1vg913"; + rev = "a35936746069e6591181eb67e5f9ea094938bae5"; + sha256 = "0hns5993dh93brwz3z4xp1zp8n90x1hajxylv17zybpysax64jsk"; }; desktopItem = makeDesktopItem { From 61785c55319dbb1d3af1f2d362d028f6814570af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Feb 2017 23:22:08 +0100 Subject: [PATCH 121/274] keepassxc: 2.1.0 -> 2.1.2 also enable http plugin again. Readme mention using the protocol be a security risk because it is unencrypted, but the connections stays local (127.0.0.1) and the plugins has to explicitly enabled in settings (disabled by default). --- pkgs/applications/misc/keepassx/community.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 58b45786c40..c5bd9afd2cf 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools }: +{ stdenv, fetchFromGitHub, + cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror +, withKeePassHTTP ? true +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p"; + sha256 = "0ncc157xki1mzxfa41bgwjfsz5jq9sq750ka578lq61smyzh5lq6"; }; - buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd ]; + cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ]; + + buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ]; meta = { description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2."; From e9c507e060c54042e7c33a57b42cdbfdae984113 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 16:19:28 -0600 Subject: [PATCH 122/274] xul: 0.8.0 -> 1.1.0 --- pkgs/tools/text/xurls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 26d17355951..6389bef5b33 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "1.1.0"; name = "xurls-${version}"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "0j35x6hl5hiwzpi6vjw9d2sn83rrsd9w07ql9kndhkngz8n6yr98"; + sha256 = "05q4nqbpgfb0a35sn22rn9mlag2ks4cgwb54dx925hipp6zgj1hx"; }; buildInputs = [ go ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract urls from text"; homepage = https://github.com/mvdan/xurls; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ndowens ]; platforms = platforms.unix; }; } From 0e0af18b57201c88531d4c56e511da367ea8deef Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 16:06:01 -0600 Subject: [PATCH 123/274] fop: 1.1 -> 2.1 --- pkgs/tools/typesetting/fop/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 473b23fe262..aff11fd6127 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,11 +1,12 @@ { fetchurl, stdenv, ant, jdk }: stdenv.mkDerivation rec { - name = "fop-1.1"; + name = "fop-${version}"; + version = "2.1"; src = fetchurl { url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz"; - sha256 = "08i56d57w5dl5bqchr34x9165hvi5h4bhiflxhi0a4wd56rlq5jq"; + sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5"; }; buildInputs = [ ant jdk ]; @@ -45,6 +46,6 @@ stdenv.mkDerivation rec { homepage = http://xmlgraphics.apache.org/fop/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ndowens ]; }; } From d02209edf251a9d3ba564fe4ed1a20b8bbfca869 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 16:26:05 -0600 Subject: [PATCH 124/274] wgetpaste: 2.25 -> 2.28 --- pkgs/tools/text/wgetpaste/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index ced6ce402fb..81b90e4925d 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, wget, bash, coreutils }: stdenv.mkDerivation rec { - version = "2.25"; + version = "2.28"; name = "wgetpaste-${version}"; + src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "1x209j85mryp3hxmv1gfsbvw03k306k5fa65ky0zxx07cs70fzka"; + sha256 = "1hh9svyypqcvdg5mjxyyfzpdzhylhf7s7xq5dzglnm4injx3i3ak"; }; # currently zsh-autocompletion support is not installed @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { description = "Command-line interface to various pastebins"; homepage = http://wgetpaste.zlin.dk/; license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ]; + maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ndowens ]; platforms = stdenv.lib.platforms.all; }; } From 3e8c302525d4a25cd34fcb680653ad8706fb9baa Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 28 Feb 2017 16:29:45 +0100 Subject: [PATCH 125/274] qjackctl: 0.4.3 -> 0.4.4 --- pkgs/applications/audio/qjackctl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 52b94ca07d9..857f77bbdaf 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: +{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.4.4"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "01wyyynxy21kim0gplzvfij7275a1jz68hdx837d2j1w5x2w7zbb"; + sha256 = "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak"; }; buildInputs = [ @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { dbus ]; + nativeBuildInputs = [ pkgconfig ]; + configureFlags = [ "--enable-jack-version" ]; meta = with stdenv.lib; { From 40d47d457e7e19a12701ecc7d4f9e89da1269bd9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 28 Feb 2017 16:29:19 +0100 Subject: [PATCH 126/274] samplv1: 0.7.6 -> 0.8.0 --- pkgs/applications/audio/samplv1/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index aeb8396e0a6..10f06e16cf4 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: +{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.7.6"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "071j7mi2cwhx0ml5hq8izmjb0s4yhbkscqaxfdg56xfpfsqsa63l"; + sha256 = "0j3hkmd9q0bw9b7nk9cssqywlrishkd1n790a9vq6gh3pdc5sf3r"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; + nativeBuildInputs = [ pkgconfig ]; + meta = with stdenv.lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; homepage = http://samplv1.sourceforge.net/; From 9dabf88e725cd2632d21863a5f9541b108767d9a Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 28 Feb 2017 16:28:39 +0100 Subject: [PATCH 127/274] drumkv1: 0.7.6 -> 0.8.0 --- pkgs/applications/audio/drumkv1/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index a14d642cd83..0a2e293d90b 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: +{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.7.6"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "0cl1rbj26nsbvg9wzsh2j8xlx69xjxn29x46ypmy3939zbk81bi6"; + sha256 = "1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; + nativeBuildInputs = [ pkgconfig ]; + meta = with stdenv.lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; homepage = http://drumkv1.sourceforge.net/; From cf9cb1bac3fe61b3cac5dcd3aca5e2c214186a24 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 28 Feb 2017 23:35:24 +0100 Subject: [PATCH 128/274] gpsbabel: require qt4 rather than qtbase --- pkgs/applications/misc/gpsbabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index c21f8bbe814..38f81a979b3 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, qtbase, which }: +{ stdenv, fetchurl, zlib, qt4, which }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w"; }; - buildInputs = [ zlib qtbase which ]; + buildInputs = [ zlib qt4 which ]; /* FIXME: Building the documentation, with "make doc", requires this: From 61237e17380b64f8e2879f082a06d719f729e30a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 28 Feb 2017 23:52:52 +0100 Subject: [PATCH 129/274] gpsbabel: 1.5.2 -> 1.5.3 --- pkgs/applications/misc/gpsbabel/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 38f81a979b3..6c248bc4dfa 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, zlib, qt4, which }: +{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { # gpgbabel.org makes it hard to get the source tarball automatically, so # get it from elsewhere. url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; - sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w"; + sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1"; }; + patches = [ + (fetchpatch { + url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip; + sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; + }) + ]; + buildInputs = [ zlib qt4 which ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -19,7 +26,6 @@ stdenv.mkDerivation rec { But FOP isn't packaged yet. */ - preConfigure = "cd gpsbabel"; configureFlags = [ "--with-zlib=system" ] # Floating point behavior on i686 causes test failures. Preventing # extended precision fixes this problem. From 1e74a156c366429af554113404fc89406043eaa1 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 28 Feb 2017 15:12:28 +0100 Subject: [PATCH 130/274] qmidinet: 0.4.1 -> 0.4.2 --- pkgs/applications/audio/qmidinet/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index f5f3119f73d..89f1682592a 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, qt5, alsaLib, libjack2 }: +{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.4.1"; + version = "0.4.2"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1hh06g19lfh6r673avfvy0l2mq999mxk2jnv396226swj97lv7yz"; + sha256 = "1sdnd189db44xhl9p8pd8h4bsy8s0bn1y64lrdq7nb21mwg8ymcs"; }; hardeningDisable = [ "format" ]; buildInputs = [ qt5.qtbase qt5.qttools alsaLib libjack2 ]; + nativeBuildInputs = [ pkgconfig ]; + meta = with stdenv.lib; { description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; homepage = http://qmidinet.sourceforge.net/; From 6c5cbfd0916faefb432759a2b1c8d1b0ffce591e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 1 Mar 2017 02:09:05 +0300 Subject: [PATCH 131/274] python3.pkgs.protobuf3_0: fix build I spent some time trying to fix tests instead but have no idea what happens. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8205cb41d2..cb6fee5977d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19269,7 +19269,7 @@ in { }; protobuf3_0 = callPackage ../development/python-modules/protobuf.nix { disabled = isPyPy; - doCheck = isPy3k; + doCheck = !isPy3k; protobuf = pkgs.protobuf3_0; }; protobuf2_6 = callPackage ../development/python-modules/protobuf.nix { From cb766725c749c5145f4062569c279b7207399949 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 17:16:33 -0600 Subject: [PATCH 132/274] numdiff: 5.8.1 -> 5.9.0 --- pkgs/tools/text/numdiff/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index db7eeb789af..8f22a9e7600 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl }: -let - version = "5.8.1"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { name = "numdiff-${version}"; + version = "5.9.0"; + src = fetchurl { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; - sha256 = "00zm9955gjsid0daa94sbw69klk0vrnrrh0ihijza99kysnvmblr"; + sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47"; }; - meta = { + meta = with stdenv.lib; { description = '' A little program that can be used to compare putatively similar files line by line and field by field, ignoring small numeric differences or/and different numeric formats ''; homepage = http://www.nongnu.org/numdiff/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.gnu; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ bbenoist ndowens ]; + platforms = platforms.gnu; }; } From f876ae4b924a7dbc97fd49185129119ed4dda827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Mar 2017 00:20:05 +0100 Subject: [PATCH 133/274] cheat: 2.1.27 -> 2.1.28 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 246a50842c6..68b77bafc0e 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,14 +1,14 @@ { python3Packages, fetchurl, lib }: python3Packages.buildPythonApplication rec { - version = "2.1.27"; + version = "2.1.28"; name = "cheat-${version}"; propagatedBuildInputs = with python3Packages; [ docopt pygments ]; src = fetchurl { url = "mirror://pypi/c/cheat/${name}.tar.gz"; - sha256 = "1mrrfwd4ivas0alfkhjryxxzf24a4ngk8c6n2zlfb8ziwf7czcqd"; + sha256 = "1a5c5f3dx3dmmvv75q2w6v2xb1i6733c0f8knr6spapvlim5i0c5"; }; # no tests available doCheck = false; From 8aa73bbf55884d2a94db0e54aa5ceb92a513371b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 1 Mar 2017 01:01:02 +0300 Subject: [PATCH 134/274] networkmanagerapplet: add librsvg Fix tray icon. Also use wrapGAppsHook instead of custom wrapper. --- .../network-manager-applet/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 8d62cb1bc74..a212e4f053d 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager +, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson }: +, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson + modemmanager jansson librsvg ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ]; @@ -33,16 +33,6 @@ stdenv.mkDerivation rec { installFlagsArray=( "sysconfdir=$out/etc" ) ''; - preFixup = '' - wrapProgram "$out/bin/nm-applet" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ - --prefix PATH ":" "${gnome3.gconf}/bin" - wrapProgram "$out/bin/nm-connection-editor" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; From 834471985e907911f2c5764df1c24bccea4aa954 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 26 Feb 2017 00:56:50 +0300 Subject: [PATCH 135/274] python.pkgs.enum-compat: init at 0.0.2 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb6fee5977d..ec6477723ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10986,6 +10986,26 @@ in { }; }; + enum-compat = buildPythonPackage rec { + pname = "enum-compat"; + version = "0.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; + }; + + propagatedBuildInputs = with self; [ enum34 ]; + + meta = { + homepage = "https://github.com/jstasiak/enum-compat"; + description = "enum/enum34 compatibility package"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; + }; + enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec { pname = "enum34"; version = "1.1.6"; From b6cba9ae3ff808c8b005dbc8021178013557216c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 26 Feb 2017 00:57:06 +0300 Subject: [PATCH 136/274] python.pkgs.zeroconf: init at 0.18.0 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec6477723ce..1662b1c5b24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -32046,6 +32046,26 @@ EOF zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; + zeroconf = buildPythonPackage rec { + pname = "zeroconf"; + version = "0.18.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2"; + }; + + propagatedBuildInputs = with self; [ netifaces six enum-compat ]; + + meta = { + description = "A pure python implementation of multicast DNS service discovery"; + homepage = "https://github.com/jstasiak/python-zeroconf"; + license = licenses.lgpl21; + maintainers = with maintainers; [ abbradar ]; + }; + }; + zipfile36 = buildPythonPackage rec { pname = "zipfile36"; version = "0.1.3"; From e3a6a1fc0e0888afe47ed9f1038c3a4c4c64de01 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 26 Feb 2017 00:58:52 +0300 Subject: [PATCH 137/274] python.pkgs.libarcus: init at 2.4.0 --- .../python-modules/libarcus/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/libarcus/default.nix diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix new file mode 100644 index 00000000000..cae6ac62e1e --- /dev/null +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, python, cmake, sip, protobuf }: + +if lib.versionOlder python.version "3.4.0" +then throw "libArcus not supported for interpreter ${python.executable}" +else + +stdenv.mkDerivation rec { + name = "libarcus-${version}"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "libArcus"; + rev = version; + sha256 = "07lf5d42pnx0h9lgldplfdj142rbcsxx23njdblnq04di7a4937h"; + }; + + propagatedBuildInputs = [ sip protobuf ]; + nativeBuildInputs = [ cmake ]; + + postPatch = '' + # To workaround buggy SIP detection which overrides PYTHONPATH + sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + ''; + + meta = with stdenv.lib; { + description = "Communication library between internal components for Ultimaker software"; + homepage = "https://github.com/Ultimaker/libArcus"; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1662b1c5b24..1c02e12a44e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28149,6 +28149,10 @@ EOF inherit (pkgs) libasyncns pkgconfig; }; + libarcus = callPackage ../development/python-modules/libarcus { + protobuf = self.protobuf3_0; + }; + pybrowserid = buildPythonPackage rec { name = "PyBrowserID-${version}"; version = "0.9.2"; From 868794010fb1d8295d6b83561f3c6d489d5ed818 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 26 Feb 2017 00:59:08 +0300 Subject: [PATCH 138/274] python.pkgs.uranium: init at 2.4.0 --- .../python-modules/uranium/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/uranium/default.nix diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix new file mode 100644 index 00000000000..bce88635d3c --- /dev/null +++ b/pkgs/development/python-modules/uranium/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus }: + +if lib.versionOlder python.version "3.5.0" +then throw "Uranium not supported for interpreter ${python.executable}" +else + +stdenv.mkDerivation rec { + name = "uranium-${version}"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "Uranium"; + rev = version; + sha256 = "1jpl0ryk8xdppillk5wzr2415n50cpa09shn1xqj6y96fg22l2il"; + }; + + buildInputs = [ python ]; + propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; + nativeBuildInputs = [ cmake ]; + + postPatch = '' + sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt + sed -i \ + -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \ + -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \ + UM/Application.py + ''; + + meta = with stdenv.lib; { + description = "A Python framework for building Desktop applications"; + homepage = "https://github.com/Ultimaker/Uranium"; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c02e12a44e..d9ec862146c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -32010,6 +32010,8 @@ EOF }; }; + uranium = callPackage ../development/python-modules/uranium { }; + urlscan = callPackage ../applications/misc/urlscan { }; vine = buildPythonPackage rec { From 2e80b50a7eb7db481ff00b6ae4ab76ece6d245b7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 26 Feb 2017 01:05:04 +0300 Subject: [PATCH 139/274] cura, curaengine: 14.04 -> 2.4.0 Move old Cura to {cura,curaengine}_stable --- nixos/modules/services/misc/octoprint.nix | 2 +- pkgs/applications/misc/cura/default.nix | 79 ++++++------------- pkgs/applications/misc/cura/stable.nix | 73 +++++++++++++++++ pkgs/applications/misc/curaengine/default.nix | 35 ++++---- pkgs/applications/misc/curaengine/stable.nix | 29 +++++++ pkgs/top-level/all-packages.nix | 10 ++- 6 files changed, 149 insertions(+), 79 deletions(-) create mode 100644 pkgs/applications/misc/cura/stable.nix create mode 100644 pkgs/applications/misc/curaengine/stable.nix diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index c2b3f63be7d..8faad46a49f 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -7,7 +7,7 @@ let cfg = config.services.octoprint; baseConfig = { - plugins.cura.cura_engine = "${pkgs.curaengine}/bin/CuraEngine"; + plugins.cura.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine"; server.host = cfg.host; server.port = cfg.port; webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg"; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a53b001b0e9..ff18796e39d 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,73 +1,38 @@ -{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: -let - py = python27Packages; - version = "15.04"; -in +{ stdenv, lib, fetchFromGitHub, cmake, python3, qtbase, makeQtWrapper, curaengine }: + stdenv.mkDerivation rec { name = "cura-${version}"; + version = "2.4.0"; - src = fetchurl { - url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl"; + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "Cura"; + rev = version; + sha256 = "04iglmjg9rzmlfrll6g7bcckkla327938xh8qmbdfrh215aivdlp"; }; - desktopItem = makeDesktopItem { - name = "Cura"; - exec = "cura"; - icon = "cura"; - comment = "Cura"; - desktopName = "Cura"; - genericName = "3D printing host software"; - categories = "GNOME;GTK;Utility;"; - }; + buildInputs = [ qtbase ]; + propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ]; + nativeBuildInputs = [ cmake python3.pkgs.wrapPython makeQtWrapper ]; - python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; + cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ]; - pythonPath = python_deps; + postPatch = '' + sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt + sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py + ''; - propagatedBuildInputs = python_deps; - - buildInputs = [ curaengine py.wrapPython ]; - - configurePhase = ""; - buildPhase = ""; - - patches = [ ./numpy-cast.patch ]; - - installPhase = '' - # Install Python code. - site_packages=$out/lib/python2.7/site-packages - mkdir -p $site_packages - cp -r Cura $site_packages/ - - # Install resources. - resources=$out/share/cura - mkdir -p $resources - cp -r resources/* $resources/ - sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py - - # Install executable. - mkdir -p $out/bin - cp Cura/cura.py $out/bin/cura - chmod +x $out/bin/cura - sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura + postFixup = '' wrapPythonPrograms - - # Make it find CuraEngine. - echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py - - # Install desktop item. - mkdir -p "$out"/share/applications - cp "$desktopItem"/share/applications/* "$out"/share/applications/ - mkdir -p "$out"/share/icons - ln -s "$resources/images/c.png" "$out"/share/icons/cura.png + mv $out/bin/cura $out/bin/.cura-noqtpath + makeQtWrapper $out/bin/.cura-noqtpath $out/bin/cura ''; meta = with stdenv.lib; { - description = "3D printing host software"; - homepage = https://github.com/daid/Cura; + description = "3D printer / slicing GUI built on top of the Uranium framework"; + homepage = "https://github.com/Ultimaker/Cura"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix new file mode 100644 index 00000000000..a53b001b0e9 --- /dev/null +++ b/pkgs/applications/misc/cura/stable.nix @@ -0,0 +1,73 @@ +{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: +let + py = python27Packages; + version = "15.04"; +in +stdenv.mkDerivation rec { + name = "cura-${version}"; + + src = fetchurl { + url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; + sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl"; + }; + + desktopItem = makeDesktopItem { + name = "Cura"; + exec = "cura"; + icon = "cura"; + comment = "Cura"; + desktopName = "Cura"; + genericName = "3D printing host software"; + categories = "GNOME;GTK;Utility;"; + }; + + python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; + + pythonPath = python_deps; + + propagatedBuildInputs = python_deps; + + buildInputs = [ curaengine py.wrapPython ]; + + configurePhase = ""; + buildPhase = ""; + + patches = [ ./numpy-cast.patch ]; + + installPhase = '' + # Install Python code. + site_packages=$out/lib/python2.7/site-packages + mkdir -p $site_packages + cp -r Cura $site_packages/ + + # Install resources. + resources=$out/share/cura + mkdir -p $resources + cp -r resources/* $resources/ + sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py + + # Install executable. + mkdir -p $out/bin + cp Cura/cura.py $out/bin/cura + chmod +x $out/bin/cura + sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura + wrapPythonPrograms + + # Make it find CuraEngine. + echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py + + # Install desktop item. + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + ln -s "$resources/images/c.png" "$out"/share/icons/cura.png + ''; + + meta = with stdenv.lib; { + description = "3D printing host software"; + homepage = https://github.com/daid/Cura; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index ce743a00879..08df0cc3e90 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchurl }: -let - version = "15.04.6"; -in -stdenv.mkDerivation { - name = "curaengine-${version}"; +{ stdenv, fetchFromGitHub, cmake, libarcus }: - src = fetchurl { - url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "1cd4dikzvqyj5g80rqwymvh4nwm76vsf78clb37kj6q0fig3qbjg"; +stdenv.mkDerivation rec { + name = "curaengine-${version}"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "CuraEngine"; + rev = version; + sha256 = "1n587cqm310kzb2zbc31199x7ybgxzjq91hslb1zcb8qg8qqmixm"; }; - postPatch = '' - sed -i 's,--static,,g' Makefile - ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libarcus ]; - installPhase = '' - mkdir -p $out/bin - cp build/CuraEngine $out/bin/ - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Engine for processing 3D models into 3D printing instructions"; - homepage = https://github.com/Ultimaker/CuraEngine; + description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; + homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix new file mode 100644 index 00000000000..ce743a00879 --- /dev/null +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: +let + version = "15.04.6"; +in +stdenv.mkDerivation { + name = "curaengine-${version}"; + + src = fetchurl { + url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; + sha256 = "1cd4dikzvqyj5g80rqwymvh4nwm76vsf78clb37kj6q0fig3qbjg"; + }; + + postPatch = '' + sed -i 's,--static,,g' Makefile + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/CuraEngine $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Engine for processing 3D models into 3D printing instructions"; + homepage = https://github.com/Ultimaker/CuraEngine; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46d4d7f8bc9..170fa60c27b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15270,9 +15270,15 @@ with pkgs; slic3r = callPackage ../applications/misc/slic3r { }; - curaengine = callPackage ../applications/misc/curaengine { }; + curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; + cura_stable = callPackage ../applications/misc/cura/stable.nix { + curaengine = curaengine_stable; + }; - cura = callPackage ../applications/misc/cura { }; + curaengine = callPackage ../applications/misc/curaengine { + inherit (python3.pkgs) libarcus; + }; + cura = qt5.callPackage ../applications/misc/cura { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; From d35ff57b4e78222a6df32ac14b57373f77ecb119 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 28 Feb 2017 22:49:15 +0100 Subject: [PATCH 140/274] arx-libertatis: 2016-07-27 -> 2017-02-26 --- pkgs/games/arx-libertatis/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index b9f78ca364a..0d8c22d6e7b 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit, cmake, zlib, boost, +{ stdenv, fetchFromGitHub, cmake, zlib, boost, openal, glm, freetype, mesa, glew, SDL2, dejavu_fonts, inkscape, optipng, imagemagick }: stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2016-07-27"; + version = "2017-02-26"; - src = fetchgit { - url = "https://github.com/arx/ArxLibertatis"; - rev = "e3aa6353f90886e7e9db2f4350ad9a232dd01c1e"; - sha256 = "1hkkf0z607z8wxdikxq1ji120b3w7pxixq9qapdj1p54dzgbhgza"; + src = fetchFromGitHub { + owner = "arx"; + repo = "ArxLibertatis"; + rev = "0d2bb46025b2ad0fd5c8bcddd1cc04750282608d"; + sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5"; }; buildInputs = [ From 8f29ca2104641c85db1c01897f93eba08cdc2ebc Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 17:26:26 -0600 Subject: [PATCH 141/274] kytea: 0.4.6 -> 0.4.7; source was still pointing to version 0.4.6 --- pkgs/tools/text/kytea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index 2aec0d04a61..142bb721277 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { version = "0.4.7"; src = fetchurl { - url = "http://www.phontron.com/kytea/download/kytea-0.4.6.tar.gz"; - sha256 = "0n6d88j0qda4dmy6mcj0cyin46n05m5phvjiah9i4ip54h8vs9s3"; + url = "http://www.phontron.com/kytea/download/${name}.tar.gz"; + sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk"; }; meta = with stdenv.lib; { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; - maintainers = [ maintainers.ericsagnes ]; + maintainers = with maintainers; [ ericsagnes ndowens ]; platforms = platforms.linux; }; From a6ee264f1b83277c39cae991c02b0053873dfede Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 27 Feb 2017 11:25:49 +0100 Subject: [PATCH 142/274] cdparanoia: sha1 -> sha256 --- pkgs/applications/audio/cdparanoia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index ceff147d618..ac5db3d1f63 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; - sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd"; + sha256 = "1n86kzm2ssl8fdf5wlhp6ncb2bf6b9xlb5vg0mhc85r69prqzjiy"; }) (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; - sha1 = "d7dc121374df3b82e82adf544df7bf1eec377bdb"; + sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) ]; From 56ae1e25af1a62f6ef3eea76710d7e304045ac05 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 27 Feb 2017 11:43:20 +0100 Subject: [PATCH 143/274] rhash: sha1 -> sha256 --- pkgs/tools/security/rhash/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 40f5163d89d..1f72ca294eb 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/rhash/${name}-src.tar.gz"; sha1 = "0981bdc98ba7ef923b1a6cd7fd8bb0374cff632e"; + sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv"; }; installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; From 026366b00b335246b86701cea57bb2932cccfb3d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 27 Feb 2017 11:33:59 +0100 Subject: [PATCH 144/274] pan: sha1 -> sha256 --- pkgs/applications/networking/newsreaders/pan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index e8885edaa2a..8c0bb8a884f 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60"; + sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz"; }; buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ] From 3c178fe769c2c51f1be7b45dc248b11353b44c8a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 1 Mar 2017 00:22:06 +0100 Subject: [PATCH 145/274] tinycc: restrict platforms to x86_64-linux --- pkgs/development/compilers/tinycc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index a8b1ac02673..79745d45c2b 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://www.tinycc.org/; license = licenses.mit; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.joachifm ]; }; } From 9655567c09fe6b7156a19ce44040c86738d9dd3c Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 17:44:50 -0600 Subject: [PATCH 146/274] highlight: 3.28 -> 3.35 --- pkgs/tools/text/highlight/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index eb6359ba978..3d8bfbf03f8 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -2,19 +2,23 @@ stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.28"; + version = "3.35"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "1kg73isgz3czb1k6ccajqzifahr3zs9ci8168k0dlj31j1nlndin"; + sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05"; }; - buildInputs = [ getopt lua boost pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ getopt lua boost ]; preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"''; - meta = { + meta = with stdenv.lib; { description = "Source code highlighting tool"; - platforms = stdenv.lib.platforms.unix; + homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; + platforms = platforms.unix; + maintainers = maintainers.ndowens; }; } From fe33c28ec94b8d6d533b08965671cd04100c2c0a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 1 Mar 2017 02:50:11 +0300 Subject: [PATCH 147/274] blender: fix libOpenCL path --- pkgs/applications/misc/blender/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index a7b15646f03..335d0031b32 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -2,7 +2,7 @@ , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python -, zlib, fftw, opensubdiv, freetype, jemalloc +, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada; - postUnpack = + postPatch = '' - substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3 + substituteInPlace doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3 + substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' ''; cmakeFlags = From 775e8eb4a49e46072790d55f720464200c06d8d2 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 18:05:03 -0600 Subject: [PATCH 148/274] enca: 1.16 -> 1.19 --- pkgs/tools/text/enca/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 363446d409b..f1899b42b86 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, libiconv, recode }: stdenv.mkDerivation rec { - name = "enca-1.16"; + name = "enca-${version}"; + version = "1.19"; src = fetchurl { url = "http://dl.cihar.com/enca/${name}.tar.xz"; - sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw"; + sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s"; }; buildInputs = [ recode libiconv ]; - meta = { - homepage = http://freecode.com/projects/enca; + meta = with stdenv.lib; { description = "Detects the encoding of text files and reencodes them"; longDescription = '' @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { Unicode variants, independently on language. ''; - license = stdenv.lib.licenses.gpl2; - - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + }; } From a6c6d084303ef995a889c04e5f779429d757bc30 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 1 Mar 2017 03:16:35 +0300 Subject: [PATCH 149/274] samba test: fix race condition --- nixos/tests/samba.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index d6658ef0400..e446284fc0e 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -37,12 +37,11 @@ import ./make-test.nix ({ pkgs, ... }: testScript = '' $server->start; - $server->waitForUnit("samba-smbd"); - $server->waitForUnit("samba-nmbd"); + $server->waitForUnit("samba.target"); $server->succeed("mkdir -p /public; echo bar > /public/foo"); $client->start; - $client->waitForUnit("network.target"); + $client->waitForUnit("remote-fs.target"); $client->succeed("[[ \$(cat /public/foo) = bar ]]"); ''; }) From 5e074f10e1edd6684eb3d8c2cf924e2f265ff0cf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 11 Feb 2017 02:40:13 +0300 Subject: [PATCH 150/274] postgresql: remove redundant static libraries --- pkgs/servers/sql/postgresql/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a94d8d101d2..50101fc5ce8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -56,6 +56,14 @@ let # Prevent a retained dependency on gcc-wrapper. substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld + + # Remove static libraries in case dynamic are available. + for i in $out/lib/*.a; do + name="$(basename "$i")" + if [ -e "$lib/lib/''${name%.a}.so" ] || [ -e "''${i%.a}.so" ]; then + rm "$i" + fi + done ''; postFixup = lib.optionalString (!stdenv.isDarwin) From ab6d358ebf897a5fe32323072efd266e91fb0784 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 1 Mar 2017 01:43:44 +0100 Subject: [PATCH 151/274] openisns: fix empty lib output Looks like enable-shared defaults to false, so we actually ended up with no usable object files in the lib output. This also appears to have broken open-iscsi, as evinced by /nix/store/[...]-binutils-2.27/bin/ld: cannot find -lisns collect2: error: ld returned 1 exit status make[1]: *** [Makefile:57: iscsid] Error 1 https://hydra.nixos.org/build/49437400/log/raw With this patch, open-iscsi builds fine here. --- pkgs/os-specific/linux/open-isns/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index bb4ee5e9877..36cbd1581a6 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; outputInclude = "lib"; + configureFlags = [ "--enable-shared" ]; + installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns"; installTargets = "install install_hdrs install_lib"; From 38d9c0b88f33b64d94b2fd36d4b7c24420363c8a Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 19:21:59 -0600 Subject: [PATCH 152/274] ansifilter: 1.15 -> 2.4 --- pkgs/tools/text/ansifilter/default.nix | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index cf272f3bc81..921dbc22d41 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -1,28 +1,30 @@ { fetchurl, stdenv, pkgconfig, boost, lua }: -let version = "1.15"; - pkgsha = "65dc20cc1a03d4feba990f830186404c90462d599e5f4b37610d4d822d67aec4"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { name = "ansifilter-${version}"; - buildInputs = [ - pkgconfig boost lua - ]; + version = "2.4"; + src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = pkgsha; + sha256 = "c57cb878afa7191c7b7db3c086a344b4234df814aed632596619a4bda5941d48"; + }; - meta = { + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost lua ]; + + makeFlags = "PREFIX=$(out) conf_dir=/etc/ansifilter"; + + meta = with stdenv.lib; { description = "Tool to convert ANSI to other formats"; longDescription = '' - Tool to remove ANSI or convert them to another format - (HTML, TeX, LaTeX, RTF, Pango or BBCode) + Tool to remove ANSI or convert them to another format + (HTML, TeX, LaTeX, RTF, Pango or BBCode) ''; - license = stdenv.lib.licenses.gpl1; - maintainers = [ stdenv.lib.maintainers.Adjective-Object ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl1; + maintainers = maintainers.Adjective-Object; + platforms = platforms.linux; }; - - makeFlags="PREFIX=$(out) conf_dir=$(out)/etc/ansifilter/"; - } From 0e3cf999edd5118181bd1318fe104f1f820a2cac Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 19:30:26 -0600 Subject: [PATCH 153/274] xe: 0.5 -> 0.6.1 --- pkgs/tools/system/xe/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index 303374942c0..df8bb84a4f1 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -2,19 +2,22 @@ stdenv.mkDerivation rec { name = "xe-${version}"; - version = "0.5"; + version = "0.6.1"; + src = fetchFromGitHub { owner = "chneukirchen"; repo = "xe"; rev = "v${version}"; - sha256 = "0rv9npgjb695slql39asyp6znv9r3a6jbcsrsa1cmhk82iy4bljc"; + sha256 = "1dr3xlfq3zfdba1q96iags572lbk3z6s2179rs3pvsgkxn4m0qpf"; }; + makeFlags = "PREFIX=$(out)"; + meta = with lib; { description = "Simple xargs and apply replacement"; homepage = "https://github.com/chneukirchen/xe"; license = licenses.publicDomain; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan ndowens ]; }; } From fa03b8279fa9b544c29c97eaa5263163b6716046 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 1 Mar 2017 09:35:26 +0800 Subject: [PATCH 154/274] libbsd: 0.8.2 -> 0.8.3 --- pkgs/development/libraries/libbsd/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index b7ec7533880..44a1fd5b3e2 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: -let name = "libbsd-0.8.2"; -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "libbsd-${version}"; + version = "0.8.3"; src = fetchurl { url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj"; + sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk"; }; - meta = { + meta = with stdenv.lib; { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; }; } From f5c98a8a72cfa04be8032436a836cd65b6b4ee36 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 20:18:28 -0600 Subject: [PATCH 155/274] ioping: 0.9 -> 1.0 --- pkgs/tools/system/ioping/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index bd01dc8377b..92235fde8f3 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "ioping-${version}"; - version = "0.9"; - src = fetchurl { - url = "https://github.com/koct9i/ioping/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0pbp7b3304y9yyv2w41l3898h5q8w77hnnnq1vz8qz4qfl4467lm"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "koct9i"; + repo = "ioping"; + rev = "v${version}"; + sha256 = "0yn7wgd6sd39zmr5l97zd6sq1ah7l49k1h7dhgx0nv96fa4r2y9h"; }; makeFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { description = "Disk I/O latency measuring tool"; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin ndowens ]; platforms = platforms.unix; license = licenses.gpl3Plus; homepage = https://github.com/koct9i/ioping; From 516a7fc7bdd59b33f8501a2a95173e7522c8c641 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 1 Mar 2017 13:45:33 +0300 Subject: [PATCH 156/274] kmscon service: disable systemd-vconsole-setup cc #22470. --- nixos/modules/services/ttys/kmscon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index ba25f912844..8bad42927e3 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -76,7 +76,7 @@ in { ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service ''; - systemd.services.systemd-vconsole-setup.restartIfChanged = false; + systemd.services.systemd-vconsole-setup.enable = false; services.kmscon.extraConfig = mkIf cfg.hwRender '' drm From 6e9133fec1ea45b0852eda97d1ab02395ac090ef Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 1 Mar 2017 05:52:23 -0600 Subject: [PATCH 157/274] erlangR19: 19.2 -> 19.2.3 This fixes dialyzer for me. - http://erlang.org/pipermail/erlang-bugs/2017-January/005213.html - https://github.com/erlang/otp/commit/e27119948fc6ab28bea81019720bddaac5b655a7 --- pkgs/development/interpreters/erlang/R19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index d08c4e517cb..fc9db7d9bfb 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -21,7 +21,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.2"; + version = "19.2.3"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk"; + sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c"; }; buildInputs = From 1c4d8de99b5ee255d3a082b10e90cf472bb7ddea Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Mar 2017 07:41:08 -0500 Subject: [PATCH 158/274] nix-buffer: 1.2.3 -> 2.0.0 --- pkgs/applications/editors/emacs-modes/melpa-generated.nix | 6 +++--- .../editors/emacs-modes/melpa-stable-generated.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index f9aef05a4d7..9e403f5aaab 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -45566,12 +45566,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20160908.523"; + version = "20170301.417"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755"; - sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0"; + rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267"; + sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 99ac15d14f9..1b7035509d6 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -22123,12 +22123,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "1.2.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755"; - sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0"; + rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267"; + sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; From b67ce6baf9e0e3601d7d8c63ad8b1ab66f6145fb Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Tue, 28 Feb 2017 22:51:28 -0600 Subject: [PATCH 159/274] cockatrice: 2015-09-24 -> 2017-01-20 --- pkgs/games/cockatrice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 170778b72a9..3189f3946b7 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "cockatrice"; - version = "2015-09-24"; + version = "2017-01-20"; src = fetchurl { url = "https://github.com/Cockatrice/Cockatrice/archive/${version}-Release.tar.gz"; - sha256 = "068f93k3bg4cmdm0iyh2vfmk51nnzf3d6g6cvlm5q8dz1zk5nwzf"; + sha256 = "1gbcn8vffqdagidlamx670jxymhzaw28r4c6aqg3pq0s6by1l65f"; }; buildInputs = [ From fb81abdc7d91c525b8ccbce8827352b4be59db4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Mar 2017 09:27:51 +0100 Subject: [PATCH 160/274] cockatrice: add unstable version prefix --- pkgs/games/cockatrice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 3189f3946b7..fa3b906268d 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "${pname}-unstable-${version}"; pname = "cockatrice"; version = "2017-01-20"; From b8812dfeacf9f55605d03b61b7b4b8a627d44739 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Mar 2017 14:59:45 +0100 Subject: [PATCH 161/274] profanity: 0.5.0 -> 0.5.1 --- .../networking/instant-messengers/profanity/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index e556eeb7283..32f4f8f32b3 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "profanity-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "http://www.profanity.im/profanity-${version}.tar.gz"; - sha256 = "0s4njc4rcaii51qw1najxa0fa8bb2fnas00z47y94wdbdsmfhfvq"; + sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"; }; buildInputs = [ @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.devhell ]; + updateWalker = true; }; } From 614afce3a88bf845e1116f0f2958b4c111ca238e Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 08:29:46 -0600 Subject: [PATCH 162/274] dos2unix: 7.3.2 -> 7.3.4 (#23310) --- pkgs/tools/text/dos2unix/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index c4bb077ef23..338967e5b9a 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,24 +1,26 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "dos2unix-7.3.2"; - + name = "dos2unix-${version}"; + version = "7.3.4"; + src = fetchurl { url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "12c68c6wjnwrkyjj99fn6d0i4bf53aldj259lhjwq0g0nc5yxs67"; + sha256 = "1i9hbxn0br7xa18z4bjpkdv7mrzmbfxhm44mzpd07yd2qnxsgkcc"; }; configurePhase = '' - sed -i -e s,/usr,$out, Makefile - ''; + substituteInPlace Makefile \ + --replace /usr $out + ''; buildInputs = [ perl gettext ]; - meta = { + meta = with stdenv.lib; { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; description = "Tools to transform text files from dos to unix formats and vicervesa"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = licenses.bsd2; + maintainers = with maintainers; [viric ndowens ]; + }; } From 080b28054ad9a57d3f2d6f411d62c837c0fbb084 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 1 Mar 2017 15:39:13 +0100 Subject: [PATCH 163/274] haskellPackages.DPutils: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fc0edb9e6f3..2a8ae386b8f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -868,4 +868,7 @@ self: super: { # https://github.com/jswebtools/language-ecmascript/pull/81 language-ecmascript = doJailbreak super.language-ecmascript; + + # https://github.com/choener/DPutils/pull/1 + DPutils = doJailbreak super.DPutils; } From eea7819af80096919832228259db7053d7e2f41d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 1 Mar 2017 15:51:18 +0100 Subject: [PATCH 164/274] haskellPackages.gl: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2a8ae386b8f..50ce7434bab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -119,7 +119,7 @@ self: super: { diagrams = dontHaddock super.diagrams; either = dontHaddock super.either; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 - gl = dontHaddock super.gl; + gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unrleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133 groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; HaXml = dontHaddock super.HaXml; From 12ca09d14eaa837289eaba5fdf20b6c706475473 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 1 Mar 2017 15:56:16 +0100 Subject: [PATCH 165/274] haskellPackages.machines: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50ce7434bab..3ab5fcc015e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -119,7 +119,7 @@ self: super: { diagrams = dontHaddock super.diagrams; either = dontHaddock super.either; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 - gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unrleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133 + gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unreleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133 groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; HaXml = dontHaddock super.HaXml; @@ -871,4 +871,7 @@ self: super: { # https://github.com/choener/DPutils/pull/1 DPutils = doJailbreak super.DPutils; + + # fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0 + machines = doJailbreak super.machines; } From 0495b34782605f8e8836dfaf7d97ee18358cccb4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 1 Mar 2017 18:03:30 +0200 Subject: [PATCH 166/274] trinity: Apply upstream commit as a patch to fix build Needed since glibc 2.25. --- pkgs/os-specific/linux/trinity/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index a60175900cd..1a6719715d2 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, linuxHeaders }: +{ stdenv, fetchurl, fetchFromGitHub, linuxHeaders }: stdenv.mkDerivation rec { name = "trinity-${version}"; @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1jwgsjjbngn2dsnkflyigy3ajd0szksl30dlaiy02jc6mqi3nr0p"; }; - patchPhase = '' + patches = stdenv.lib.singleton (fetchurl { + url = "https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch"; + sha256 = "0468fdzbsj3n3k43qm8hf56pa020qn57ripcykv9jfwp215lf0an"; + }); + + postPatch = '' patchShebangs ./configure.sh patchShebangs ./scripts/ substituteInPlace Makefile --replace '/usr/bin/wc' 'wc' @@ -20,6 +25,8 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh"; + enableParallelBuilding = true; + installPhase = "make DESTDIR=$out install"; meta = with stdenv.lib; { From bae77363c33533be95a65fd086dac4e879013f24 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Mar 2017 11:00:07 -0500 Subject: [PATCH 167/274] nixBufferBuilders.withPackages: Fix buffer count logic --- pkgs/build-support/emacs/buffer.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index e366fd1f739..1cbac0709a6 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -12,15 +12,16 @@ ; Only set up nixpkgs buffer handling when we have some buffers active (defvar nixpkgs--buffer-count 0) (when (eq nixpkgs--buffer-count 0) + (make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer) ; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer (defun nixpkgs--around-generate (orig name) - (if (eq (aref name 0) ?\s) + (if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s)) (let ((buf (funcall orig name))) - (when (inherit-local-inherit-child buf) + (progn + (inherit-local-inherit-child buf) (with-current-buffer buf - (make-local-variable 'kill-buffer-hook) (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) - (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count))) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t))) buf) (funcall orig name))) (advice-add 'generate-new-buffer :around #'nixpkgs--around-generate) @@ -32,8 +33,7 @@ (fmakunbound 'nixpkgs--around-generate) (fmakunbound 'nixpkgs--decrement-buffer-count)))) (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) - (make-local-variable 'kill-buffer-hook) - (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t) ; Add packages to PATH and exec-path (make-local-variable 'process-environment) @@ -42,6 +42,9 @@ (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + (setq nixpkgs--is-nixpkgs-buffer t) + (inherit-local 'nixpkgs--is-nixpkgs-buffer) + ${lib.concatStringsSep "\n" extras} ''; } From a27bc8b3174fa1847b5ca9f85d921c3e472cbeb1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Mar 2017 11:03:00 -0500 Subject: [PATCH 168/274] haskell generic-builder: Pass through the ghcEnv. Will be useful for nix-buffer --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 42ea03693ec..7c3f6424193 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -303,7 +303,7 @@ stdenv.mkDerivation ({ passthru = passthru // { - inherit pname version; + inherit pname version ghcEnv; isHaskellLibrary = hasActiveLibrary; From fd770dd176918658de6fb72f3bc4ce88388c6427 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 1 Mar 2017 17:01:27 +0100 Subject: [PATCH 169/274] haskellPackages.OrderedBits: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3ab5fcc015e..adccc0c51f2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -874,4 +874,7 @@ self: super: { # fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0 machines = doJailbreak super.machines; + + # fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab + OrderedBits = doJailbreak super.OrderedBits; } From a3e432129762354c50f927eebe30d885c73ded8c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 1 Mar 2017 17:08:56 +0100 Subject: [PATCH 170/274] haskellPackages.rank1dynamic: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index adccc0c51f2..30be830f6b9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -877,4 +877,7 @@ self: super: { # fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab OrderedBits = doJailbreak super.OrderedBits; + + # https://github.com/haskell-distributed/rank1dynamic/issues/17 + rank1dynamic = doJailbreak super.rank1dynamic; } From b2919b454ff54451c21d68c0b17f4b946dd7ac88 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 1 Mar 2017 17:25:17 +0100 Subject: [PATCH 171/274] haskellPackages.cabal-lenses: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 30be830f6b9..cd88262c919 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -880,4 +880,6 @@ self: super: { # https://github.com/haskell-distributed/rank1dynamic/issues/17 rank1dynamic = doJailbreak super.rank1dynamic; + + cabal-lenses = doJailbreak super.cabal-lenses; } From d12030d17589bc19686d300748362b82c41950b4 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 20:38:22 -0600 Subject: [PATCH 172/274] hwinfo: 21.23 -> 21.38 --- pkgs/tools/system/hwinfo/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 57dfbbeeeb9..8dd95a8b4de 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, libx86emu, flex, perl }: +{ stdenv, fetchFromGitHub, libx86emu, flex, perl }: stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.23"; + version = "21.38"; - src = fetchurl { - url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz"; - sha256 = "1a8815zp3a7n2jx0cn0hcr69rfr6vmw8r8grbn5mv61g90bbcj6p"; + src = fetchFromGitHub { + owner = "opensuse"; + repo = "hwinfo"; + rev = "${version}"; + sha256 = "17a1nx906gdl9br1wf6xmhjy195szaxxmyb119vayw4q112rjdql"; }; patchPhase = '' @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { description = "Hardware detection tool from openSUSE"; license = licenses.gpl2; homepage = https://github.com/openSUSE/hwinfo; - maintainers = with maintainers; [ bobvanderlinden ]; + maintainers = with maintainers; [ bobvanderlinden ndowens ]; platforms = platforms.unix; }; } From f5e53aea5db571a9b03600cbb6e10621c5bdab6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Mar 2017 18:04:18 +0100 Subject: [PATCH 173/274] nixUnstable: 1.12pre4997_1351b0d -> 1.12pre5060_fa125b9 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 94cc7b9d2c4..742ddecf6dd 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -112,12 +112,12 @@ in rec { nixUnstable = lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre4997_1351b0d"; + suffix = "pre5060_fa125b9"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1351b0df87a0984914769c5dc76489618b3a3fec"; - sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1"; + rev = "fa125b9b28bea25a4eeb4d39a71a481563127cb9"; + sha256 = "1l7prlki3rjw3i119cizqqkpqg4p3hvym103x7hddimwpzwkw756"; }; fromGit = true; }); From 96d774747bb04a95f39f1336a56248012bd007fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 1 Mar 2017 18:01:40 +0100 Subject: [PATCH 174/274] simavr: 1.3 -> 1.5 (fixes build) --- pkgs/development/tools/simavr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 823f93f9ac4..82c2c131f07 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "simavr-${version}"; - version = "1.3"; + version = "1.5"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "buserror"; repo = "simavr"; - rev = "51d5fa69f9bc3d62941827faec02f8fbc7e187ab"; - sha256 = "0k8xwzw9i6xsmf98q43fxhphq0wvflvmzqma1n4jd1ym9wi48lfx"; + rev = "e0d4de41a72520491a4076b3ed87beb997a395c0"; + sha256 = "0b2lh6l2niv80dmbm9xkamvnivkbmqw6v97sy29afalrwfxylxla"; }; buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}"; From b0cff509837789ce732a648c1b37bccc9b302af4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Mar 2017 12:59:48 -0500 Subject: [PATCH 175/274] nix-buffer: 2.0.0 -> 2.1.0 --- pkgs/applications/editors/emacs-modes/melpa-generated.nix | 6 +++--- .../editors/emacs-modes/melpa-stable-generated.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 9e403f5aaab..6f67650e763 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -45566,12 +45566,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170301.417"; + version = "20170301.951"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267"; - sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip"; + rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821"; + sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 1b7035509d6..b9d306d6a0a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -22123,12 +22123,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267"; - sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip"; + rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821"; + sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; From c153036525575d046fc808a4805d023e3e2e9e75 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Mar 2017 13:00:57 -0500 Subject: [PATCH 176/274] haskell generic-builder: Pass through the list of haskell build inputs. Useful for building custom envs. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7c3f6424193..964f569ef67 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -303,7 +303,7 @@ stdenv.mkDerivation ({ passthru = passthru // { - inherit pname version ghcEnv; + inherit pname version ghcEnv haskellBuildInputs; isHaskellLibrary = hasActiveLibrary; From c393512809513a88e55e060abd1248e6f5a688d7 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 19:10:08 -0600 Subject: [PATCH 177/274] catdoc: 0.94.2 -> 0.95 --- pkgs/tools/text/catdoc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 2865e5b3482..b9db2eba5cd 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "catdoc-0.94.2"; + name = "catdoc-${version}"; + version = "0.95"; + src = fetchurl { url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz"; - sha256 = "0qnk8fw3wc40qa34yqz51g0knif2jd78a4717nvd3rb46q88pj83"; + sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796"; }; configureFlags = "--disable-wordview"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; - license = stdenv.lib.licenses.gpl2; - maintainers = [ maintainers.urkud ]; + license = licenses.gpl2; + maintainers = with maintainers; [ urkud ndowens ]; }; } From 3001b821c9b4908d7060b9e384ccae620107a25f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Mar 2017 19:56:08 +0100 Subject: [PATCH 178/274] haskell generic-builder: Revert "Pass through the list of haskell build inputs." This reverts commit c153036525575d046fc808a4805d023e3e2e9e75. Please don't add random stuff to the interface provided by the generic builder without coordinating with others. There is a proper effort underway to provide that information in https://github.com/NixOS/nixpkgs/pull/23023. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 964f569ef67..7c3f6424193 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -303,7 +303,7 @@ stdenv.mkDerivation ({ passthru = passthru // { - inherit pname version ghcEnv haskellBuildInputs; + inherit pname version ghcEnv; isHaskellLibrary = hasActiveLibrary; From feffadefed82290a536c5436e81840f317a87e91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Mar 2017 19:56:59 +0100 Subject: [PATCH 179/274] haskell generic-builder: Revert "Pass through the ghcEnv." This reverts commit a27bc8b3174fa1847b5ca9f85d921c3e472cbeb1. Please don't add random stuff to the interface provided by the generic builder without coordinating with others. There is a proper effort underway to provide that information in https://github.com/NixOS/nixpkgs/pull/23023. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7c3f6424193..42ea03693ec 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -303,7 +303,7 @@ stdenv.mkDerivation ({ passthru = passthru // { - inherit pname version ghcEnv; + inherit pname version; isHaskellLibrary = hasActiveLibrary; From 204850c975511cc1420d704ed3686ec3c1c5dcce Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 13:09:43 -0600 Subject: [PATCH 180/274] di: 4.42 -> 4.43 --- pkgs/tools/system/di/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index baacfe6969e..3e00ee795ff 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "di-4.42"; + name = "di-${version}"; + version = "4.43"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "1i6m9zdnidn8268q1lz9fd8payk7s4pgwh5zlam9rr4dy6h6a67n"; + sha256 = "1q25jy51qfzsym9b2w0cqzscq2j492gn60dy6gbp88m8nwm4sdy8"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { description = "Disk information utility; displays everything 'df' does and more"; homepage = http://www.gentoo.com/di/; license = licenses.zlib; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru ndowens ]; platforms = platforms.all; }; } From a5ed11202c772b2da8d2208b1574668a4bb608ad Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Mar 2017 20:11:02 +0100 Subject: [PATCH 181/274] svtplay-dl: 1.9.2 -> 1.9.3 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 1713977d20a..a2d6caa1535 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests2 mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1ajbflywfc3nfjqp95izbnxrbqjm4v56gx0am2mj0z0ypds2dvm5"; + sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw"; }; pythonPaths = [ pycrypto requests2 ]; From 337356448a9ce7f6ca4ba345af76b8625e4eb2c7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Mar 2017 20:11:20 +0100 Subject: [PATCH 182/274] perl-Log-Log4perl: 1.48 -> 1.49 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3689f49c631..db37a83154e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7561,10 +7561,10 @@ let self = _self // overrides; _self = with self; { }; LogLog4perl = buildPerlPackage rec { - name = "Log-Log4perl-1.48"; + name = "Log-Log4perl-1.49"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz"; - sha256 = "cf6e9fc1f9183fabbe540d84f603c6541458034092b7c53e41008093db62dc98"; + sha256 = "b739187f519146cb6bebcfc427c64b1f4138b35c5f4c96f46a21ed4a43872e16"; }; meta = { homepage = https://mschilli.github.io/log4perl/; From 3df8bef60e97522de0b52e54e37fd7514bcc4062 Mon Sep 17 00:00:00 2001 From: ndowens Date: Tue, 28 Feb 2017 18:45:06 -0600 Subject: [PATCH 183/274] discount: 2.2.0 -> 2.2.2 Discount: added missing update --- pkgs/tools/text/discount/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 4112ee891b5..1fe905c98f8 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl}: + stdenv.mkDerivation rec { - version = "2.2.0"; + version = "2.2.2"; name = "discount-${version}"; src = fetchurl { url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; - sha256 = "1wxrv86xr8cacwhzkyzmfxg58svfnn3swbpbk5hq621ckk19alxj"; + sha256 = "0r4gjyk1ngx47zhb25q0gkjm3bz2m5x8ngrk6rim3y1y3rricygc"; }; + patches = ./fix-configure-path.patch; configureScript = "./configure.sh"; @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { description = "Implementation of Markdown markup language in C"; homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; - maintainers = [ maintainers.shell ]; + maintainers = with maintainers; [ shell ndowens ]; platforms = platforms.unix; }; } From d9bc4145212b103275f402b14ce989e42b35d992 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 13:38:11 -0600 Subject: [PATCH 184/274] augeas: 1.5.0 -> 1.7.0 --- pkgs/tools/system/augeas/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index c8a4c2616de..63bb8c1f985 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.5.0"; + version = "1.7.0"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "0gzpafrflkr0incq58vjkabfncrpc97d7mdgglkr57iyzvkbcfr2"; + sha256 = "0qwpjz23z1x7dkf5k2y9f1cppryzhx4hpxprla6a4yvzs1smacdr"; }; - - buildInputs = [ pkgconfig readline libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libxml2 ]; meta = with stdenv.lib; { description = "Configuration editing tool"; license = licenses.lgpl2; homepage = http://augeas.net/; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ndowens ]; platforms = platforms.unix; }; } From fff88b814c6bec72aee960e843d14936317a5e09 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 28 Feb 2017 14:14:24 -0600 Subject: [PATCH 185/274] graphicsmagick: fix for darwin Prior to this change, GraphicsMagick didn't work at all for me on Darwin, due to dylib linking issues. --- pkgs/applications/graphics/graphicsmagick/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 4b75d0ccc6b..f655979c2cc 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8 }: +, libwebp, quantumdepth ? 8, fixDarwinDylibNames }: let version = "1.3.25"; in @@ -53,7 +53,8 @@ stdenv.mkDerivation { buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 zlib libtool libwebp - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; nativeBuildInputs = [ xz ]; From 8dcfa44a538396939f5b777b1ef43a453aeecaa6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 1 Mar 2017 22:18:28 +0200 Subject: [PATCH 186/274] memtest86: Mark as broken It fails with hardening-related errors like: reloc.o: In function `.L41': reloc.c:(.text+0x452): undefined reference to `__stack_chk_fail_local' ... and several others as well! Since nobody has noticed that this package has been broken the entire 16.09 release, it's probably not worth to try fixing it. (Note that this is a different package from memtest86plus!) --- pkgs/tools/misc/memtest86/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 6fccff7781d..810bc36fb72 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { meta = { homepage = http://memtest86.com/; description = "A tool to detect memory errors, to be run from a bootloader"; + broken = true; }; } From 085502dd8084998a295323b8ba0802b211da0e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Wed, 1 Mar 2017 21:46:49 +0100 Subject: [PATCH 187/274] cytoscape: fixed issue with startup script --- pkgs/applications/science/misc/cytoscape/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 3eaf91be58f..6b13d969bdd 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ln -s $out/share/cytoscape.sh $out/bin/cytoscape - wrapProgram $out/share/gen_vmoptions.sh \ + wrapProgram $out/share/cytoscape.sh \ --set JAVA_HOME "${jre}" \ --set JAVA "${jre}/bin/java" From fcec3e1c72ad7ac7eaacd00c8fc87dc04696fdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Mar 2017 18:20:22 +0100 Subject: [PATCH 188/274] Revert "modules: add support for module replacement with disabledModules" This reverts commit 3f2566689d14f1d7778d55ca807d1dad2f4695d1 for now. Evaluation of the tested job got broken, blocking nixos-unstable. --- lib/modules.nix | 24 ++---- lib/tests/modules.sh | 8 -- lib/tests/modules/default.nix | 1 - lib/tests/modules/disable-declare-enable.nix | 5 -- lib/tests/modules/disable-define-enable.nix | 5 -- lib/tests/modules/disable-enable-modules.nix | 5 -- .../manual/development/replace-modules.xml | 75 ------------------- .../manual/development/writing-modules.xml | 1 - nixos/doc/manual/release-notes/rl-1703.xml | 10 --- 9 files changed, 7 insertions(+), 127 deletions(-) delete mode 100644 lib/tests/modules/disable-declare-enable.nix delete mode 100644 lib/tests/modules/disable-define-enable.nix delete mode 100644 lib/tests/modules/disable-enable-modules.nix delete mode 100644 nixos/doc/manual/development/replace-modules.xml diff --git a/lib/modules.nix b/lib/modules.nix index de9cfc637ae..4eee41306cd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -20,8 +20,7 @@ rec { , prefix ? [] , # This should only be used for special arguments that need to be evaluated # when resolving module structure (like in imports). For everything else, - # there's _module.args. If specialArgs.modulesPath is defined it will be - # used as the base path for disabledModules. + # there's _module.args. specialArgs ? {} , # This would be remove in the future, Prefer _module.args option instead. args ? {} @@ -59,7 +58,10 @@ rec { closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs); - options = mergeModules prefix (filterModules (specialArgs.modulesPath or "") closed); + # Note: the list of modules is reversed to maintain backward + # compatibility with the old module system. Not sure if this is + # the most sensible policy. + options = mergeModules prefix (reverseList closed); # Traverse options and extract the option values into the final # config set. At the same time, check whether all option @@ -85,16 +87,6 @@ rec { result = { inherit options config; }; in result; - - # Filter disabled modules. Modules can be disabled allowing - # their implementation to be replaced. - filterModules = modulesPath: modules: - let - moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m; - disabledKeys = map moduleKey (concatMap (m: m.disabledModules) modules); - in - filter (m: !(elem m.key disabledKeys)) modules; - /* Close a set of modules under the ‘imports’ relation. */ closeModules = modules: args: let @@ -119,13 +111,12 @@ rec { else {}; in if m ? config || m ? options then - let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in + let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file" "meta"]; in if badAttrs != {} then throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'." else { file = m._file or file; key = toString m.key or key; - disabledModules = m.disabledModules or []; imports = m.imports or []; options = m.options or {}; config = mkMerge [ (m.config or {}) metaSet ]; @@ -133,10 +124,9 @@ rec { else { file = m._file or file; key = toString m.key or key; - disabledModules = m.disabledModules or []; imports = m.require or [] ++ m.imports or []; options = {}; - config = mkMerge [ (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]) metaSet ]; + config = mkMerge [ (removeAttrs m ["key" "_file" "require" "imports"]) metaSet ]; }; applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index ba0c67fb7d4..8b476a5d3dc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -99,14 +99,6 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-if-foo-enabl checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enable.nix checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix -# Check disabledModules with config definitions and option declarations. -set -- config.enable ./define-enable.nix ./declare-enable.nix -checkConfigOutput "true" "$@" -checkConfigOutput "false" "$@" ./disable-define-enable.nix -checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix -checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix -checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix - # Check _module.args. set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@" diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix index 5b094710419..c5ce9cb3e3b 100644 --- a/lib/tests/modules/default.nix +++ b/lib/tests/modules/default.nix @@ -3,6 +3,5 @@ { inherit (lib.evalModules { inherit modules; - specialArgs.modulesPath = ./.; }) config options; } diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix deleted file mode 100644 index a373ee7e550..00000000000 --- a/lib/tests/modules/disable-declare-enable.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - disabledModules = [ ./declare-enable.nix ]; -} diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix deleted file mode 100644 index 0d84a7c3cb6..00000000000 --- a/lib/tests/modules/disable-define-enable.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - disabledModules = [ ./define-enable.nix ]; -} diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix deleted file mode 100644 index c325f4e0743..00000000000 --- a/lib/tests/modules/disable-enable-modules.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - disabledModules = [ "define-enable.nix" "declare-enable.nix" ]; -} diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml deleted file mode 100644 index cc0539ec510..00000000000 --- a/nixos/doc/manual/development/replace-modules.xml +++ /dev/null @@ -1,75 +0,0 @@ -
- -Replace Modules - -Modules that are imported can also be disabled. The option - declarations and config implementation of a disabled module will be - ignored, allowing another to take it's place. This can be used to - import a set of modules from another channel while keeping the rest - of the system on a stable release. -disabledModules is a top level attribute like - imports, options and - config. It contains a list of modules that will - be disabled. This can either be the full path to the module or a - string with the filename relative to the modules path - (eg. <nixpkgs/nixos/modules> for nixos). - - -This example will replace the existing postgresql module with - the version defined in the nixos-unstable channel while keeping the - rest of the modules and packages from the original nixos channel. - This only overrides the module definition, this won't use postgresql - from nixos-unstable unless explicitly configured to do so. - - -{ config, lib, pkgs, ... }: - -{ - disabledModules = [ "services/databases/postgresql.nix" ]; - - imports = - [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable - <nixos-unstable/nixos/modules/services/databases/postgresql.nix> - ]; - - services.postgresql.enable = true; -} - - -This example shows how to define a custom module as a - replacement for an existing module. Importing this module will - disable the original module without having to know it's - implementation details. - - -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.programs.man; -in - -{ - disabledModules = [ "services/programs/man.nix" ]; - - options = { - programs.man.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable manual pages."; - }; - }; - - config = mkIf cfg.enabled { - warnings = [ "disabled manpages for production deployments." ]; - }; -} - - -
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 5bdcad5ceb5..ef6920160e6 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -179,6 +179,5 @@ in { - diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index cea8b93b075..fda46217144 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -261,16 +261,6 @@ following incompatible changes: - - - Modules can now be disabled by using - disabledModules, allowing another to take it's place. This can be - used to import a set of modules from another channel while keeping the - rest of the system on a stable release. - - - Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. From b12b4eaca6f2016af3dedb5e049dea0fc6898540 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Mar 2017 23:34:37 +0100 Subject: [PATCH 189/274] phc-intel: 0.4.0-rev22 -> 0.4.0-rev24 Fixes Hydra failures on kernel >= 4.10 by only supporting kernel >= 4.10. --- pkgs/os-specific/linux/phc-intel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index cb320111017..85edfa41fa2 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -2,20 +2,20 @@ assert stdenv.isLinux; # Don't bother with older versions, though some might even work: -assert stdenv.lib.versionAtLeast kernel.version "4.3"; +assert stdenv.lib.versionAtLeast kernel.version "4.10"; # Disable on grsecurity kernels, which break module building: assert !kernel.features ? grsecurity; let release = "0.4.0"; - revbump = "rev22"; # don't forget to change forum download id... + revbump = "rev24"; # don't forget to change forum download id... in stdenv.mkDerivation rec { name = "linux-phc-intel-${version}-${kernel.version}"; version = "${release}-${revbump}"; src = fetchurl { - sha256 = "f80285a8cd2ebb1753841e493af0c091d55c33823777b26a93d25ed7264a385d"; - url = "http://www.linux-phc.org/forum/download/file.php?id=172"; + sha256 = "02b4j8ap1fy09z36pmpplbw4vpwqdi16jyzw5kl0a60ydgxkmrpz"; + url = "http://www.linux-phc.org/forum/download/file.php?id=178"; name = "phc-intel-pack-${revbump}.tar.bz2"; }; From fdd436b3e4029b8341e9e7af1c546d758c0ff9f2 Mon Sep 17 00:00:00 2001 From: David Terry Date: Wed, 1 Mar 2017 23:35:05 +0100 Subject: [PATCH 190/274] vscode: 1.9.1 -> 1.10.0 --- pkgs/applications/editors/vscode/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 816a310f758..a92f8633c3a 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,24 +2,24 @@ makeWrapper, libXScrnSaver }: let - version = "1.9.1"; - rev = "f9d0c687ff2ea7aabd85fb9a43129117c0ecf519"; + version = "1.10.0"; + rev = "49129d126e2c3c5592cfc8a509d872067b69d262"; channel = "stable"; # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465): # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null - sha256 = if stdenv.system == "i686-linux" then "03lv792rkb1hgn1knd8kpic7q07cd194cr4fw1bimnjblrvyy586" - else if stdenv.system == "x86_64-linux" then "1vrcb4y2y83bhxx9121afwbzm8yddfin4zy3nyxfi805pjmszwjm" - else if stdenv.system == "x86_64-darwin" then "0s92ing4m2qyqdkpmkhl2zj40hcdsr5x764sb6zprwwhfv4npymr" + sha256 = if stdenv.system == "i686-linux" then "14ip00ysnn6daw7ws3vgnhib18pi7r1z1szfr7s996awbq12ir3i" + else if stdenv.system == "x86_64-linux" then "1krrshsx2pjkr4pc1d6zad664f5khdbhwaq8lpx1aagxxd921mx6" + else if stdenv.system == "x86_64-darwin" then "1y574b4wpkk06a36clajx57ydj7a0scn2gms4070cqaf0afzy19f" else throw "Unsupported system: ${stdenv.system}"; urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-${channel}-code_${version}-1486596246_i386.tar.gz" + urlBase + "code-${channel}-code_${version}-1488384152_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-${channel}-code_${version}-1486597190_amd64.tar.gz" + urlBase + "code-${channel}-code_${version}-1488387854_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then urlBase + "VSCode-darwin-${channel}.zip" else throw "Unsupported system: ${stdenv.system}"; From 32cf5c4d02d3bbdba02d4b8b5b647ce5afdf9053 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 16:53:30 -0600 Subject: [PATCH 191/274] speedtest-cli: 0.3.4 -> 1.0.2 --- pkgs/tools/networking/speedtest-cli/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index b82e1e337a7..ac23635441d 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "0.3.4"; + version = "1.0.2"; - src = fetchurl { - url = "mirror://pypi/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; - sha256 = "19i671cd815fcv0x7h2m0a493slzwkzn7r926g8myx1srkss0q6d"; + src = fetchFromGitHub { + owner = "sivel"; + repo = "speedtest-cli"; + rev = "v${version}"; + sha256 = "1p7lavw95w3as9b2b55i61mwxdr1b6jj40yly91f9j26ywr5dpkg"; }; meta = with stdenv.lib; { @@ -14,6 +16,6 @@ pythonPackages.buildPythonApplication rec { description = "Command line interface for testing internet bandwidth using speedtest.net"; platforms = platforms.all; license = licenses.asl20; - maintainers = [ maintainers.domenkozar ]; + maintainers = with maintainers; [ domenkozar ndowens ]; }; } From 05054e34c0a68a60f132756985bdee769c9023c0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 1 Mar 2017 23:39:15 +0100 Subject: [PATCH 192/274] tor: 0.2.9.9 -> 0.2.9.10 The 0.2.9 series is now a long-term support release, which will receive backported security fixes until at least 2020. tor should now build against libressl, as in ```nix tor.override { openssl = libressl; } ``` Also re-enable the test-suite; works fine on my end. --- pkgs/tools/security/tor/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 41cb399cb9f..25f80a16fea 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.2.9.9"; + name = "tor-0.2.9.10"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0hqdk5p6dw4bpn7c8gmhyi8jjkhc37112pfw5nx4gl0g4lmmscik"; + sha256 = "0h8kpn42mgpkzmnga143hi8nh0ai65ypxh7qhkwbb15j3wz2h4fn"; }; nativeBuildInputs = [ pkgconfig ]; @@ -22,9 +22,7 @@ stdenv.mkDerivation rec { --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks' ''; - # Fails in a sandboxed environment; at some point we want to disable - # just the tests that require networking. - doCheck = false; + doCheck = true; meta = with stdenv.lib; { homepage = https://www.torproject.org/; From 2c0225add688f5c62d8011e494af6efdc2c3f660 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 1 Mar 2017 16:05:04 -0500 Subject: [PATCH 193/274] mesos: fix build with latest gcc/glibc /cc #23253 --- pkgs/applications/networking/cluster/mesos/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 818848f6a7f..651d00e5710 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -58,6 +58,16 @@ in stdenv.mkDerivation rec { # if we dynamically link the lib, we get these errors: # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684 preConfigure = '' + # https://issues.apache.org/jira/browse/MESOS-6616 + configureFlagsArray+=( + "CXXFLAGS=-O2 -Wno-error=strict-aliasing" + ) + + # Fix cases where makedev(),major(),minor() are referenced through + # instead of + sed 1i'#include ' -i src/linux/fs.cpp + sed 1i'#include ' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp + substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \ --subst-var-by chown ${coreutils}/bin/chown From aa429e677583e02785a96221e27e59590cf526b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 2 Mar 2017 01:24:39 +0100 Subject: [PATCH 194/274] ipfs: 0.4.5 -> 0.4.6 --- pkgs/applications/networking/ipfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 40ac0917797..a00aebef296 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.5"; - rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064"; + version = "0.4.6"; + rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d"; + sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47"; + sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13"; }; meta = with stdenv.lib; { From 256e7642264e2c29fbf2827a4d16d8db74ed114d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 2 Mar 2017 02:27:43 +0200 Subject: [PATCH 195/274] radeontools: Mark as broken The upstream release is from 2004. The website of this software talks about configuring XFree86. I *highly* doubt this software is of any use nowadays. --- pkgs/os-specific/linux/radeontools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 92e00ffad3f..81e5a2af9cd 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; homepage = http://fdd.com/software/radeon/; license = stdenv.lib.licenses.zlib; + broken = true; }; } From 9d30abf7b201b6144883815fccf904e83555334b Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 18:43:26 -0600 Subject: [PATCH 196/274] miniupnpc: 1.9.20150430 -> 2.0.20161216 --- pkgs/tools/networking/miniupnpc/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index e5b6ea396fe..42fe2db7a4e 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,23 +1,21 @@ { stdenv, fetchurl }: -let version = "1.9.20150430"; in stdenv.mkDerivation rec { name = "miniupnpc-${version}"; + version = "2.0.20161216"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; - name = "${name}.tar.gz"; - }; + sha256 = "0gpxva9jkjvqwawff5y51r6bmsmdhixl3i5bmzlqsqpwsq449q81"; + }; - patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; + patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; - doCheck = !stdenv.isFreeBSD; + doCheck = !stdenv.isFreeBSD; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; meta = { - inherit version; homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = with stdenv.lib.platforms; linux ++ freebsd; From ef4775c2a7b54877a7fac00a3d52a6f3539342c5 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 19:12:00 -0600 Subject: [PATCH 197/274] httping: 2.4 -> 2.5 --- pkgs/tools/networking/httping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 00f7bde429f..36627b4e7a4 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "httping-${version}"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "http://www.vanheusden.com/httping/${name}.tgz"; - sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs"; + sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; buildInputs = [ fftw ncurses openssl ]; From 2ff72c684d6da79272b96c4a87573d10881ec51e Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 19:18:29 -0600 Subject: [PATCH 198/274] hans: 0.4.4 -> 1.0 --- pkgs/tools/networking/hans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 0e838a896cb..2e84aa96007 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "hans-${version}"; - version = "0.4.4"; + version = "1.0"; src = fetchFromGitHub { - sha256 = "1xskffmmdmg1whlrl5wpkv9z29vh0igrbmsz0b45s9v0761a7kis"; + sha256 = "1qnfl7wr5x937b6jx3vhhvnwnrclrqvq7d7zxbfhk74pdwnjy8n4"; rev = "v${version}"; repo = "hans"; owner = "friedrich"; From 439facec2aa535e1da045860d71a4c9bc29ddb7f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 2 Mar 2017 03:59:31 +0200 Subject: [PATCH 199/274] lkl: Broken on i686 http://hydra.nixos.org/build/49534265 --- pkgs/applications/virtualization/lkl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index a307099783e..398c269d074 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead"; - platforms = platforms.linux; # Darwin probably works too but I haven't tested it + platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; }; From 83462da2961a653f3958eaef8bbe80212ac25e8f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 1 Mar 2017 23:10:03 +0100 Subject: [PATCH 200/274] eztrace: add missing dependency --- pkgs/development/tools/profiling/EZTrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 2c9b435682d..004e5dbd46e 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, libelf, gfortran, zlib, binutils }: +{ stdenv, fetchurl, autoconf, libelf, libiberty, gfortran, zlib, binutils }: stdenv.mkDerivation rec { version = "1.0.6"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { export ac_cv_func_malloc_0_nonnull=yes ''; - buildInputs = [ autoconf libelf gfortran zlib binutils ]; + buildInputs = [ autoconf libelf libiberty gfortran zlib binutils ]; meta = { description = "Tool that aims at generating automatically execution trace from HPC programs"; From ad25011ba15d84949adde86468268dde551b5943 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 20:09:46 -0600 Subject: [PATCH 201/274] connect: 1.104 -> 1.105 --- pkgs/tools/networking/connect/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 5ccbc8d0cae..387987c588a 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl }: -let - - version = "1.104"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "connect-${version}"; - + version ="1.105"; + src = fetchurl { url = "https://bitbucket.org/gotoh/connect/get/${version}.tar.bz2"; - sha256 = "0h7bfh1b2kcw5ddpbif57phdxpf8if0cm01pgwc6avp6dqxcsqp2"; + sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7"; }; makeFlags = [ "CC=cc" ]; # gcc and/or clang compat From 82d3f926a98a4a5088fac7828efe4a25b088ecd1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 1 Mar 2017 22:33:33 -0500 Subject: [PATCH 202/274] fakeroot: add darwin support replace utillinux with getopt Fixes #22773 --- pkgs/tools/system/fakeroot/default.nix | 27 +++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 7995a656c1e..5286b6b2cbc 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, utillinux, libcap }: +{ stdenv, fetchurl, fetchpatch, getopt, libcap }: stdenv.mkDerivation rec { version = "1.20.2"; @@ -9,7 +9,28 @@ stdenv.mkDerivation rec { sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw"; }; - buildInputs = [ utillinux /* provides getopt */ libcap ]; + # patchset from brew + patches = stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; + sha256 = "1m6ggrqwqy0in264sxqk912vniipiw629dxq7kibakvsswfk6bkk"; + }) + (fetchpatch { + name = "0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch;att=2;bug=766649"; + sha256 = "0rhayp42x4i1a6yc4d28kpshmf7lrmaprq64zfrjpdn4kbs0rkln"; + }) + (fetchpatch { + name = "fakeroot-always-pass-mode.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20"; + sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p"; + }) + ]; + + buildInputs = [ getopt ] + ++ stdenv.lib.optional (!stdenv.isDarwin) libcap + ; postUnpack = '' for prog in getopt; do @@ -22,7 +43,7 @@ stdenv.mkDerivation rec { description = "Give a fake root environment through LD_PRELOAD"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.unix; }; } From 1fbcce4448a99b2cf909670b49834cdb74dfb156 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Mar 2017 11:39:55 +0800 Subject: [PATCH 203/274] dropbox: 19.4.13 -> 20.4.19 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index a083b17dcb0..628905a6b05 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "19.4.13"; + version = "20.4.19"; sha256 = { - "x86_64-linux" = "06lgmjj204xpid35cqrp2msasg4s4w6lf1zpz1lnk3f9x6q10254"; - "i686-linux" = "1kdj3c5s8s4smd52p2mqbzjsk68a9cd5f8x92xgsx9zzdzjqmagl"; + "x86_64-linux" = "1970zrvk2pbs7fa7q4rqc8c1vvsvcris8ybnihazh5pqii91s16l"; + "i686-linux" = "1p3fdjrin5v9ifz6lba1pvb2pw3nmsiqq0jp56vgdk5jzmky23km"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From e60805061b313fad4e4e3544a3c128df7dda5ace Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 9 Jan 2017 03:30:05 -0500 Subject: [PATCH 204/274] pythonPackages.pyhepmc: init at 0.5.0 --- .../python-modules/pyhepmc_export_edges.patch | 204 ++++++++++++++++++ .../python-modules/pyhepmc_export_flow.patch | 20 ++ pkgs/top-level/python-packages.nix | 35 +++ 3 files changed, 259 insertions(+) create mode 100644 pkgs/development/python-modules/pyhepmc_export_edges.patch create mode 100644 pkgs/development/python-modules/pyhepmc_export_flow.patch diff --git a/pkgs/development/python-modules/pyhepmc_export_edges.patch b/pkgs/development/python-modules/pyhepmc_export_edges.patch new file mode 100644 index 00000000000..5c6e56566a3 --- /dev/null +++ b/pkgs/development/python-modules/pyhepmc_export_edges.patch @@ -0,0 +1,204 @@ +# HG changeset patch +# User Lukas Heinrich +# Date 1430606843 14400 +# Node ID 325f89b7b72922e9add9ca9dd0f7ca4a6c83bf00 +# Parent e4fd953257e0d38511f2177de7ffaef662358af2 +add incoming/outgoing generators for GenVertex + +diff --git a/hepmc/generators.i b/hepmc/generators.i +new file mode 100644 +--- /dev/null ++++ b/hepmc/generators.i +@@ -0,0 +1,171 @@ ++/*! ++ * \file generators.i ++ * \author Seth R. Johnson ++ * \brief Define generator/iterator for any type ++ ++Example: ++\code ++ SETUP_GENERATOR( std::vector::const_iterator ) ++ ADD_GENERATOR( Mesh, cells, ++ std::vector::const_iterator, Cell, beginCells, endCells) ++\endcode ++would be a method to add a \c cells generator method method to the Python class ++\c Mesh, when the C++ class \c Mesh has a \c std::vector accessed through ++methods \c beginCells and \c endCells. ++ ++The macro \c ADD_GENERATOR_P would be if the underlying storage were \c ++std::vector instead. ++ ++Alternatively, for containers of regular objects that provide \c begin(), \c end(), and \c const_iterator, you can use the \c ADD_CONTAINER_ITERATOR macro: ++\code ++ADD_CONTAINER_ITERATOR( QuadratureSet ) ++\endcode ++ ++\section License ++ ++Copyright (c) 2010, Seth R. Johnson ++All rights reserved. ++ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++ * Redistributions of source code must retain the above copyright notice, this ++ list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright notice, ++ this list of conditions and the following disclaimer in the documentation ++ and/or other materials provided with the distribution. ++ * Neither the name of the this project nor the names of its contributors ++ may be used to endorse or promote products derived from this software ++ without specific prior written permission. ++ ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++ This material is based upon work supported under a National Science ++ Foundation Graduate Research Fellowship. Any opinions, findings, conclusions ++ or recommendations expressed in this publication are those of the author ++ and do not necessarily reflect the views of the National Science ++ Foundation. ++*/ ++#ifndef tools_SWIG_generators_i ++#define tools_SWIG_generators_i ++/*----------------------------------------------------------------------------*/ ++ ++// Add a Python class to provide iterator objects ++%insert("python") %{ ++class GenericIterator: ++ def __init__(self, begin_iter_method, deref_method, incr_method): ++ self.it = begin_iter_method() ++ self.incr = incr_method ++ self.deref = deref_method ++ ++ def __iter__(self): ++ return self ++ ++ def next(self): ++ obj = self.deref( self.it ) ++ if obj is not None: ++ self.incr( self.it ) ++ return obj ++ else: ++ raise StopIteration ++%} ++ ++//============== GENERIC GENERATOR/ITERATOR WRAPPER SUPPORT ============ ++//! Thin wrapper for incrementing a certain type of iterator ++// only need to define once per iterator type, and we can use the same name ++// thanks to overloading (even though this may decrease efficiency) ++%define SETUP_GENERATOR( ITERATOR... ) ++%inline %{ ++void _iter_incr( ITERATOR* iter ) ++{ ++ ++(*iter); ++} ++%} ++%enddef ++ ++/*----------------------------------------------------------------------------*/ ++// Internal method for adding common parts of the generator ++%define PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) ++ %extend CLASS { ++%insert("python") %{ ++ def PYMETHOD(self): ++ "Returns an iterator for PYMETHOD." ++ return GenericIterator( ++ self._begin_ ## PYMETHOD, ++ self._deref_ ## PYMETHOD, ++ _iter_incr ++ ) ++%} ++// get the first element in the vector ++ITERATOR* _begin_ ## PYMETHOD() ++{ ++ return new ITERATOR( ($self)->CBEGIN() ); ++} ++ } ++%enddef ++/*----------------------------------------------------------------------------*/ ++// If the dereferenced iterator is an object ++%define ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND ) ++ ++// add the python and begin method ++PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) ++ ++ %extend CLASS { ++//! Dereference the iterator; return NULL if at the end ++const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter ) ++{ ++ // if at the end, return NULL ++ if (*iter == ($self)->CEND() ) { ++ return NULL; ++ } ++ // otherwise, return the POINTER to the dereferenced iterator ++ return &(**iter); ++} ++ } ++%enddef ++/*----------------------------------------------------------------------------*/ ++// If the dereferenced iterator is a pointer ++%define ADD_GENERATOR_P( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND ) ++ ++// add the python and begin method ++PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) ++ ++ %extend CLASS { ++//! Dereference the iterator; return NULL if at the end ++const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter ) ++{ ++ // if at the end, return NULL ++ if (*iter == ($self)->CEND() ) { ++ return NULL; ++ } ++ // otherwise, return the dereferenced iterator (a pointer) ++ return **iter; ++} ++ } ++%enddef ++/*----------------------------------------------------------------------------*/ ++//! For a regular container with "begin" and "end" and "size" ++%define ADD_CONTAINER_ITERATOR( CLASS ) ++ SETUP_GENERATOR( CLASS::const_iterator ); ++ ADD_GENERATOR( CLASS, __iter__, ++ CLASS ## ::const_iterator, CLASS ## ::value_type, ++ begin, end) ++ %extend CLASS { ++ %insert("python") %{ ++ def __len__(self): ++ return self.size() ++ %} ++ } ++%enddef ++ ++/*============================================================================*/ ++#endif ++ +diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i +--- a/hepmc/hepmcwrap.i ++++ b/hepmc/hepmcwrap.i +@@ -1,5 +1,7 @@ + %module hepmcwrap + ++%include generators.i ++ + %{ + #include "HepMC/GenEvent.h" + #include "HepMC/GenVertex.h" +@@ -251,3 +253,9 @@ + return ss.str(); + } + } ++ ++SETUP_GENERATOR( std::vector< HepMC::GenParticle* >::const_iterator ) ++ADD_GENERATOR_P( HepMC::GenVertex, incoming, ++std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_in_const_begin, particles_in_const_end) ++ADD_GENERATOR_P( HepMC::GenVertex, outgoing, ++std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_out_const_begin, particles_out_const_end) diff --git a/pkgs/development/python-modules/pyhepmc_export_flow.patch b/pkgs/development/python-modules/pyhepmc_export_flow.patch new file mode 100644 index 00000000000..85e26a1a160 --- /dev/null +++ b/pkgs/development/python-modules/pyhepmc_export_flow.patch @@ -0,0 +1,20 @@ +diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i +index cf35c1b..b94fbe2 100644 +--- a/hepmc/hepmcwrap.i ++++ b/hepmc/hepmcwrap.i +@@ -1,6 +1,7 @@ + %module hepmcwrap + + %{ ++ #include "HepMC/Flow.h" + #include "HepMC/GenEvent.h" + #include "HepMC/GenVertex.h" + #include "HepMC/GenParticle.h" +@@ -93,6 +94,7 @@ namespace HepMC { + // headers before importing headers that use those classes. + // Result is that headers should probably be %included in an order + // which sees "contents before containers" ++%include "HepMC/Flow.h" + %include "HepMC/HepMCDefs.h" + %include "HepMC/SimpleVector.h" + // #ifdef HEPMC_HAS_ITERATOR_RANGES diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48a2a3e4c0b..f3c764d1d07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5084,6 +5084,41 @@ in { }; }; + pyhepmc = buildPythonPackage rec { + name = "pyhepmc-${version}"; + version = "0.5.0"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pyhepmc/${name}.tar.gz"; + sha256 = "1rbi8gqgclfvaibv9kzhfis11gw101x8amc93qf9y08ny4jfyr1d"; + }; + + patches = [ + # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff + ../development/python-modules/pyhepmc_export_edges.patch + # add bindings to Flow class + ../development/python-modules/pyhepmc_export_flow.patch + ]; + + # regenerate python wrapper + preConfigure = '' + rm hepmc/hepmcwrap.py + swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i + ''; + + buildInputs = with pkgs; [ swig hepmc ]; + + HEPMCPATH = pkgs.hepmc; + + meta = { + description = "A simple wrapper on the main classes of the HepMC event simulation representation, making it possible to create, read and manipulate HepMC events from Python code"; + license = licenses.gpl2; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.all; + }; + }; + pytest = self.pytest_30; pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; From 2198a7c747c319091445e4dd626caee3bfd9f507 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 22 Feb 2017 18:36:25 -0500 Subject: [PATCH 205/274] pythonPackages.graphviz: init at 0.5.2 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3c764d1d07..100e6578b1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15376,6 +15376,24 @@ in { }; }; + graphviz = buildPythonPackage rec { + name = "graphviz-${version}"; + version = "0.5.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/g/graphviz/${name}.zip"; + sha256 = "0jh31nlm0qbxwylhdkwnb69pcjlc5z03fcfbs0gvgzp3hfrngsk0"; + }; + + propagatedBuildInputs = [ pkgs.graphviz ]; + + meta = { + description = "Simple Python interface for Graphviz"; + homepage = https://github.com/xflr6/graphviz; + license = licenses.mit; + }; + }; + pygraphviz = buildPythonPackage rec { name = "pygraphviz-${version}"; version = "1.4rc1"; From ac51822ee838b3a3a52736772431ad29ab71cd4b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 26 Feb 2017 16:42:53 -0500 Subject: [PATCH 206/274] pythonPackages.python-sybase: init at 0.40pre2 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 100e6578b1c..3c0057ef5a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -816,6 +816,30 @@ in { }; }; + python-sybase = buildPythonPackage rec { + name = "python-sybase-${version}"; + version = "0.40pre2"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz"; + sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j"; + }; + + propagatedBuildInputs = [ pkgs.freetds ]; + + SYBASE = pkgs.freetds; + setupPyBuildFlags = [ "-DHAVE_FREETDS" "-UWANT_BULKCOPY" ]; + + meta = { + description = "The Sybase module provides a Python interface to the Sybase relational database system"; + homepage = http://python-sybase.sourceforge.net; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; + }; + }; + almir = buildPythonPackage rec { name = "almir-0.1.8"; From cb1b08a87163ad7dc8ad49ae92878c8832de95ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 27 Feb 2017 21:20:57 -0500 Subject: [PATCH 207/274] herwig: 7.0.3 -> 7.0.4 --- pkgs/development/libraries/physics/herwig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index cb765f761d7..737565d298e 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "0v7b84n0v3dhjpx0vfk5p8g87kivgg9svfivnih1yrfm749269m2"; + sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6"; }; patches = [ From 45344fdf193ad8aebcc7e3d4c1c997c8067b7b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Mar 2017 07:26:27 +0100 Subject: [PATCH 208/274] tested job: drop the hibernate test on i686 for now /cc #23107. --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6c048e8a0ac..57d39a2325f 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -68,7 +68,7 @@ in rec { (all nixos.tests.boot.uefiCdrom) (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) - (all nixos.tests.hibernate) + nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107 (all nixos.tests.ecryptfs) (all nixos.tests.ipv6) (all nixos.tests.i3wm) From d072ac28f8b262e25358763682f40f7870789fd7 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 17:02:22 -0600 Subject: [PATCH 209/274] quicktun: 2.2.4 -> 2.2.5 --- pkgs/tools/networking/quicktun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index ed559f5d5c9..9a6784cc7f2 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quicktun-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "UCIS"; repo = "QuickTun"; - rev = "980fe1b8c718d6df82af1d57b56140c0e541dbe0"; - sha256 = "0m7gvlgs1mhyw3c8s2dg05j7r7hz8kjpb0sk245m61ir9dmwlf8i"; + rev = "2d0c6a9cda8c21f921a5d1197aeee92e9568ca39"; + sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx"; }; buildInputs = [ libsodium ]; From 021046a72e89494911e106c8c25c0b0fa7becfff Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 16:42:58 -0600 Subject: [PATCH 210/274] swaks:20130209.0 -> 20170101.0 --- pkgs/tools/networking/swaks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 0743a5c62f7..5d5b17c2b26 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "swaks-${version}"; - version = "20130209.0"; + version = "20170101.0"; src = fetchurl { url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; - sha256 = "0z0zsjminrdjpn6a8prjdwilnr27piibh78gc5ppg0nadljnf28b"; + sha256 = "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4"; }; buildInputs = [ perl makeWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { A featureful, flexible, scriptable, transaction-oriented SMTP test tool ''; license = licenses.gpl2; - maintainers = with maintainers; [ rickynils ]; + maintainers = with maintainers; [ rickynils ndowens ]; platforms = platforms.all; }; From 86c51da755fc1adec7ea96d4c88a41b125683a73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Feb 2017 11:14:28 +0100 Subject: [PATCH 211/274] LTS Haskell 8.3 --- .../configuration-hackage2nix.yaml | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d2c86c935aa..cc567df7c21 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 8.2 + # LTS Haskell 8.3 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -265,7 +265,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.4 - - brick ==0.17 + - brick ==0.17.1 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 - bson-lens ==0.1.1 @@ -366,7 +366,7 @@ default-package-overrides: - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.14 - code-builder ==0.1.3 - - code-page ==0.1.1 + - code-page ==0.1.2 - codo-notation ==0.5.2 - colorful-monoids ==0.2.1.0 - colour ==2.3.3 @@ -565,7 +565,7 @@ default-package-overrides: - enummapset-th ==0.6.1.1 - envelope ==0.2.1.0 - envparse ==0.4 - - envy ==1.3.0.1 + - envy ==1.3.0.2 - epub-metadata ==4.5 - eq ==4.0.4 - equivalence ==0.3.2 @@ -693,7 +693,7 @@ default-package-overrides: - gi-gobject ==2.0.11 - gi-gtk ==3.0.11 - gi-javascriptcore ==3.0.11 - - gi-pango ==1.0.11 + - gi-pango ==1.0.12 - gi-soup ==2.4.11 - gi-webkit ==3.0.11 - ginger ==0.3.9.1 @@ -959,7 +959,7 @@ default-package-overrides: - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.6 + - hpio ==0.8.0.7 - hpp ==0.4.0 - hpqtypes ==1.5.1.1 - hquantlib ==0.0.3.3 @@ -983,14 +983,14 @@ default-package-overrides: - hslua ==0.4.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4 + - HsOpenSSL ==0.11.4.1 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.4.1 + - hspec ==2.4.2 - hspec-attoparsec ==0.1.0.2 - hspec-contrib ==0.4.0 - - hspec-core ==2.4.1 - - hspec-discover ==2.4.1 + - hspec-core ==2.4.2 + - hspec-discover ==2.4.2 - hspec-expectations ==0.8.2 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 @@ -1015,11 +1015,11 @@ default-package-overrides: - htoml ==1.0.0.3 - HTTP ==4000.3.5 - http-api-data ==0.3.5 - - http-client ==0.5.5 + - http-client ==0.5.6.1 - http-client-openssl ==0.2.0.4 - - http-client-tls ==0.3.3.1 + - http-client-tls ==0.3.4 - http-common ==0.8.2.0 - - http-conduit ==2.2.3 + - http-conduit ==2.2.3.1 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - http-media ==0.6.4 @@ -1090,7 +1090,7 @@ default-package-overrides: - intervals ==0.7.2 - intro ==0.1.0.8 - invariant ==0.4 - - invertible ==0.2.0 + - invertible ==0.2.0.2 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1242,6 +1242,7 @@ default-package-overrides: - mathexpr ==0.3.0.0 - matrices ==0.4.4 - matrix ==0.3.5.0 + - matrix-market-attoparsec ==0.1.0.5 - maximal-cliques ==0.1.1 - mbox ==0.3.3 - mcmc-types ==1.0.3 @@ -1307,12 +1308,12 @@ default-package-overrides: - MonadRandom ==0.5.1 - monads-tf ==0.1.0.3 - mongoDB ==2.1.1.1 - - mono-traversable ==1.0.1.2 + - mono-traversable ==1.0.1.3 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.3.1 - monoidal-containers ==0.3.0.1 - - morte ==1.6.5 + - morte ==1.6.6 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1333,7 +1334,7 @@ default-package-overrides: - mysql ==0.1.4 - mysql-haskell ==0.8.0.0 - mysql-haskell-openssl ==0.8.0.0 - - mysql-simple ==0.4.0.0 + - mysql-simple ==0.4.0.1 - nagios-check ==0.3.2 - names-th ==0.2.0.2 - nano-erl ==0.1.0.1 @@ -1377,7 +1378,7 @@ default-package-overrides: - non-empty-sequence ==0.2.0.2 - nonce ==1.0.2 - NoTrace ==0.3.0.1 - - nsis ==0.3 + - nsis ==0.3.1 - numbers ==3000.2.0.1 - numeric-extras ==0.1 - NumInstances ==1.4 @@ -1395,7 +1396,7 @@ default-package-overrides: - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.5.3.0 - - opaleye-trans ==0.3.4 + - opaleye-trans ==0.3.5 - open-browser ==0.2.1.0 - open-witness ==0.4 - OpenAL ==1.7.0.4 @@ -1458,7 +1459,7 @@ default-package-overrides: - persistent-postgresql ==2.6 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6 + - persistent-sqlite ==2.6.0.1 - persistent-template ==2.5.1.6 - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 @@ -1694,14 +1695,14 @@ default-package-overrides: - serf ==0.1.1.0 - servant ==0.9.1.1 - servant-aeson-specs ==0.5.2.0 - - servant-auth-cookie ==0.4.3.2 + - servant-auth-cookie ==0.4.3.3 - servant-blaze ==0.7.1 - servant-cassava ==0.8 - servant-client ==0.9.1.1 - servant-docs ==0.9.1.1 - servant-elm ==0.4.0.1 - servant-foreign ==0.9.1.1 - - servant-js ==0.9.1 + - servant-js ==0.9.2 - servant-JuicyPixels ==0.3.0.2 - servant-lucid ==0.7.1 - servant-mock ==0.8.1.1 @@ -1766,7 +1767,7 @@ default-package-overrides: - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 - sparkle ==0.4.0.2 - - sparse-linear-algebra ==0.2.9.4 + - sparse-linear-algebra ==0.2.9.7 - spdx ==0.2.1.0 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 @@ -1783,7 +1784,7 @@ default-package-overrides: - spool ==0.1 - spoon ==0.3.1 - sql-words ==0.1.4.1 - - sqlite-simple ==0.4.12.1 + - sqlite-simple ==0.4.13.0 - sqlite-simple-errors ==0.6.0.0 - srcloc ==0.5.1.0 - stache ==0.2.0 @@ -1855,7 +1856,7 @@ default-package-overrides: - taggy ==0.2.0 - taggy-lens ==0.1.2 - tagshare ==0.0 - - tagsoup ==0.14 + - tagsoup ==0.14.1 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 - tar-conduit ==0.1.0 @@ -2015,7 +2016,7 @@ default-package-overrides: - Unixutils ==1.54.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.7.2 - - uri-bytestring ==0.2.2.1 + - uri-bytestring ==0.2.3.0 - uri-encode ==1.5.0.5 - uri-templater ==0.2.1.0 - url ==2.1.3 @@ -2084,7 +2085,7 @@ default-package-overrides: - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.11 + - warp ==3.2.11.1 - warp-tls ==3.2.3 - wave ==0.1.4 - wavefront ==0.7.0.3 @@ -2166,7 +2167,7 @@ default-package-overrides: - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - yahoo-finance-api ==0.2.0.1 - - yaml ==0.8.21.2 + - yaml ==0.8.22 - Yampa ==0.10.5 - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 @@ -2207,7 +2208,7 @@ default-package-overrides: - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.7 + - zip ==0.1.8 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 From eabf47b3022f23acf65cbf20e0d4ae36dbcff22e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Feb 2017 14:29:10 +0100 Subject: [PATCH 212/274] hackage2nix: disable builds that depend on broken webkitgtk-2.4.11 --- .../configuration-hackage2nix.yaml | 1725 +++++++++-------- 1 file changed, 865 insertions(+), 860 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cc567df7c21..a30a2fd4463 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2361,13 +2361,6 @@ dont-distribute-packages: abstract-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] abt: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-BuildPlatform: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-EasyRaster-GTK: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-HalfInteger: [ i686-linux, x86_64-linux, x86_64-darwin ] - ac-machine-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - ac-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2377,12 +2370,17 @@ dont-distribute-packages: accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-EasyRaster-GTK: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-HalfInteger: [ i686-linux, x86_64-linux, x86_64-darwin ] acid-state-dist: [ i686-linux, x86_64-linux, x86_64-darwin ] acid-state-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] + ac-machine-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ac-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-all-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-comonad: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-flipping-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-hq9plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + ACME: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-inator: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-io: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-left-pad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2395,31 +2393,34 @@ dont-distribute-packages: acme-strfry: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-stringly-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-zero: [ i686-linux, x86_64-linux, x86_64-darwin ] - ACME: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] ActionKid: [ i686-linux, x86_64-linux, x86_64-darwin ] activehs: [ i686-linux, x86_64-linux, x86_64-darwin ] activitystreams-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] actor: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] Adaptive-Blaisorblade: [ i686-linux, x86_64-linux, x86_64-darwin ] adaptive-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - adaptive-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] Adaptive: [ i686-linux, x86_64-linux, x86_64-darwin ] + adaptive-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] adb: [ i686-linux, x86_64-linux, x86_64-darwin ] adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] adict: [ i686-linux, x86_64-linux, x86_64-darwin ] adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] - adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] + adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Basics: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Net: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Real-Double: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-Real-Interval: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Real: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-Real-Interval: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] + AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-filthy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2430,7 +2431,6 @@ dont-distribute-packages: aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] - AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] afv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2442,35 +2442,34 @@ dont-distribute-packages: agentx: [ i686-linux, x86_64-linux, x86_64-darwin ] AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] - air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] + air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] - al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] - algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] - algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] + algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] - align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] + al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] + align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] - alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] alphachar: [ i686-linux, x86_64-linux, x86_64-darwin ] + alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] alternative-io: [ i686-linux, x86_64-linux, x86_64-darwin ] altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-appstream: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-budgets: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2491,6 +2490,7 @@ dont-distribute-packages: amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-stepfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-xray: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] amby: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2498,8 +2498,8 @@ dont-distribute-packages: analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] - android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ] android: [ i686-linux, x86_64-linux, x86_64-darwin ] + android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ] AndroidViewHierarchyImporter: [ i686-linux, x86_64-linux, x86_64-darwin ] angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2515,13 +2515,13 @@ dont-distribute-packages: anydbm: [ i686-linux, x86_64-linux, x86_64-darwin ] aosd: [ i686-linux, x86_64-linux, x86_64-darwin ] apelsin: [ i686-linux, x86_64-linux, x86_64-darwin ] - api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-cookie: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-eventsource: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-helics: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + apiary: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-memcached: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2529,25 +2529,25 @@ dont-distribute-packages: apiary-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-session: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary: [ i686-linux, x86_64-linux, x86_64-darwin ] apis: [ i686-linux, x86_64-linux, x86_64-darwin ] + api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] apotiki: [ i686-linux, x86_64-linux, x86_64-darwin ] - app-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] appc: [ i686-linux, x86_64-linux, x86_64-darwin ] + app-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] ApplePush: [ i686-linux, x86_64-linux, x86_64-darwin ] AppleScript: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-fail: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] - approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] - arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] + approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] + arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ] archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] - archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] + archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] archnews: [ i686-linux, x86_64-linux, x86_64-darwin ] arff: [ i686-linux, x86_64-linux, x86_64-darwin ] arghwxhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2561,20 +2561,20 @@ dont-distribute-packages: arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] arithmoi: [ i686-linux, x86_64-linux, x86_64-darwin ] armada: [ i686-linux, x86_64-linux, x86_64-darwin ] - arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] arpack: [ i686-linux, x86_64-linux, x86_64-darwin ] + arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] array-primops: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ] - arrow-improve: [ i686-linux, x86_64-linux, x86_64-darwin ] arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + arrow-improve: [ i686-linux, x86_64-linux, x86_64-darwin ] arrowp: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] artery: [ i686-linux, x86_64-linux, x86_64-darwin ] - ascii-flatten: [ i686-linux, x86_64-linux, x86_64-darwin ] - ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ascii-flatten: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] + ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2582,14 +2582,14 @@ dont-distribute-packages: astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] astview: [ i686-linux, x86_64-linux, x86_64-darwin ] async-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] - atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2614,15 +2614,15 @@ dont-distribute-packages: avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] avers: [ i686-linux, x86_64-linux, x86_64-darwin ] + avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] avl-static: [ i686-linux, x86_64-linux, x86_64-darwin ] AvlTree: [ i686-linux, x86_64-linux, x86_64-darwin ] avr-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] awesome-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - awesomium-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium: [ i686-linux, x86_64-linux, x86_64-darwin ] + awesomium-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2630,33 +2630,32 @@ dont-distribute-packages: aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-general: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-kinesis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-kinesis-reshard: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-kinesis: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-kinesis-reshard: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] - b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] babl: [ i686-linux, x86_64-linux, x86_64-darwin ] babylon: [ i686-linux, x86_64-linux, x86_64-darwin ] backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - bag: [ i686-linux, x86_64-linux, x86_64-darwin ] Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ] + bag: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-launcher: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-plugin-highlight: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-plugin-photo: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-theme-blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-theme-mini-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] bamse: [ i686-linux, x86_64-linux, x86_64-darwin ] Bang: [ i686-linux, x86_64-linux, x86_64-darwin ] banwords: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2666,24 +2665,24 @@ dont-distribute-packages: barley: [ i686-linux, x86_64-linux, x86_64-darwin ] Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] - barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] + barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] - base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] - BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] + battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] bdd: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] beautifHOL: [ i686-linux, x86_64-linux, x86_64-darwin ] bed-and-breakfast: [ i686-linux, x86_64-linux, x86_64-darwin ] Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2695,10 +2694,10 @@ dont-distribute-packages: BerlekampAlgorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] berp: [ i686-linux, x86_64-linux, x86_64-darwin ] besout: [ i686-linux, x86_64-linux, x86_64-darwin ] - bet: [ i686-linux, x86_64-linux, x86_64-darwin ] betacode: [ i686-linux, x86_64-linux, x86_64-darwin ] - bff-mono: [ i686-linux, x86_64-linux, x86_64-darwin ] + bet: [ i686-linux, x86_64-linux, x86_64-darwin ] bff: [ i686-linux, x86_64-linux, x86_64-darwin ] + bff-mono: [ i686-linux, x86_64-linux, x86_64-darwin ] bgmax: [ i686-linux, x86_64-linux, x86_64-darwin ] bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] bibdb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2714,14 +2713,12 @@ dont-distribute-packages: binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-indexed-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-protocol-zmq: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-protocol-zmq: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] binding-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-cctools: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-codec2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2746,15 +2743,16 @@ dont-distribute-packages: bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-wlc: [ i686-linux, x86_64-linux, x86_64-darwin ] + binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] bindynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed-example: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed: [ i686-linux, x86_64-linux, x86_64-darwin ] - bio: [ i686-linux, x86_64-linux, x86_64-darwin ] - Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] + Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseInfernal: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseNewick: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2765,6 +2763,7 @@ dont-distribute-packages: BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] + bio: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2772,7 +2771,6 @@ dont-distribute-packages: bird: [ i686-linux, x86_64-linux, x86_64-darwin ] BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - bit-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] bitcoin-payment-channel: [ i686-linux, x86_64-linux, x86_64-darwin ] bitcoin-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] bitly-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2783,10 +2781,11 @@ dont-distribute-packages: bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + bit-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] - bla: [ i686-linux, x86_64-linux, x86_64-darwin ] black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] blacktip: [ i686-linux, x86_64-linux, x86_64-darwin ] + bla: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2807,8 +2806,8 @@ dont-distribute-packages: BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] - blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] + blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2819,8 +2818,8 @@ dont-distribute-packages: bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bond: [ i686-linux, x86_64-linux, x86_64-darwin ] - bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-list: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2841,6 +2840,7 @@ dont-distribute-packages: bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2852,9 +2852,9 @@ dont-distribute-packages: bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] burst-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] buster: [ i686-linux, x86_64-linux, x86_64-darwin ] + Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] + buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] byline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2862,14 +2862,16 @@ dont-distribute-packages: bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] - c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2877,27 +2879,23 @@ dont-distribute-packages: cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-progdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalQuery: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalrpmdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] CabalSearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] cached-io: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2906,8 +2904,8 @@ dont-distribute-packages: cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] + cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] calc: [ i686-linux, x86_64-linux, x86_64-darwin ] calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2919,29 +2917,29 @@ dont-distribute-packages: canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] cao: [ i686-linux, x86_64-linux, x86_64-darwin ] - cap: [ i686-linux, x86_64-linux, x86_64-darwin ] Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ] + cap: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] - car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] + car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] carte: [ i686-linux, x86_64-linux, x86_64-darwin ] Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + casadi-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-ipopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-snopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] - casadi-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] Cascade: [ i686-linux, x86_64-linux, x86_64-darwin ] cascading: [ i686-linux, x86_64-linux, x86_64-darwin ] cases: [ i686-linux, x86_64-linux, x86_64-darwin ] cash: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-reports-html: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-reports-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2956,15 +2954,16 @@ dont-distribute-packages: cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] + CCA: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-alt: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-cxe: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-exc: [ i686-linux, x86_64-linux, x86_64-darwin ] - CC-delcont-ref-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] - CCA: [ i686-linux, x86_64-linux, x86_64-darwin ] + CC-delcont-ref-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] cci: [ i686-linux, x86_64-linux, x86_64-darwin ] ccnx: [ i686-linux, x86_64-linux, x86_64-darwin ] cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2978,35 +2977,35 @@ dont-distribute-packages: cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] cflp: [ i686-linux, x86_64-linux, x86_64-darwin ] cfopu: [ i686-linux, x86_64-linux, x86_64-darwin ] - cg: [ i686-linux, x86_64-linux, x86_64-darwin ] cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] + cg: [ i686-linux, x86_64-linux, x86_64-darwin ] cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] + chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] charsetdetect: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] + chatty: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty-text: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatty: [ i686-linux, x86_64-linux, x86_64-darwin ] cheapskate-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] - check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] - Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] checked: [ i686-linux, x86_64-linux, x86_64-darwin ] + Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] + check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale-geo: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale: [ i686-linux, x86_64-linux, x86_64-darwin ] + chp: [ i686-linux, x86_64-linux, x86_64-darwin ] chp-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] chp-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] chp-spec: [ i686-linux, x86_64-linux, x86_64-darwin ] chp-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - chp: [ i686-linux, x86_64-linux, x86_64-darwin ] ChristmasTree: [ i686-linux, x86_64-linux, x86_64-darwin ] chronograph: [ i686-linux, x86_64-linux, x86_64-darwin ] chronos: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3017,10 +3016,11 @@ dont-distribute-packages: cielo: [ i686-linux, x86_64-linux, x86_64-darwin ] cil: [ i686-linux, x86_64-linux, x86_64-darwin ] cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] + c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cio: [ i686-linux, x86_64-linux, x86_64-darwin ] citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] - citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] clac: [ i686-linux, x86_64-linux, x86_64-darwin ] clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3031,22 +3031,23 @@ dont-distribute-packages: clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-multisignal: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-prelude-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-media: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3054,16 +3055,15 @@ dont-distribute-packages: clckwrks-theme-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clean-home: [ i686-linux, x86_64-linux, x86_64-darwin ] - clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] + clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] cless: [ i686-linux, x86_64-linux, x86_64-darwin ] clevercss: [ i686-linux, x86_64-linux, x86_64-darwin ] - CLI: [ i686-linux, x86_64-linux, x86_64-darwin ] click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] - clif: [ i686-linux, x86_64-linux, x86_64-darwin ] clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] + clif: [ i686-linux, x86_64-linux, x86_64-darwin ] + CLI: [ i686-linux, x86_64-linux, x86_64-darwin ] clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3072,8 +3072,8 @@ dont-distribute-packages: clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] closure: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] clua: [ i686-linux, x86_64-linux, x86_64-darwin ] cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3083,24 +3083,24 @@ dont-distribute-packages: cmath: [ i686-linux, x86_64-linux, x86_64-darwin ] cmathml3: [ i686-linux, x86_64-linux, x86_64-darwin ] CMCompare: [ i686-linux, x86_64-linux, x86_64-darwin ] - cmd-item: [ i686-linux, x86_64-linux, x86_64-darwin ] cmdargs-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmd-item: [ i686-linux, x86_64-linux, x86_64-darwin ] cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] cmph: [ i686-linux, x86_64-linux, x86_64-darwin ] cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] cndict: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] + codec: [ i686-linux, x86_64-linux, x86_64-darwin ] Codec-Image-DevIL: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] - codec: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] codeworld-api: [ i686-linux, x86_64-linux, x86_64-darwin ] cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - coin: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] + coin: [ i686-linux, x86_64-linux, x86_64-darwin ] colada: [ i686-linux, x86_64-linux, x86_64-darwin ] colchis: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3114,19 +3114,19 @@ dont-distribute-packages: color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] - com: [ i686-linux, x86_64-linux, x86_64-darwin ] combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] combinat: [ i686-linux, x86_64-linux, x86_64-darwin ] - combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] comfort-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + com: [ i686-linux, x86_64-linux, x86_64-darwin ] commander: [ i686-linux, x86_64-linux, x86_64-darwin ] Commando: [ i686-linux, x86_64-linux, x86_64-darwin ] commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] - commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3148,29 +3148,29 @@ dont-distribute-packages: comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] computational-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] concraft-hr: [ i686-linux, x86_64-linux, x86_64-darwin ] - concraft-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] concraft: [ i686-linux, x86_64-linux, x86_64-darwin ] + concraft-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] + concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] ConcurrentUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] - Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] - condor: [ i686-linux, x86_64-linux, x86_64-darwin ] condorcet: [ i686-linux, x86_64-linux, x86_64-darwin ] + condor: [ i686-linux, x86_64-linux, x86_64-darwin ] + Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] - conf: [ i686-linux, x86_64-linux, x86_64-darwin ] conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-ini: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] + conf: [ i686-linux, x86_64-linux, x86_64-darwin ] ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] configifier: [ i686-linux, x86_64-linux, x86_64-darwin ] + config-ini: [ i686-linux, x86_64-linux, x86_64-darwin ] + config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3189,8 +3189,8 @@ dont-distribute-packages: container: [ i686-linux, x86_64-linux, x86_64-darwin ] containers-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] ContArrow: [ i686-linux, x86_64-linux, x86_64-darwin ] - context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] ContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3198,8 +3198,8 @@ dont-distribute-packages: control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-attempt: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-exception-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-failure-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-failure: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-monad-failure-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] Control-Monad-MultiPass: [ i686-linux, x86_64-linux, x86_64-darwin ] Control-Monad-ST2: [ i686-linux, x86_64-linux, x86_64-darwin ] contstuff-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3209,27 +3209,27 @@ dont-distribute-packages: convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-theorem: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] copr: [ i686-linux, x86_64-linux, x86_64-darwin ] COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] - core-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - core-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - core: [ i686-linux, x86_64-linux, x86_64-darwin ] corebot-bliki: [ i686-linux, x86_64-linux, x86_64-darwin ] + core-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] + core-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + core: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] Coroutine: [ i686-linux, x86_64-linux, x86_64-darwin ] - couch-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - couch-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] couchdb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + couch-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + couch-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] counter: [ i686-linux, x86_64-linux, x86_64-darwin ] court: [ i686-linux, x86_64-linux, x86_64-darwin ] coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3239,8 +3239,8 @@ dont-distribute-packages: cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] - cql-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cql: [ i686-linux, x86_64-linux, x86_64-darwin ] + cql-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3248,7 +3248,6 @@ dont-distribute-packages: cqrs-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-test: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-testkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cr: [ i686-linux, x86_64-linux, x86_64-darwin ] crack: [ i686-linux, x86_64-linux, x86_64-darwin ] Craft3e: [ i686-linux, x86_64-linux, x86_64-darwin ] craft: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3264,6 +3263,7 @@ dont-distribute-packages: crf-chain1: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-tiers: [ i686-linux, x86_64-linux, x86_64-darwin ] + cr: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-to-html: [ i686-linux, x86_64-linux, x86_64-darwin ] crocodile: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3282,12 +3282,12 @@ dont-distribute-packages: cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] csp: [ i686-linux, x86_64-linux, x86_64-darwin ] + cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] - cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] csv-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3300,8 +3300,8 @@ dont-distribute-packages: cue-sheet: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] curryrs: [ i686-linux, x86_64-linux, x86_64-darwin ] curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ] curves: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3309,33 +3309,33 @@ dont-distribute-packages: CV: [ i686-linux, x86_64-linux, x86_64-darwin ] cyclotomic: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] - d-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] - DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] + DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-beta: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcsden: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-fastconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcsden: [ i686-linux, x86_64-linux, x86_64-darwin ] DarcsHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] darcswatch: [ i686-linux, x86_64-linux, x86_64-darwin ] darkplaces-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - darkplaces-rcon-util: [ i686-linux, x86_64-linux, x86_64-darwin ] darkplaces-rcon: [ i686-linux, x86_64-linux, x86_64-darwin ] + darkplaces-rcon-util: [ i686-linux, x86_64-linux, x86_64-darwin ] dash-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] data-accessor-monadLib: [ i686-linux, x86_64-linux, x86_64-darwin ] data-accessor-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] data-accessor-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] data-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3347,62 +3347,62 @@ dont-distribute-packages: data-default-instances-unordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] data-default-instances-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] + datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] data-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] + dataenc: [ i686-linux, x86_64-linux, x86_64-darwin ] data-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] data-msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-object: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-object: [ i686-linux, x86_64-linux, x86_64-darwin ] data-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] data-quotientref: [ i686-linux, x86_64-linux, x86_64-darwin ] data-repr: [ i686-linux, x86_64-linux, x86_64-darwin ] data-result: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rev: [ i686-linux, x86_64-linux, x86_64-darwin ] - Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] - datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] - dataenc: [ i686-linux, x86_64-linux, x86_64-darwin ] - datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] - datetime-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] datetime: [ i686-linux, x86_64-linux, x86_64-darwin ] + datetime-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] dawdle: [ i686-linux, x86_64-linux, x86_64-darwin ] dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbmigrations: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbmigrations: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + d-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] + DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-th-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ] - DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] debian-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3424,8 +3424,8 @@ dont-distribute-packages: definitive-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] definitive-sound: [ i686-linux, x86_64-linux, x86_64-darwin ] deiko-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] deka: [ i686-linux, x86_64-linux, x86_64-darwin ] + deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] delta-h: [ i686-linux, x86_64-linux, x86_64-darwin ] delta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3441,8 +3441,8 @@ dont-distribute-packages: derive-gadt: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-IG: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3467,6 +3467,7 @@ dont-distribute-packages: diagrams-rubiks-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + dialog: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3481,26 +3482,26 @@ dont-distribute-packages: digestive-functors-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] - digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] + digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] dimensional-codata: [ i686-linux, x86_64-linux, x86_64-darwin ] DimensionalHash: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-example: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] diophantine: [ i686-linux, x86_64-linux, x86_64-darwin ] - diplomacy-server: [ i686-linux, x86_64-linux, x86_64-darwin ] diplomacy: [ i686-linux, x86_64-linux, x86_64-darwin ] + diplomacy-server: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-binary-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] directory-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3530,10 +3531,10 @@ dont-distribute-packages: DnaProteinAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] dnscache: [ i686-linux, x86_64-linux, x86_64-darwin ] dnssd: [ i686-linux, x86_64-linux, x86_64-darwin ] - doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ] docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] + doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3542,14 +3543,13 @@ dont-distribute-packages: DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] dominion: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] download-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] - download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] download: [ i686-linux, x86_64-linux, x86_64-darwin ] + download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] dozenal: [ i686-linux, x86_64-linux, x86_64-darwin ] dozens: [ i686-linux, x86_64-linux, x86_64-darwin ] - DP: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-base: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-lifted-base: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3558,36 +3558,37 @@ dont-distribute-packages: dph-prim-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-prim-par: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-prim-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] + DP: [ i686-linux, x86_64-linux, x86_64-darwin ] dpkg: [ i686-linux, x86_64-linux, x86_64-darwin ] DPM: [ i686-linux, x86_64-linux, x86_64-darwin ] drClickOn: [ i686-linux, x86_64-linux, x86_64-darwin ] dresdner-verkehrsbetriebe: [ i686-linux, x86_64-linux, x86_64-darwin ] DrHylo: [ i686-linux, x86_64-linux, x86_64-darwin ] DrIFT-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] - DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] drifter-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] drmaa: [ i686-linux, x86_64-linux, x86_64-darwin ] dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] - ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] - dsh-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] DSH: [ i686-linux, x86_64-linux, x86_64-darwin ] - dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + dsh-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] + ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc: [ i686-linux, x86_64-linux, x86_64-darwin ] - dson-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] dson: [ i686-linux, x86_64-linux, x86_64-darwin ] + dson-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] DSTM: [ i686-linux, x86_64-linux, x86_64-darwin ] dstring: [ i686-linux, x86_64-linux, x86_64-darwin ] dtab: [ i686-linux, x86_64-linux, x86_64-darwin ] DTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dust-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dust-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] dvi-processing: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3619,14 +3620,14 @@ dont-distribute-packages: edenskel: [ i686-linux, x86_64-linux, x86_64-darwin ] edentv: [ i686-linux, x86_64-linux, x86_64-darwin ] edge: [ i686-linux, x86_64-linux, x86_64-darwin ] - edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] editable: [ i686-linux, x86_64-linux, x86_64-darwin ] + edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] editline: [ i686-linux, x86_64-linux, x86_64-darwin ] EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] EEConfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] + effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] + effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] effin: [ i686-linux, x86_64-linux, x86_64-darwin ] egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3634,19 +3635,19 @@ dont-distribute-packages: eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-carbon: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-push: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] electrum-mnemonic: [ i686-linux, x86_64-linux, x86_64-darwin ] elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] - email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - email-validator: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] emailparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + email-validator: [ i686-linux, x86_64-linux, x86_64-darwin ] embeddock-example: [ i686-linux, x86_64-linux, x86_64-darwin ] embeddock: [ i686-linux, x86_64-linux, x86_64-darwin ] embroidery: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3655,10 +3656,10 @@ dont-distribute-packages: enchant: [ i686-linux, x86_64-linux, x86_64-darwin ] encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-growler: [ i686-linux, x86_64-linux, x86_64-darwin ] + engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3673,8 +3674,8 @@ dont-distribute-packages: epass: [ i686-linux, x86_64-linux, x86_64-darwin ] epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] epub-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] - epub-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] + epub-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] equal-files: [ i686-linux, x86_64-linux, x86_64-darwin ] EqualitySolver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3713,7 +3714,6 @@ dont-distribute-packages: eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] - ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3729,23 +3729,24 @@ dont-distribute-packages: exinst: [ i686-linux, x86_64-linux, x86_64-darwin ] existential: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] - exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-determinant: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-iomodes-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - explicit-iomodes-text: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-iomodes: [ i686-linux, x86_64-linux, x86_64-darwin ] + explicit-iomodes-text: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] + ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] + Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] factory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3754,20 +3755,20 @@ dont-distribute-packages: fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] fake-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] + falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] - fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] fcd: [ i686-linux, x86_64-linux, x86_64-darwin ] fckeditor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3775,12 +3776,12 @@ dont-distribute-packages: FComp: [ i686-linux, x86_64-linux, x86_64-darwin ] fdo-trash: [ i686-linux, x86_64-linux, x86_64-darwin ] fedora-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed2lj: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-crawl: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed2lj: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] feldspar-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] feldspar-language: [ i686-linux, x86_64-linux, x86_64-darwin ] fenfire: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3796,10 +3797,10 @@ dont-distribute-packages: fieldwise: [ i686-linux, x86_64-linux, x86_64-darwin ] file-collection: [ i686-linux, x86_64-linux, x86_64-darwin ] file-command-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] - FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] + file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] + FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] Files: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3817,32 +3818,32 @@ dont-distribute-packages: fishfood: [ i686-linux, x86_64-linux, x86_64-darwin ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] - fix-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] - fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-point-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-point-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + fix-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] + fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] fizz-buzz: [ i686-linux, x86_64-linux, x86_64-darwin ] - flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flac: [ i686-linux, x86_64-linux, x86_64-darwin ] + flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] flexible-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] flickr: [ i686-linux, x86_64-linux, x86_64-darwin ] Flippi: [ i686-linux, x86_64-linux, x86_64-darwin ] flite: [ i686-linux, x86_64-linux, x86_64-darwin ] floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - flowdock-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock: [ i686-linux, x86_64-linux, x86_64-darwin ] + flowdock-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3850,9 +3851,9 @@ dont-distribute-packages: fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] - FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3860,21 +3861,21 @@ dont-distribute-packages: foma: [ i686-linux, x86_64-linux, x86_64-darwin ] font-opengl-basic4x6: [ i686-linux, x86_64-linux, x86_64-darwin ] foo: [ i686-linux, x86_64-linux, x86_64-darwin ] - for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] forbidden-fruit: [ i686-linux, x86_64-linux, x86_64-darwin ] fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] ForestStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] + for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - formal: [ i686-linux, x86_64-linux, x86_64-darwin ] FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] - format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] + formal: [ i686-linux, x86_64-linux, x86_64-darwin ] format: [ i686-linux, x86_64-linux, x86_64-darwin ] + format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] formattable: [ i686-linux, x86_64-linux, x86_64-darwin ] - forml: [ i686-linux, x86_64-linux, x86_64-darwin ] formlets-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] formlets: [ i686-linux, x86_64-linux, x86_64-darwin ] + forml: [ i686-linux, x86_64-linux, x86_64-darwin ] formura: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3898,23 +3899,23 @@ dont-distribute-packages: free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] free-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-seq-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] freer: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] - freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-seq-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + friday: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3925,17 +3926,17 @@ dont-distribute-packages: FTPLine: [ i686-linux, x86_64-linux, x86_64-darwin ] ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] + full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-client: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-git-hook: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot: [ i686-linux, x86_64-linux, x86_64-darwin ] funcons-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] function-instances-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] - functor-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] + functor-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ] funion: [ i686-linux, x86_64-linux, x86_64-darwin ] funpat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3943,16 +3944,15 @@ dont-distribute-packages: fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] + fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] - g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] + fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] + gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] - gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3960,8 +3960,8 @@ dont-distribute-packages: gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] - geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] + geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3975,17 +3975,17 @@ dont-distribute-packages: generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] genetics: [ i686-linux, x86_64-linux, x86_64-darwin ] - geni-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - GenI: [ i686-linux, x86_64-linux, x86_64-darwin ] geniconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] genifunctors: [ i686-linux, x86_64-linux, x86_64-darwin ] + geni-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] + GenI: [ i686-linux, x86_64-linux, x86_64-darwin ] geniplate: [ i686-linux, x86_64-linux, x86_64-darwin ] geniserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] genprog: [ i686-linux, x86_64-linux, x86_64-darwin ] GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ] gentlemark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3995,17 +3995,17 @@ dont-distribute-packages: genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geoip2: [ i686-linux, x86_64-linux, x86_64-darwin ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] - geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] + geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] geolite-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] geom2d: [ i686-linux, x86_64-linux, x86_64-darwin ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] + geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] getemx: [ i686-linux, x86_64-linux, x86_64-darwin ] getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4015,7 +4015,21 @@ dont-distribute-packages: ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghci-history-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghci-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4023,67 +4037,54 @@ dont-distribute-packages: ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-history-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] + giak: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstvideo: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtk-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtksource: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pangocairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit2webextension: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - giak: [ i686-linux, x86_64-linux, x86_64-darwin ] ginger: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-pangocairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] giphy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] gist: [ i686-linux, x86_64-linux, x86_64-darwin ] + GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] + github: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-release: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] git-jump: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] git-mediate: [ i686-linux, x86_64-linux, x86_64-darwin ] git-object: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] git-sanity: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-release: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - github: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] gitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] givegif: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-webkit2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-webkit2webextension: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] glapp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4095,10 +4096,10 @@ dont-distribute-packages: glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] gll: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ] global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ] global: [ i686-linux, x86_64-linux, x86_64-darwin ] + global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ] + glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ] glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeVec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4118,6 +4119,7 @@ dont-distribute-packages: gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] gnome-keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] gnss-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] goa: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4135,17 +4137,17 @@ dont-distribute-packages: gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] + GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2-for-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-oauth2-jwt: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] - GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-oauth2-jwt: [ i686-linux, x86_64-linux, x86_64-darwin ] googleplus: [ i686-linux, x86_64-linux, x86_64-darwin ] googlepolyline: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleSB: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleSuggest: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4171,16 +4173,6 @@ dont-distribute-packages: grapefruit-records: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-ui-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] Graphalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4192,28 +4184,38 @@ dont-distribute-packages: graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] gray-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] graylog: [ i686-linux, x86_64-linux, x86_64-darwin ] - greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard: [ i686-linux, x86_64-linux, x86_64-darwin ] + greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] gremlin-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] - grid: [ i686-linux, x86_64-linux, x86_64-darwin ] gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + grid: [ i686-linux, x86_64-linux, x86_64-darwin ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] + groundhog: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-inspector: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog: [ i686-linux, x86_64-linux, x86_64-darwin ] group-with: [ i686-linux, x86_64-linux, x86_64-darwin ] Grow: [ i686-linux, x86_64-linux, x86_64-darwin ] growler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4223,27 +4225,27 @@ dont-distribute-packages: gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ] gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-cast-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] guid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4251,16 +4253,25 @@ dont-distribute-packages: GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] gyah-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] - h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] - h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] - H: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] habit: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-handler-snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-interface-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-sparks: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-frontend-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4270,23 +4281,10 @@ dont-distribute-packages: hack-handler-hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-kibro: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-simpleserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-cleanpath: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-jsonp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-interface-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-sparks: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] - HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] hactors: [ i686-linux, x86_64-linux, x86_64-darwin ] haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4305,8 +4303,8 @@ dont-distribute-packages: hakyll-contrib-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4328,20 +4326,18 @@ dont-distribute-packages: handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] Hangman: [ i686-linux, x86_64-linux, x86_64-darwin ] hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] - hans-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] hans: [ i686-linux, x86_64-linux, x86_64-darwin ] + hans-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] haphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] happraise: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-Data: [ i686-linux, x86_64-linux, x86_64-darwin ] - happs-hsp-template: [ i686-linux, x86_64-linux, x86_64-darwin ] happs-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + happs-hsp-template: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-IxSet: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-Server: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-State: [ i686-linux, x86_64-linux, x86_64-darwin ] - happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] - HAppS-Util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4353,6 +4349,7 @@ dont-distribute-packages: happstack-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-hstringtemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-monad-peel: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4362,17 +4359,18 @@ dont-distribute-packages: happstack-static-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-yui: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - happy-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] + HAppS-Util: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] + happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + happy-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] - har: [ i686-linux, x86_64-linux, x86_64-darwin ] harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] hardware-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] + har: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4381,27 +4379,24 @@ dont-distribute-packages: haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ] hascal: [ i686-linux, x86_64-linux, x86_64-darwin ] hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] + hascat: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-system: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascat: [ i686-linux, x86_64-linux, x86_64-darwin ] Haschoo: [ i686-linux, x86_64-linux, x86_64-darwin ] HasGP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hash: [ i686-linux, x86_64-linux, x86_64-darwin ] hashable-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] + hash: [ i686-linux, x86_64-linux, x86_64-darwin ] hashids: [ i686-linux, x86_64-linux, x86_64-darwin ] hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] hashtables-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] - hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] - hask: [ i686-linux, x86_64-linux, x86_64-darwin ] haskakafka: [ i686-linux, x86_64-linux, x86_64-darwin ] haskanoid: [ i686-linux, x86_64-linux, x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4409,6 +4404,9 @@ dont-distribute-packages: haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell2010: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell98: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell98libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4416,15 +4414,38 @@ dont-distribute-packages: haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-catchio-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-catchio-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-catchio-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-flat: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hdbc-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hdbc-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hdbc-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hdbc-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-import-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-mpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-names: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] + Haskelloids: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4433,14 +4454,16 @@ dont-distribute-packages: haskell-read-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskellscrabble: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskellscript: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-prisms: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4450,62 +4473,36 @@ dont-distribute-packages: haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellTutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tyrant: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell2010: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell98: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell98libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-connect-hdbc-catchio-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-connect-hdbc-catchio-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-connect-hdbc-catchio-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-connect-hdbc-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-connect-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-flat: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] - Haskelloids: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskellscrabble: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskellscript: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellTutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] + hask: [ i686-linux, x86_64-linux, x86_64-darwin ] haskmon: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-core: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-node: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-script: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-util: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-wallet: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoon-httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoon-salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoon: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoon-salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskore: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore-supercollider: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskore: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] - haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] + haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4513,20 +4510,21 @@ dont-distribute-packages: hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-cabal-install: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] haste: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] + has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] hastily: [ i686-linux, x86_64-linux, x86_64-darwin ] - hat: [ i686-linux, x86_64-linux, x86_64-darwin ] Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + hat: [ i686-linux, x86_64-linux, x86_64-darwin ] hats: [ i686-linux, x86_64-linux, x86_64-darwin ] haverer: [ i686-linux, x86_64-linux, x86_64-darwin ] HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4536,8 +4534,8 @@ dont-distribute-packages: haxl-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haxr: [ i686-linux, x86_64-linux, x86_64-darwin ] + haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haxy: [ i686-linux, x86_64-linux, x86_64-darwin ] hayland: [ i686-linux, x86_64-linux, x86_64-darwin ] hayoo-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4549,6 +4547,7 @@ dont-distribute-packages: hbeat: [ i686-linux, x86_64-linux, x86_64-darwin ] hblas: [ i686-linux, x86_64-linux, x86_64-darwin ] hblock: [ i686-linux, x86_64-linux, x86_64-darwin ] + h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] hburg: [ i686-linux, x86_64-linux, x86_64-darwin ] HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4564,13 +4563,13 @@ dont-distribute-packages: hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbc-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - HDBC-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbc-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] + HDBC-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbi: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbi: [ i686-linux, x86_64-linux, x86_64-darwin ] hDFA: [ i686-linux, x86_64-linux, x86_64-darwin ] hdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] hdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4594,32 +4593,32 @@ dont-distribute-packages: heist-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] heist-async: [ i686-linux, x86_64-linux, x86_64-darwin ] heist: [ i686-linux, x86_64-linux, x86_64-darwin ] - helics-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] helics: [ i686-linux, x86_64-linux, x86_64-darwin ] + helics-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] helium: [ i686-linux, x86_64-linux, x86_64-darwin ] helix: [ i686-linux, x86_64-linux, x86_64-darwin ] - hell: [ i686-linux, x86_64-linux, x86_64-darwin ] hellage: [ i686-linux, x86_64-linux, x86_64-darwin ] + hell: [ i686-linux, x86_64-linux, x86_64-darwin ] hellnet: [ i686-linux, x86_64-linux, x86_64-darwin ] helm: [ i686-linux, x86_64-linux, x86_64-darwin ] help-esb: [ i686-linux, x86_64-linux, x86_64-darwin ] hemkay: [ i686-linux, x86_64-linux, x86_64-darwin ] hemokit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hen: [ i686-linux, x86_64-linux, x86_64-darwin ] henet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hen: [ i686-linux, x86_64-linux, x86_64-darwin ] hepevt: [ i686-linux, x86_64-linux, x86_64-darwin ] - her-lexer-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - her-lexer: [ i686-linux, x86_64-linux, x86_64-darwin ] HERA: [ i686-linux, x86_64-linux, x86_64-darwin ] herbalizer: [ i686-linux, x86_64-linux, x86_64-darwin ] HerbiePlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] heredocs: [ i686-linux, x86_64-linux, x86_64-darwin ] + her-lexer: [ i686-linux, x86_64-linux, x86_64-darwin ] + her-lexer-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] - hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] - herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] + herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] hesh: [ i686-linux, x86_64-linux, x86_64-darwin ] hesql: [ i686-linux, x86_64-linux, x86_64-darwin ] hetris: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4627,12 +4626,12 @@ dont-distribute-packages: hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4645,7 +4644,6 @@ dont-distribute-packages: hfractal: [ i686-linux, x86_64-linux, x86_64-darwin ] HFrequencyQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] hfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - hg-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] hgalib: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-API: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-Audio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4657,6 +4655,7 @@ dont-distribute-packages: HGamer3D-Enet-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-Graphics3D: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-GUI: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-InputSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-Network: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-Ogre-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4665,7 +4664,7 @@ dont-distribute-packages: HGamer3D-SFML-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-WinEvent: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-Wire: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ] + hg-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] hgdbmi: [ i686-linux, x86_64-linux, x86_64-darwin ] HGE2D: [ i686-linux, x86_64-linux, x86_64-darwin ] hgearman: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4676,12 +4675,13 @@ dont-distribute-packages: hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] + h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] hi3status: [ i686-linux, x86_64-linux, x86_64-darwin ] - hi: [ i686-linux, x86_64-linux, x86_64-darwin ] + H: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] hidapi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4697,33 +4697,34 @@ dont-distribute-packages: higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] highjson: [ i686-linux, x86_64-linux, x86_64-darwin ] highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] + hi: [ i686-linux, x86_64-linux, x86_64-darwin ] himg: [ i686-linux, x86_64-linux, x86_64-darwin ] himpy: [ i686-linux, x86_64-linux, x86_64-darwin ] hindley-milner: [ i686-linux, x86_64-linux, x86_64-darwin ] hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] - hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] + hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - hip: [ i686-linux, x86_64-linux, x86_64-darwin ] hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + hip: [ i686-linux, x86_64-linux, x86_64-darwin ] HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] Hish: [ i686-linux, x86_64-linux, x86_64-darwin ] hissmetrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + historian: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + hist-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-lmf: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - hist-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] - historian: [ i686-linux, x86_64-linux, x86_64-darwin ] HJavaScript: [ i686-linux, x86_64-linux, x86_64-darwin ] hjcase: [ i686-linux, x86_64-linux, x86_64-darwin ] - hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] HJScript: [ i686-linux, x86_64-linux, x86_64-darwin ] + hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] hlcm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4741,8 +4742,8 @@ dont-distribute-packages: hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] HList: [ i686-linux, x86_64-linux, x86_64-darwin ] HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] HMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4757,13 +4758,13 @@ dont-distribute-packages: hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] + HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] hmp3: [ i686-linux, x86_64-linux, x86_64-darwin ] Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4771,15 +4772,15 @@ dont-distribute-packages: hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] - hob: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] + hob: [ i686-linux, x86_64-linux, x86_64-darwin ] hocilib: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] hofix-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hog: [ i686-linux, x86_64-linux, x86_64-darwin ] hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] + hog: [ i686-linux, x86_64-linux, x86_64-darwin ] hogre-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hogre: [ i686-linux, x86_64-linux, x86_64-darwin ] hois: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4794,20 +4795,20 @@ dont-distribute-packages: HongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] honi: [ i686-linux, x86_64-linux, x86_64-darwin ] hoobuddy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hood-off: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodie: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-core: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-publish: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-render: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hood-off: [ i686-linux, x86_64-linux, x86_64-darwin ] hoogle-index: [ i686-linux, x86_64-linux, x86_64-darwin ] hooks-dir: [ i686-linux, x86_64-linux, x86_64-darwin ] hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ] hops: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4822,14 +4823,14 @@ dont-distribute-packages: hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] hpack-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] hpapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaste: [ i686-linux, x86_64-linux, x86_64-darwin ] hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpath: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4848,46 +4849,20 @@ dont-distribute-packages: hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] + h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-io: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-math: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - HROOT: [ i686-linux, x86_64-linux, x86_64-darwin ] hruby: [ i686-linux, x86_64-darwin ] - hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-excelx: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-ffmpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-fltk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-gchart: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-gen-iface: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-GeoIP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-gizapp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-java: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-re: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4897,6 +4872,7 @@ dont-distribute-packages: hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4909,31 +4885,45 @@ dont-distribute-packages: hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] hscd: [ i686-linux, x86_64-linux, x86_64-darwin ] hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] hScraper: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdif: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsemail-ns: [ i686-linux, x86_64-linux, x86_64-darwin ] hsenv: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-excelx: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfacter: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfcsh: [ i686-linux, x86_64-linux, x86_64-darwin ] HSFFIG: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-ffmpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfilt: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-fltk: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-gchart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-gen-iface: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-GeoIP: [ i686-linux, x86_64-linux, x86_64-darwin ] HSGEP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsgnutls-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-gizapp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsgnutls: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsgnutls-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] hsgsom: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSH: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHaruPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSH: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-java: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4941,22 +4931,25 @@ dont-distribute-packages: HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnsq: [ i686-linux, x86_64-linux, x86_64-darwin ] hsntp: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsOpenSSL-x509-system: [ i686-linux, x86_64-linux, x86_64-darwin ] HsOpenSSL: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsOpenSSL-x509-system: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoptions: [ i686-linux, x86_64-linux, x86_64-darwin ] HSoundFile: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4968,17 +4961,22 @@ dont-distribute-packages: hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] hsprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-notes: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] hsreadability: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-re: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4989,15 +4987,19 @@ dont-distribute-packages: hstox: [ i686-linux, x86_64-linux, x86_64-darwin ] hstradeking: [ i686-linux, x86_64-linux, x86_64-darwin ] HStringTemplateHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] hsverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] hsXenCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] hsyscall: [ i686-linux, x86_64-linux, x86_64-darwin ] hszephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5020,12 +5022,12 @@ dont-distribute-packages: http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] + httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] - https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hub: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5051,27 +5053,27 @@ dont-distribute-packages: huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] - HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] + HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5086,13 +5088,13 @@ dont-distribute-packages: hydrogen-cli-args: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-multimap: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-prelude-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen-prelude-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ] hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5109,10 +5111,10 @@ dont-distribute-packages: iap-verifier: [ i686-linux, x86_64-linux, x86_64-darwin ] ib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] IcoGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] - ide-backend-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + ide-backend-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] + ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] idempotent: [ i686-linux, x86_64-linux, x86_64-darwin ] identifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5123,8 +5125,8 @@ dont-distribute-packages: ifcxt: [ i686-linux, x86_64-linux, x86_64-darwin ] iff: [ i686-linux, x86_64-linux, x86_64-darwin ] IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] - ig: [ i686-linux, x86_64-linux, x86_64-darwin ] ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] + ig: [ i686-linux, x86_64-linux, x86_64-darwin ] igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] igrf: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5134,6 +5136,7 @@ dont-distribute-packages: ihaskell-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-display: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-hatex: [ i686-linux, x86_64-linux, x86_64-darwin ] + ihaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-magic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5141,22 +5144,21 @@ dont-distribute-packages: ihaskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-rlangqq: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] illuminate: [ i686-linux, x86_64-linux, x86_64-darwin ] imagemagick: [ i686-linux, x86_64-linux, x86_64-darwin ] imagepaste: [ i686-linux, x86_64-linux, x86_64-darwin ] - imap: [ i686-linux, x86_64-linux, x86_64-darwin ] imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] + imap: [ i686-linux, x86_64-linux, x86_64-darwin ] imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] + imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + implicit: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] - implicit: [ i686-linux, x86_64-linux, x86_64-darwin ] imports: [ i686-linux, x86_64-linux, x86_64-darwin ] impossible: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5169,12 +5171,12 @@ dont-distribute-packages: IndexedList: [ i686-linux, x86_64-linux, x86_64-darwin ] indices: [ i686-linux, x86_64-linux, x86_64-darwin ] indieweb-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - inf-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] - infer-upstream: [ i686-linux, x86_64-linux, x86_64-darwin ] infernu: [ i686-linux, x86_64-linux, x86_64-darwin ] + infer-upstream: [ i686-linux, x86_64-linux, x86_64-darwin ] infinity: [ i686-linux, x86_64-linux, x86_64-darwin ] - infix: [ i686-linux, x86_64-linux, x86_64-darwin ] + inf-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] + infix: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5195,27 +5197,27 @@ dont-distribute-packages: interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] - interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolation: [ i686-linux, x86_64-linux, x86_64-darwin ] interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] - intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - intro: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + intro: [ i686-linux, x86_64-linux, x86_64-darwin ] + intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] - invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] - io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] ion: [ i686-linux, x86_64-linux, x86_64-darwin ] - IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] + io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] + IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] - ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5226,10 +5228,10 @@ dont-distribute-packages: irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] iridium: [ i686-linux, x86_64-linux, x86_64-darwin ] - iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] - is: [ i686-linux, x86_64-linux, x86_64-darwin ] + iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] + is: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] iso8583-bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5237,33 +5239,33 @@ dont-distribute-packages: isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] itemfield: [ i686-linux, x86_64-linux, x86_64-darwin ] - iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] + iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] - iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - iterio-server: [ i686-linux, x86_64-linux, x86_64-darwin ] iterIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + iterio-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] ivor: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-backend-c: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-bitdata: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-serialize: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-stdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory: [ i686-linux, x86_64-linux, x86_64-darwin ] ivy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] ixdopp: [ i686-linux, x86_64-linux, x86_64-darwin ] ixmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] iyql: [ i686-linux, x86_64-linux, x86_64-darwin ] j2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] + JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ] jail: [ i686-linux, x86_64-linux, x86_64-darwin ] jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5272,12 +5274,12 @@ dont-distribute-packages: jason: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] javaclass: [ i686-linux, x86_64-linux, x86_64-darwin ] - Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] + java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] - Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] + Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] javav: [ i686-linux, x86_64-linux, x86_64-darwin ] + Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5287,42 +5289,42 @@ dont-distribute-packages: joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] jort: [ i686-linux, x86_64-linux, x86_64-darwin ] - js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] + js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] + json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + json2: [ i686-linux, x86_64-linux, x86_64-darwin ] json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] json-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] + JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] json-incremental-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-litobj: [ i686-linux, x86_64-linux, x86_64-darwin ] json-pointer-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] json-python: [ i686-linux, x86_64-linux, x86_64-darwin ] json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - json2: [ i686-linux, x86_64-linux, x86_64-darwin ] - JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] - JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonrpc-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonschema-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonsql: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5335,45 +5337,45 @@ dont-distribute-packages: JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-device: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-joystick: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-leap: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-spacenav: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-device: [ i686-linux, x86_64-linux, x86_64-darwin ] kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] + Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] kanji: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] + kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] katip: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-environment-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-solutions-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-reactivelenses: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-network: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-polling: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactivelenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] Ketchup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5387,8 +5389,8 @@ dont-distribute-packages: kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] kickass-torrents-dump-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] KiCS-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] - KiCS-prophecy: [ i686-linux, x86_64-linux, x86_64-darwin ] KiCS: [ i686-linux, x86_64-linux, x86_64-darwin ] + KiCS-prophecy: [ i686-linux, x86_64-linux, x86_64-darwin ] kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] kit: [ i686-linux, x86_64-linux, x86_64-darwin ] kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5407,22 +5409,16 @@ dont-distribute-packages: ktx: [ i686-linux, x86_64-linux, x86_64-darwin ] kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] - l-bfgs-b: [ i686-linux, x86_64-linux, x86_64-darwin ] - L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] labeled-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] laborantin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] labyrinth: [ i686-linux, x86_64-linux, x86_64-darwin ] + labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] laika: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5433,17 +5429,21 @@ dont-distribute-packages: lambdacube-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-ir: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] Lambdajudge: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdatex: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdatwit: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaya-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] Lambdaya: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5470,15 +5470,15 @@ dont-distribute-packages: language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - large-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] LargeCardinalHierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] + large-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] - lat: [ i686-linux, x86_64-linux, x86_64-darwin ] latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-function-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] + lat: [ i686-linux, x86_64-linux, x86_64-darwin ] LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5487,6 +5487,7 @@ dont-distribute-packages: lazyset: [ i686-linux, x86_64-linux, x86_64-darwin ] lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] + l-bfgs-b: [ i686-linux, x86_64-linux, x86_64-darwin ] lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] LDAP: [ i686-linux, x86_64-linux, x86_64-darwin ] ldapply: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5502,24 +5503,24 @@ dont-distribute-packages: legion: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] + lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] + lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] lentil: [ i686-linux, x86_64-linux, x86_64-darwin ] - lenz-template: [ i686-linux, x86_64-linux, x86_64-darwin ] lenz: [ i686-linux, x86_64-linux, x86_64-darwin ] + lenz-template: [ i686-linux, x86_64-linux, x86_64-darwin ] Level0: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] lgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - lha: [ i686-linux, x86_64-linux, x86_64-darwin ] lhae: [ i686-linux, x86_64-linux, x86_64-darwin ] + lha: [ i686-linux, x86_64-linux, x86_64-darwin ] lhc: [ i686-linux, x86_64-linux, x86_64-darwin ] lhe: [ i686-linux, x86_64-linux, x86_64-darwin ] lhs2TeX-hl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5556,8 +5557,8 @@ dont-distribute-packages: libzfs: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] - lighttpd-conf-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] lighttpd-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] + lighttpd-conf-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] lilypond: [ i686-linux, x86_64-linux, x86_64-darwin ] Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5566,12 +5567,12 @@ dont-distribute-packages: linda: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] linebreak: [ i686-linux, x86_64-linux, x86_64-darwin ] LinguisticsTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5579,8 +5580,8 @@ dont-distribute-packages: linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] linkedhashmap: [ i686-linux, x86_64-linux, x86_64-darwin ] linklater: [ i686-linux, x86_64-linux, x86_64-darwin ] - linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] linode: [ i686-linux, x86_64-linux, x86_64-darwin ] + linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-cgroup: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-kmod: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5591,72 +5592,72 @@ dont-distribute-packages: lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] lipsum-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] liquid-fixpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] + listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-libcurl: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] - listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ListTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - lit: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] + lit: [ i686-linux, x86_64-linux, x86_64-darwin ] live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] ll-picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] llsd: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-base: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-base-types: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-base-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-base: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-data-interop: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-darwin: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] + log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] - log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] logger: [ i686-linux, x86_64-linux, x86_64-darwin ] logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] + log: [ i686-linux, x86_64-linux, x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] - Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] + LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] - LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] + Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] logplex-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] logsink: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanXiragan: [ i686-linux, x86_64-linux, x86_64-darwin ] lojysamban: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-apps: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] - lol-typing: [ i686-linux, x86_64-linux, x86_64-darwin ] lol: [ i686-linux, x86_64-linux, x86_64-darwin ] loli: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-typing: [ i686-linux, x86_64-linux, x86_64-darwin ] lookup-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-while: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5667,11 +5668,12 @@ dont-distribute-packages: loshadka: [ i686-linux, x86_64-linux, x86_64-darwin ] lostcities: [ i686-linux, x86_64-linux, x86_64-darwin ] lowgl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lp-diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] + lp-diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] + ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] ltiv1p1: [ i686-linux, x86_64-linux, x86_64-darwin ] ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5704,15 +5706,15 @@ dont-distribute-packages: magma: [ i686-linux, x86_64-linux, x86_64-darwin ] mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] maid: [ i686-linux, x86_64-linux, x86_64-darwin ] - mailchimp-subscribe: [ i686-linux, x86_64-linux, x86_64-darwin ] mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ] + mailchimp-subscribe: [ i686-linux, x86_64-linux, x86_64-darwin ] mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ] majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] majority: [ i686-linux, x86_64-linux, x86_64-darwin ] + makedo: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] make-package: [ i686-linux, x86_64-linux, x86_64-darwin ] - makedo: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-all: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5720,6 +5722,7 @@ dont-distribute-packages: manatee-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-filemanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-imageviewer: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-ircclient: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-mplayer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5729,16 +5732,15 @@ dont-distribute-packages: manatee-template: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee: [ i686-linux, x86_64-linux, x86_64-darwin ] mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] + markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-pap: [ i686-linux, x86_64-linux, x86_64-darwin ] - markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] markup-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5757,9 +5759,9 @@ dont-distribute-packages: maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] + MaybeT: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - MaybeT: [ i686-linux, x86_64-linux, x86_64-darwin ] MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] MBot: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5776,10 +5778,10 @@ dont-distribute-packages: MeanShift: [ i686-linux, x86_64-linux, x86_64-darwin ] Measure: [ i686-linux, x86_64-linux, x86_64-darwin ] mecab: [ i686-linux, x86_64-linux, x86_64-darwin ] - mech: [ i686-linux, x86_64-linux, x86_64-darwin ] Mecha: [ i686-linux, x86_64-linux, x86_64-darwin ] - Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mech: [ i686-linux, x86_64-linux, x86_64-darwin ] mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] + Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5788,24 +5790,23 @@ dont-distribute-packages: melody: [ i686-linux, x86_64-linux, x86_64-darwin ] memcached-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] memcached: [ i686-linux, x86_64-linux, x86_64-darwin ] + memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] messente: [ i686-linux, x86_64-linux, x86_64-darwin ] - meta-misc: [ i686-linux, x86_64-linux, x86_64-darwin ] - meta-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ] + meta-misc: [ i686-linux, x86_64-linux, x86_64-darwin ] + meta-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ] metric: [ i686-linux, x86_64-linux, x86_64-darwin ] - Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] - metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ] mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] - mi: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5814,12 +5815,13 @@ dont-distribute-packages: micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] midair: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd2: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] + mi: [ i686-linux, x86_64-linux, x86_64-darwin ] mikmod: [ i686-linux, x86_64-linux, x86_64-darwin ] milena: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-string: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5841,8 +5843,8 @@ dont-distribute-packages: mix-arrows: [ i686-linux, x86_64-linux, x86_64-darwin ] mixed-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] mnist-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5861,56 +5863,56 @@ dont-distribute-packages: moesocks: [ i686-linux, x86_64-linux, x86_64-darwin ] mole: [ i686-linux, x86_64-linux, x86_64-darwin ] mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-mtl-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] + Monadius: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-levels: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lgbt: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadLib-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadloc-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-log: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lrs: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-parallel-progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadRandomLazy: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-st: [ i686-linux, x86_64-linux, x86_64-darwin ] + monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadStack: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-st: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-task: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadCatchIO-mtl-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadCatchIO-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] - Monadius: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadLib-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadloc-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadRandomLazy: [ i686-linux, x86_64-linux, x86_64-darwin ] - monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadStack: [ i686-linux, x86_64-linux, x86_64-darwin ] monarch: [ i686-linux, x86_64-linux, x86_64-darwin ] Monaris: [ i686-linux, x86_64-linux, x86_64-darwin ] - Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ] + Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] mondo: [ i686-linux, x86_64-linux, x86_64-darwin ] money: [ i686-linux, x86_64-linux, x86_64-darwin ] - mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] - mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] + mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5924,8 +5926,8 @@ dont-distribute-packages: mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] - mp: [ i686-linux, x86_64-linux, x86_64-darwin ] mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ] + mp: [ i686-linux, x86_64-linux, x86_64-darwin ] mpppc: [ i686-linux, x86_64-linux, x86_64-darwin ] mpretty: [ i686-linux, x86_64-linux, x86_64-darwin ] mpris: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5934,12 +5936,12 @@ dont-distribute-packages: mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] - ms: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-idl: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] msh: [ i686-linux, x86_64-linux, x86_64-darwin ] + ms: [ i686-linux, x86_64-linux, x86_64-darwin ] msi-kb-backlit: [ i686-linux, x86_64-linux, x86_64-darwin ] MSQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] MTGBuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5956,8 +5958,8 @@ dont-distribute-packages: multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] - multiplate-simplified: [ i686-linux, x86_64-linux, x86_64-darwin ] multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + multiplate-simplified: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5966,48 +5968,47 @@ dont-distribute-packages: Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] muon: [ i686-linux, x86_64-linux, x86_64-darwin ] murder: [ i686-linux, x86_64-linux, x86_64-darwin ] - murmur: [ i686-linux, x86_64-linux, x86_64-darwin ] murmurhash3: [ i686-linux, x86_64-linux, x86_64-darwin ] + murmur: [ i686-linux, x86_64-linux, x86_64-darwin ] + musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] music-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] music-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] music-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] music-score: [ i686-linux, x86_64-linux, x86_64-darwin ] music-sibelius: [ i686-linux, x86_64-linux, x86_64-darwin ] music-suite: [ i686-linux, x86_64-linux, x86_64-darwin ] - musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] - mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] - mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] myo: [ i686-linux, x86_64-linux, x86_64-darwin ] MyPrimes: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell-nem: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ] mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] - n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] NameGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] namelist: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanoAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-cryptr: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanoAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] nanomsg: [ i686-linux, x86_64-linux, x86_64-darwin ] nanoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6017,8 +6018,8 @@ dont-distribute-packages: narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] NaturalLanguageAlphabets: [ i686-linux, x86_64-linux, x86_64-darwin ] + natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] naver-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] NearContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] neat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6029,12 +6030,12 @@ dont-distribute-packages: Neks: [ i686-linux, x86_64-linux, x86_64-darwin ] nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ] nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] + nero: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - nero: [ i686-linux, x86_64-linux, x86_64-darwin ] - nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] NestedFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] nestedmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] netease-fm: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6042,14 +6043,14 @@ dont-distribute-packages: netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] netstring-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-input-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-input-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6060,6 +6061,7 @@ dont-distribute-packages: network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] network-dbus: [ i686-linux, x86_64-linux, x86_64-darwin ] network-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] + networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] network-hans: [ i686-linux, x86_64-linux, x86_64-darwin ] network-interfacerequest: [ i686-linux, x86_64-linux, x86_64-darwin ] network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6076,10 +6078,9 @@ dont-distribute-packages: network-uri-static: [ i686-linux, x86_64-linux, x86_64-darwin ] network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] + neural: [ i686-linux, x86_64-linux, x86_64-darwin ] neural-network-blashs: [ i686-linux, x86_64-linux, x86_64-darwin ] neural-network-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - neural: [ i686-linux, x86_64-linux, x86_64-darwin ] newports: [ i686-linux, x86_64-linux, x86_64-darwin ] newsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] newt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6088,8 +6089,8 @@ dont-distribute-packages: newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] next-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] nfc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ngrams-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + ngrams-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] niagra: [ i686-linux, x86_64-linux, x86_64-darwin ] nibblestring: [ i686-linux, x86_64-linux, x86_64-darwin ] nicovideo-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6101,23 +6102,24 @@ dont-distribute-packages: nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] - nm: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] + n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] + nm: [ i686-linux, x86_64-linux, x86_64-darwin ] nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] - no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] noise: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] nonfree: [ i686-linux, x86_64-linux, x86_64-darwin ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] + no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] - not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6125,8 +6127,8 @@ dont-distribute-packages: nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] - null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] nullary: [ i686-linux, x86_64-linux, x86_64-darwin ] + null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] nullpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6137,17 +6139,17 @@ dont-distribute-packages: nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] nvim-hs-ghcid: [ i686-linux, x86_64-linux, x86_64-darwin ] nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] + NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] obd: [ i686-linux, x86_64-linux, x86_64-darwin ] oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] - obj: [ i686-linux, x86_64-linux, x86_64-darwin ] Object: [ i686-linux, x86_64-linux, x86_64-darwin ] objectid: [ i686-linux, x86_64-linux, x86_64-darwin ] ObjectIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + obj: [ i686-linux, x86_64-linux, x86_64-darwin ] octohat: [ i686-linux, x86_64-linux, x86_64-darwin ] octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6156,14 +6158,14 @@ dont-distribute-packages: off-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - oi: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + oi: [ i686-linux, x86_64-linux, x86_64-darwin ] ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] old-version: [ i686-linux, x86_64-linux, x86_64-darwin ] olwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] - Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] omega: [ i686-linux, x86_64-linux, x86_64-darwin ] + Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] omnicodec: [ i686-linux, x86_64-linux, x86_64-darwin ] on-a-horse: [ i686-linux, x86_64-linux, x86_64-darwin ] one-liner: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6171,13 +6173,8 @@ dont-distribute-packages: onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-witness: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLWrappers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6189,7 +6186,9 @@ dont-distribute-packages: OpenGLCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] opengles: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenGLRaw21: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] openid: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] openpgp-crypto-api: [ i686-linux, x86_64-linux, x86_64-darwin ] openpgp-Crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6199,25 +6198,28 @@ dont-distribute-packages: openssl-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] opentype: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-witness: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] operational-alacarte: [ i686-linux, x86_64-linux, x86_64-darwin ] optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] - orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] - order-statistic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - order-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] orders: [ i686-linux, x86_64-linux, x86_64-darwin ] + order-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] + order-statistic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] - orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode: [ i686-linux, x86_64-linux, x86_64-darwin ] + orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] origami: [ i686-linux, x86_64-linux, x86_64-darwin ] OrPatterns: [ i686-linux, x86_64-linux, x86_64-darwin ] osc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6226,10 +6228,10 @@ dont-distribute-packages: OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ i686-linux, x86_64-linux, x86_64-darwin ] - pack: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + pack: [ i686-linux, x86_64-linux, x86_64-darwin ] packman: [ i686-linux, x86_64-linux, x86_64-darwin ] packunused: [ i686-linux, x86_64-linux, x86_64-darwin ] pacman-memcache: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6238,16 +6240,16 @@ dont-distribute-packages: PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] + PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] - PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-prelude-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-prelude-semigroupoids: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa: [ i686-linux, x86_64-linux, x86_64-darwin ] papillon: [ i686-linux, x86_64-linux, x86_64-darwin ] pappy: [ i686-linux, x86_64-linux, x86_64-darwin ] paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6255,23 +6257,23 @@ dont-distribute-packages: parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco: [ i686-linux, x86_64-linux, x86_64-darwin ] parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] - parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] parseerror-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] + parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] - parser-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] parsergen: [ i686-linux, x86_64-linux, x86_64-darwin ] + parser-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] partage: [ i686-linux, x86_64-linux, x86_64-darwin ] + partial: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-isomorphisms: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial: [ i686-linux, x86_64-linux, x86_64-darwin ] partly: [ i686-linux, x86_64-linux, x86_64-darwin ] passage: [ i686-linux, x86_64-linux, x86_64-darwin ] PasswordGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6286,8 +6288,8 @@ dont-distribute-packages: patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-adaptive-hoops: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - pb: [ i686-linux, x86_64-linux, x86_64-darwin ] pbc4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + pb: [ i686-linux, x86_64-linux, x86_64-darwin ] PBKDF2: [ i686-linux, x86_64-linux, x86_64-darwin ] pcf: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6299,22 +6301,22 @@ dont-distribute-packages: peano: [ i686-linux, x86_64-linux, x86_64-darwin ] PeanoWitnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] - peg: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] + peg: [ i686-linux, x86_64-linux, x86_64-darwin ] pell: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] penny: [ i686-linux, x86_64-linux, x86_64-darwin ] + penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] peparser: [ i686-linux, x86_64-linux, x86_64-darwin ] perceptron: [ i686-linux, x86_64-linux, x86_64-darwin ] perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] - PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] + PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] period: [ i686-linux, x86_64-linux, x86_64-darwin ] periodic: [ i686-linux, x86_64-linux, x86_64-darwin ] perm: [ i686-linux, x86_64-linux, x86_64-darwin ] - permute: [ i686-linux, x86_64-linux, x86_64-darwin ] PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] + permute: [ i686-linux, x86_64-linux, x86_64-darwin ] persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6333,11 +6335,11 @@ dont-distribute-packages: peyotls-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] peyotls: [ i686-linux, x86_64-linux, x86_64-darwin ] pez: [ i686-linux, x86_64-linux, x86_64-darwin ] - pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] - pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] pgdl: [ i686-linux, x86_64-linux, x86_64-darwin ] + pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] + pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6347,21 +6349,21 @@ dont-distribute-packages: phraskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Phsu: [ i686-linux, x86_64-linux, x86_64-darwin ] phybin: [ i686-linux, x86_64-linux, x86_64-darwin ] - pi-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] - pi-forall: [ i686-linux, x86_64-linux, x86_64-darwin ] pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] + pi-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] + pi-forall: [ i686-linux, x86_64-linux, x86_64-darwin ] piki: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-core: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6380,8 +6382,8 @@ dont-distribute-packages: pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] - pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] + pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ] plailude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6395,17 +6397,17 @@ dont-distribute-packages: plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] pocket-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] - point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] pokemon-go-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] pokitdok: [ i686-linux, x86_64-linux, x86_64-darwin ] polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6419,8 +6421,8 @@ dont-distribute-packages: polynomial: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] - polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] + polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] pomodoro: [ i686-linux, x86_64-linux, x86_64-darwin ] ponder: [ i686-linux, x86_64-linux, x86_64-darwin ] pong-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6438,6 +6440,7 @@ dont-distribute-packages: posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] + PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6445,9 +6448,8 @@ dont-distribute-packages: postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] postmaster: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6461,8 +6463,8 @@ dont-distribute-packages: practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] preamble: [ i686-linux, x86_64-linux, x86_64-darwin ] precis: [ i686-linux, x86_64-linux, x86_64-darwin ] - pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] pregame: [ i686-linux, x86_64-linux, x86_64-darwin ] preliminaries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6475,34 +6477,34 @@ dont-distribute-packages: presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-error: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] pringletons: [ i686-linux, x86_64-linux, x86_64-darwin ] print-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] - priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] + priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] - proc: [ i686-linux, x86_64-linux, x86_64-darwin ] + processing: [ i686-linux, x86_64-linux, x86_64-darwin ] process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] process-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] process-listlike: [ i686-linux, x86_64-linux, x86_64-darwin ] process-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] process-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - processing: [ i686-linux, x86_64-linux, x86_64-darwin ] + proc: [ i686-linux, x86_64-linux, x86_64-darwin ] procrastinating-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - progress: [ i686-linux, x86_64-linux, x86_64-darwin ] progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + progress: [ i686-linux, x86_64-linux, x86_64-darwin ] progression: [ i686-linux, x86_64-linux, x86_64-darwin ] progressive: [ i686-linux, x86_64-linux, x86_64-darwin ] proj4-hs-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] promise: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6513,14 +6515,14 @@ dont-distribute-packages: proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] prosper: [ i686-linux, x86_64-linux, x86_64-darwin ] proteaaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-optparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-protoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-optparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-protoc: [ i686-linux, x86_64-linux, x86_64-darwin ] protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6539,17 +6541,17 @@ dont-distribute-packages: punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] - pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] - push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] - push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] + push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] + push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] + push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6558,8 +6560,8 @@ dont-distribute-packages: pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] qc-oi-testgenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] qd: [ i686-linux, x86_64-linux, x86_64-darwin ] + qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] qed: [ i686-linux, x86_64-linux, x86_64-darwin ] qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] qif: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6567,11 +6569,11 @@ dont-distribute-packages: QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-imager: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] - qt: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] + qt: [ i686-linux, x86_64-linux, x86_64-darwin ] QuadEdge: [ i686-linux, x86_64-linux, x86_64-darwin ] quadratic-irrational: [ i686-linux, x86_64-linux, x86_64-darwin ] QuadTree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6582,7 +6584,6 @@ dont-distribute-packages: quenya-verb: [ i686-linux, x86_64-linux, x86_64-darwin ] querystring-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] - quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6597,19 +6598,19 @@ dont-distribute-packages: quickcheck-with-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] + quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] Quickson: [ i686-linux, x86_64-linux, x86_64-darwin ] quickterm: [ i686-linux, x86_64-linux, x86_64-darwin ] quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] - quipper-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + quipper-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] quoridor-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] qux: [ i686-linux, x86_64-linux, x86_64-darwin ] - R-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] rabocsv2qif: [ i686-linux, x86_64-linux, x86_64-darwin ] rad: [ i686-linux, x86_64-linux, x86_64-darwin ] radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6622,19 +6623,19 @@ dont-distribute-packages: rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] - rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] random-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] + RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] random-variates: [ i686-linux, x86_64-linux, x86_64-darwin ] - RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] - range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] + rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] Range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] + range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-example-config: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-bufs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6656,7 +6657,6 @@ dont-distribute-packages: rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6665,13 +6665,14 @@ dont-distribute-packages: reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - read-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] + react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ReadArgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + read-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] readline-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] readme-lhs: [ i686-linux, x86_64-linux, x86_64-darwin ] readpyc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6680,68 +6681,68 @@ dont-distribute-packages: reasonable-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] record-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] record-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] - record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] - record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] record: [ i686-linux, x86_64-linux, x86_64-darwin ] - records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] + records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] - ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] - ref: [ i686-linux, x86_64-linux, x86_64-darwin ] refcount: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] references: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] + ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-animation: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] refty: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexqq: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tdfa-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tdfa-quasiquoter: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tdfa-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-type: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexqq: [ i686-linux, x86_64-linux, x86_64-darwin ] regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] + regions: [ i686-linux, x86_64-linux, x86_64-darwin ] regions-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] regions-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] regions-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - regions: [ i686-linux, x86_64-linux, x86_64-darwin ] register-machine-typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] regress: [ i686-linux, x86_64-linux, x86_64-darwin ] regular-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + regular: [ i686-linux, x86_64-linux, x86_64-darwin ] regular-web: [ i686-linux, x86_64-linux, x86_64-darwin ] regular-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] - regular: [ i686-linux, x86_64-linux, x86_64-darwin ] reheat: [ i686-linux, x86_64-linux, x86_64-darwin ] - rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] + rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reinterpret-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6750,10 +6751,10 @@ dont-distribute-packages: remark: [ i686-linux, x86_64-linux, x86_64-darwin ] remarks: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-json-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-json-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-json: [ i686-linux, x86_64-linux, x86_64-darwin ] remote: [ i686-linux, x86_64-linux, x86_64-darwin ] + remote-json-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + remote-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + remote-json-server: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-array: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6772,12 +6773,12 @@ dont-distribute-packages: repl: [ i686-linux, x86_64-linux, x86_64-darwin ] replicant: [ i686-linux, x86_64-linux, x86_64-darwin ] repo-based-blog: [ i686-linux, x86_64-linux, x86_64-darwin ] - repr: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + repr: [ i686-linux, x86_64-linux, x86_64-darwin ] + reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] req: [ i686-linux, x86_64-linux, x86_64-darwin ] - reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6809,13 +6810,13 @@ dont-distribute-packages: ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] risc386: [ i686-linux, x86_64-linux, x86_64-darwin ] rivers: [ i686-linux, x86_64-linux, x86_64-darwin ] + rivet: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet-simple-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] - rivet: [ i686-linux, x86_64-linux, x86_64-darwin ] RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] - rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ] rlglue: [ i686-linux, x86_64-linux, x86_64-darwin ] + rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] RMP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6840,18 +6841,19 @@ dont-distribute-packages: rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + roundtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-string: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] route-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] route-planning: [ i686-linux, x86_64-linux, x86_64-darwin ] rowrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] + R-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] rpc-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] - rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] + rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rss: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6867,7 +6869,6 @@ dont-distribute-packages: runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - s-cargot: [ i686-linux, x86_64-linux, x86_64-darwin ] SableCC2Hs: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-access: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6877,31 +6878,31 @@ dont-distribute-packages: safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - safer-file-handles-text: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] + safer-file-handles-text: [ i686-linux, x86_64-linux, x86_64-darwin ] saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] samtools-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] samtools-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] sandlib: [ i686-linux, x86_64-linux, x86_64-darwin ] sarasvati: [ i686-linux, x86_64-linux, x86_64-darwin ] sarsi: [ i686-linux, x86_64-linux, x86_64-darwin ] sasl: [ i686-linux, x86_64-linux, x86_64-darwin ] - sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - sat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-backends: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-minisat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] + sat: [ i686-linux, x86_64-linux, x86_64-darwin ] + sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp2udp: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6911,13 +6912,14 @@ dont-distribute-packages: SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + s-cargot: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] + scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-texmath: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants: [ i686-linux, x86_64-linux, x86_64-darwin ] scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6946,8 +6948,8 @@ dont-distribute-packages: sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] - sec: [ i686-linux, x86_64-linux, x86_64-darwin ] secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] + sec: [ i686-linux, x86_64-linux, x86_64-darwin ] seclib: [ i686-linux, x86_64-linux, x86_64-darwin ] second-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] secp256k1: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6957,16 +6959,16 @@ dont-distribute-packages: secure-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] - selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] + selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ] semdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] - semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] + semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] + semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6974,15 +6976,13 @@ dont-distribute-packages: sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] separated: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] - SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] seqalign: [ i686-linux, x86_64-linux, x86_64-darwin ] + SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] - serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - serv: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7005,19 +7005,21 @@ dont-distribute-packages: servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] + serv: [ i686-linux, x86_64-linux, x86_64-darwin ] + serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] + set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7026,12 +7028,11 @@ dont-distribute-packages: SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] sfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] SFont: [ i686-linux, x86_64-linux, x86_64-darwin ] - SG: [ i686-linux, x86_64-linux, x86_64-darwin ] - sgd: [ i686-linux, x86_64-linux, x86_64-darwin ] SGdemo: [ i686-linux, x86_64-linux, x86_64-darwin ] + sgd: [ i686-linux, x86_64-linux, x86_64-darwin ] sgf: [ i686-linux, x86_64-linux, x86_64-darwin ] + SG: [ i686-linux, x86_64-linux, x86_64-darwin ] sgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] - sha-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] shadower: [ i686-linux, x86_64-linux, x86_64-darwin ] shadowsocks: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7047,12 +7048,13 @@ dont-distribute-packages: shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-fields: [ i686-linux, x86_64-linux, x86_64-darwin ] + sha-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] she: [ i686-linux, x86_64-linux, x86_64-darwin ] shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] - shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7061,50 +7063,50 @@ dont-distribute-packages: shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] Shu-thing: [ i686-linux, x86_64-linux, x86_64-darwin ] sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] - sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] + sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] simd: [ i686-linux, x86_64-linux, x86_64-darwin ] simgi: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-genetic-algorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-index: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-neural-networks: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleH: [ i686-linux, x86_64-linux, x86_64-darwin ] - simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-index: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-neural-networks: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] simplenote: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleServer: [ i686-linux, x86_64-linux, x86_64-darwin ] simplessh: [ i686-linux, x86_64-linux, x86_64-darwin ] simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] - sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] + sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] sjsp: [ i686-linux, x86_64-linux, x86_64-darwin ] skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] skell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7129,12 +7131,12 @@ dont-distribute-packages: smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] - smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] + smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] snake: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-accept: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7144,14 +7146,6 @@ dont-distribute-packages: snap-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] snap: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-acid-state: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-actionlog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7169,8 +7163,8 @@ dont-distribute-packages: snaplet-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mandrill: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-oauth: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7186,14 +7180,22 @@ dont-distribute-packages: snaplet-scoped-session: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-sedna: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-sqlite-simple-jwt-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-sqlite-simple-jwt-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-typed-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-wordpress: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] snappy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] sneakyterm: [ i686-linux, x86_64-linux, x86_64-darwin ] sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7201,17 +7203,17 @@ dont-distribute-packages: snm: [ i686-linux, x86_64-linux, x86_64-darwin ] snmp: [ i686-linux, x86_64-linux, x86_64-darwin ] snorkels: [ i686-linux, x86_64-linux, x86_64-darwin ] - snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] soap-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] + socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7235,9 +7237,9 @@ dont-distribute-packages: spaceprobe: [ i686-linux, x86_64-linux, x86_64-darwin ] spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] spata: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7260,22 +7262,22 @@ dont-distribute-packages: spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] - sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ] + sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ] squeeze: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] sshd-lint: [ i686-linux, x86_64-linux, x86_64-darwin ] + ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7283,24 +7285,24 @@ dont-distribute-packages: stable-marriage: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] starling: [ i686-linux, x86_64-linux, x86_64-darwin ] starrover2: [ i686-linux, x86_64-linux, x86_64-darwin ] Stasis: [ i686-linux, x86_64-linux, x86_64-darwin ] - state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] - state: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + state: [ i686-linux, x86_64-linux, x86_64-darwin ] + state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] - stats: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] + stats: [ i686-linux, x86_64-linux, x86_64-darwin ] stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7310,37 +7312,37 @@ dont-distribute-packages: stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] + stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] StockholmAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] store: [ i686-linux, x86_64-linux, x86_64-darwin ] - str: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] StrappedTemplates: [ i686-linux, x86_64-linux, x86_64-darwin ] stratum-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + stratux: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-types: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratux: [ i686-linux, x86_64-linux, x86_64-darwin ] - stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] + stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + str: [ i686-linux, x86_64-linux, x86_64-darwin ] + StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-identity: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] - string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] + string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] StringUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe-http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7351,9 +7353,9 @@ dont-distribute-packages: structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] - sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] + sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7362,15 +7364,15 @@ dont-distribute-packages: sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] + super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] - SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] + SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7383,48 +7385,46 @@ dont-distribute-packages: SWMMoutGetMB: [ i686-linux, x86_64-linux, x86_64-darwin ] sws: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] SybWidget: [ i686-linux, x86_64-linux, x86_64-darwin ] + syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] - sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - sym: [ i686-linux, x86_64-linux, x86_64-darwin ] symengine-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] + sym: [ i686-linux, x86_64-linux, x86_64-darwin ] + sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sync: [ i686-linux, x86_64-linux, x86_64-darwin ] + sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] syncthing-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] syntactic: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] + SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees-fork-bairyn: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] - syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-core: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] + sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] systemstats: [ i686-linux, x86_64-linux, x86_64-darwin ] - t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] t3-client: [ i686-linux, x86_64-linux, x86_64-darwin ] t3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - ta: [ i686-linux, x86_64-linux, x86_64-darwin ] - table-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] - table-tennis: [ i686-linux, x86_64-linux, x86_64-darwin ] table: [ i686-linux, x86_64-linux, x86_64-darwin ] - Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] + table-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] tables: [ i686-linux, x86_64-linux, x86_64-darwin ] + Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] + table-tennis: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7435,13 +7435,14 @@ dont-distribute-packages: tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] + ta: [ i686-linux, x86_64-linux, x86_64-darwin ] tailfile-hinotify: [ i686-linux, x86_64-linux, x86_64-darwin ] - takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] + takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] + tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-term: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] Tape: [ i686-linux, x86_64-linux, x86_64-darwin ] target: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7459,9 +7460,9 @@ dont-distribute-packages: TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] tccli: [ i686-linux, x86_64-linux, x86_64-darwin ] - tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - tcp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] + tcp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] tdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7474,19 +7475,19 @@ dont-distribute-packages: template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] templateify: [ i686-linux, x86_64-linux, x86_64-darwin ] templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] + template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] tempodb: [ i686-linux, x86_64-linux, x86_64-darwin ] temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ] tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] terminal-progress-bar: [ i686-linux, x86_64-linux, x86_64-darwin ] termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] + term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7494,17 +7495,17 @@ dont-distribute-packages: test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-skip: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] testPkg: [ i686-linux, x86_64-linux, x86_64-darwin ] testrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-sandbox-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7513,81 +7514,81 @@ dont-distribute-packages: text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] + textocat-api: [ i686-linux, x86_64-linux, x86_64-darwin ] text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] text-render: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-show-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] text-show: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-show-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + textual: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-zipper-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] - textocat-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - textual: [ i686-linux, x86_64-linux, x86_64-darwin ] tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tftp: [ i686-linux, x86_64-linux, x86_64-darwin ] tga: [ i686-linux, x86_64-linux, x86_64-darwin ] th-build: [ i686-linux, x86_64-linux, x86_64-darwin ] th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-fold: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-kinds-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-sccs: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] THEff: [ i686-linux, x86_64-linux, x86_64-darwin ] themoviedb: [ i686-linux, x86_64-linux, x86_64-darwin ] thentos-cookie-session: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-fold: [ i686-linux, x86_64-linux, x86_64-darwin ] thih: [ i686-linux, x86_64-linux, x86_64-darwin ] thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-kinds-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] threads-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-sccs: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tibetan-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] + tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] - tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] TigerHash: [ i686-linux, x86_64-linux, x86_64-darwin ] + tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] tightrope: [ i686-linux, x86_64-linux, x86_64-darwin ] tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] + timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ] time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] time-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] time-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] - timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] tinyMesh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7600,12 +7601,10 @@ dont-distribute-packages: tld: [ i686-linux, x86_64-linux, x86_64-darwin ] tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] tn: [ i686-linux, x86_64-linux, x86_64-darwin ] - to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] - to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ] todos: [ i686-linux, x86_64-linux, x86_64-darwin ] tofromxml: [ i686-linux, x86_64-linux, x86_64-darwin ] + to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] tokenify: [ i686-linux, x86_64-linux, x86_64-darwin ] toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7615,6 +7614,8 @@ dont-distribute-packages: Top: [ i686-linux, x86_64-linux, x86_64-darwin ] topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] torch: [ i686-linux, x86_64-linux, x86_64-darwin ] + to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] + to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] total: [ i686-linux, x86_64-linux, x86_64-darwin ] touched: [ i686-linux, x86_64-linux, x86_64-darwin ] Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7622,9 +7623,9 @@ dont-distribute-packages: toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ] tpar: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ] + traced: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ] trace: [ i686-linux, x86_64-linux, x86_64-darwin ] - traced: [ i686-linux, x86_64-linux, x86_64-darwin ] tracetree: [ i686-linux, x86_64-linux, x86_64-darwin ] tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7646,11 +7647,12 @@ dont-distribute-packages: trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] - treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap: [ i686-linux, x86_64-linux, x86_64-darwin ] treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] + t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] Treiber: [ i686-linux, x86_64-linux, x86_64-darwin ] tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] TrendGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7665,17 +7667,17 @@ dont-distribute-packages: tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] tslib: [ i686-linux, x86_64-linux, x86_64-darwin ] tslogger: [ i686-linux, x86_64-linux, x86_64-darwin ] - tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] - tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] - turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] turingMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] + turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] tweak: [ i686-linux, x86_64-linux, x86_64-darwin ] twee: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7699,45 +7701,45 @@ dont-distribute-packages: txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] + typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] type-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] type-combinators-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] + typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] + TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] type-int: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-bst: [ i686-linux, x86_64-linux, x86_64-darwin ] + typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-natural-number-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] + typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] + typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] type-settheory: [ i686-linux, x86_64-linux, x86_64-darwin ] type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ] type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] - typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] - typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] - typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] - typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] - types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] - typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] u2f: [ i686-linux, x86_64-linux, x86_64-darwin ] uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] uber: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] - udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] udbus: [ i686-linux, x86_64-linux, x86_64-darwin ] + udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] uhexdump: [ i686-linux, x86_64-linux, x86_64-darwin ] ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7748,13 +7750,13 @@ dont-distribute-packages: unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] - unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] unicoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] + unique-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] + unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] units-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7778,11 +7780,11 @@ dont-distribute-packages: uri-enumerator-file: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] - url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] urlcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] + url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] urn: [ i686-linux, x86_64-linux, x86_64-darwin ] urxml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7795,31 +7797,30 @@ dont-distribute-packages: utc: [ i686-linux, x86_64-linux, x86_64-darwin ] utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-options: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + uu-options: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] + vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] - valid-names: [ i686-linux, x86_64-linux, x86_64-darwin ] validated-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] Validation: [ i686-linux, x86_64-linux, x86_64-darwin ] validations: [ i686-linux, x86_64-linux, x86_64-darwin ] + valid-names: [ i686-linux, x86_64-linux, x86_64-darwin ] vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] variables: [ i686-linux, x86_64-linux, x86_64-darwin ] - vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] - Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7833,10 +7834,11 @@ dont-distribute-packages: vector-read-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] Verba: [ i686-linux, x86_64-linux, x86_64-darwin ] verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] - verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] + verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7858,8 +7860,8 @@ dont-distribute-packages: vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - vte: [ i686-linux, x86_64-linux, x86_64-darwin ] vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + vte: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7882,8 +7884,8 @@ dont-distribute-packages: wai-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-consul: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-content-type: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7911,49 +7913,52 @@ dont-distribute-packages: watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] - wave: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] + wave: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routes-regular: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] webapi: [ i686-linux, x86_64-linux, x86_64-darwin ] webapp: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] webcloud: [ i686-linux, x86_64-linux, x86_64-darwin ] WebCont: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] - webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] + webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] - webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] + webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-routes-regular: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] websockets-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] weighted-regexp: [ i686-linux, x86_64-linux, x86_64-darwin ] welshy: [ i686-linux, x86_64-linux, x86_64-darwin ] + Wheb: [ i686-linux, x86_64-linux, x86_64-darwin ] wheb-mongo: [ i686-linux, x86_64-linux, x86_64-darwin ] wheb-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wheb-strapped: [ i686-linux, x86_64-linux, x86_64-darwin ] - Wheb: [ i686-linux, x86_64-linux, x86_64-darwin ] whim: [ i686-linux, x86_64-linux, x86_64-darwin ] whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7968,10 +7973,10 @@ dont-distribute-packages: wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] wiringPi: [ i686-linux, x86_64-linux, x86_64-darwin ] wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] - wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPLib: [ i686-linux, x86_64-linux, x86_64-darwin ] wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ] WMSigner: [ i686-linux, x86_64-linux, x86_64-darwin ] wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7998,7 +8003,6 @@ dont-distribute-packages: wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] - wx: [ i686-linux, x86_64-linux, x86_64-darwin ] wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] wxc: [ i686-linux, x86_64-linux, x86_64-darwin ] wxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8007,10 +8011,10 @@ dont-distribute-packages: wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] WxGeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] + wx: [ i686-linux, x86_64-linux, x86_64-darwin ] wxSimpleCanvas: [ i686-linux, x86_64-linux, x86_64-darwin ] wxturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] wyvern: [ i686-linux, x86_64-linux, x86_64-darwin ] - x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8021,6 +8025,7 @@ dont-distribute-packages: xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] + x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] xhaskell-library: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8033,24 +8038,24 @@ dont-distribute-packages: xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-conduit-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-isogen: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-prettify: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-to-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] - XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] - XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8079,15 +8084,15 @@ dont-distribute-packages: yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-union: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ] yamlkeysdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-union: [ i686-linux, x86_64-linux, x86_64-darwin ] + yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ] yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8105,8 +8110,8 @@ dont-distribute-packages: yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-hashdb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8114,8 +8119,8 @@ dont-distribute-packages: yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-crud-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-crud: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-crud-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-csp: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8134,8 +8139,8 @@ dont-distribute-packages: yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-rst: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8147,6 +8152,7 @@ dont-distribute-packages: yesod-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] + yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8155,13 +8161,12 @@ dont-distribute-packages: yi-mode-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-mode-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] - yices: [ i686-linux, x86_64-linux, x86_64-darwin ] - yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] + yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] yjsvg: [ i686-linux, x86_64-linux, x86_64-darwin ] yoctoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] + Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] yql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8174,9 +8179,9 @@ dont-distribute-packages: ZEBEDDE: [ i686-linux, x86_64-linux, x86_64-darwin ] zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] zeno: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq3-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ] ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ] zim-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8190,9 +8195,9 @@ dont-distribute-packages: zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ] zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] + zoom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-cache-pcm: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-cache-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - zoom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] From 53d55cbfe9f3e9c7d3b9d729fa93d9adf5bf0f84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 26 Feb 2017 22:31:51 +0100 Subject: [PATCH 213/274] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d654ea25e98c918aeb46cdb7b7d2372bec114101. --- .../haskell-modules/hackage-packages.nix | 6315 +++++++++++++---- 1 file changed, 4817 insertions(+), 1498 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d31dc82822c..a2e477baa15 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -255,6 +255,8 @@ self: { pname = "ADPfusion"; version = "0.5.2.0"; sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bits containers DPutils mmorph mtl OrderedBits primitive PrimitiveArray QuickCheck strict template-haskell th-orphans @@ -455,6 +457,8 @@ self: { pname = "ALUT"; version = "2.4.0.2"; sha256 = "b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base OpenAL StateVar transformers ]; librarySystemDepends = [ freealut ]; homepage = "https://github.com/haskell-openal/ALUT"; @@ -754,8 +758,9 @@ self: { }) {}; "AlanDeniseEricLauren" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-core, MonadRandom - , mtl, QuickCheck, random, random-shuffle, transformers, vector + ({ mkDerivation, base, containers, criterion, hspec, hspec-core + , MonadRandom, mtl, QuickCheck, random, random-shuffle + , transformers, vector }: mkDerivation { pname = "AlanDeniseEricLauren"; @@ -768,6 +773,7 @@ self: { base containers hspec hspec-core MonadRandom QuickCheck random transformers ]; + benchmarkHaskellDepends = [ base containers criterion ]; homepage = "http://github.com/enolan/AlanDeniseEricLauren"; description = "Find the minimal subset/submap satisfying some property"; license = stdenv.lib.licenses.bsd3; @@ -916,8 +922,7 @@ self: { pname = "AppleScript"; version = "0.2.0.1"; sha256 = "796b0a7deaa5a6ae0f30f98f9451afa5033aea96b41df52b1d4bd7b27d8fbcca"; - isLibrary = false; - isExecutable = false; + doHaddock = false; homepage = "https://github.com/reinerp/haskell-AppleScript"; description = "Call AppleScript from Haskell, and then call back into Haskell"; license = stdenv.lib.licenses.bsd3; @@ -1246,6 +1251,8 @@ self: { pname = "BenchmarkHistory"; version = "0.0.0.2"; sha256 = "a3ab4de30a90e70c3b8bfe28d956322312c5e14b42f94da1051c71ff0853fa3d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cassava deepseq directory statistics time vector ]; @@ -1344,8 +1351,8 @@ self: { }: mkDerivation { pname = "BioHMM"; - version = "1.0.4"; - sha256 = "b3c36291729328b42ba73ee777c4ef1490eccee982b64ee3dbf5103c25d5c2f3"; + version = "1.0.5"; + sha256 = "f32d7c8e0433c38e77c3c06c08fd30bfc6eccaa8a4ccc074638de016ab13793f"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector @@ -2938,6 +2945,8 @@ self: { pname = "ConfigFile"; version = "1.1.4"; sha256 = "ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl parsec ]; homepage = "http://software.complete.org/configfile"; description = "Configuration file reading & writing"; @@ -3248,10 +3257,11 @@ self: { ({ mkDerivation, array, async, attoparsec, attoparsec-conduit, base , binary, blaze-builder, blaze-textual, bytestring, conduit , containers, data-default, directory, doctest, fast-logger - , filepath, hashable, hspec, lens, lifted-base, monad-control - , monad-logger, mtl, network, network-conduit, optparse-applicative - , stm, system-fileio, system-filepath, template-haskell, text, time - , transformers, transformers-base, unordered-containers + , filepath, hashable, hspec, lens, lifted-base + , mersenne-random-pure64, monad-control, monad-logger, mtl, network + , network-conduit, optparse-applicative, stm, system-fileio + , system-filepath, template-haskell, text, time, transformers + , transformers-base, unordered-containers }: mkDerivation { pname = "CurryDB"; @@ -3273,6 +3283,9 @@ self: { testHaskellDepends = [ base conduit directory doctest filepath hspec lifted-base mtl stm ]; + benchmarkHaskellDepends = [ + base bytestring mersenne-random-pure64 mtl + ]; description = "CurryDB: In-memory Key/Value Database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -3435,8 +3448,9 @@ self: { }) {}; "DPutils" = callPackage - ({ mkDerivation, base, containers, kan-extensions, parallel, pipes - , QuickCheck, tasty, tasty-quickcheck, tasty-th, vector + ({ mkDerivation, base, containers, criterion, kan-extensions + , parallel, pipes, QuickCheck, tasty, tasty-quickcheck, tasty-th + , vector }: mkDerivation { pname = "DPutils"; @@ -3449,6 +3463,7 @@ self: { base containers kan-extensions parallel pipes QuickCheck tasty tasty-quickcheck tasty-th vector ]; + benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/choener/DPutils"; description = "utilities for DP"; license = stdenv.lib.licenses.bsd3; @@ -3485,8 +3500,8 @@ self: { }: mkDerivation { pname = "DSA"; - version = "1.0.1"; - sha256 = "cd5fb8bc019734caca4d1351bdc360c8947fc180646be43ee4888c25b9530101"; + version = "1.0.2"; + sha256 = "9c4f9de5fe61be4c25e4696b3ddbf1b38d7f064c4600d24e6021d342194deb1d"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types ghc-prim integer-gmp SHA tagged @@ -3647,7 +3662,7 @@ self: { }) {}; "DataIndex" = callPackage - ({ mkDerivation, base, tasty, tasty-hspec }: + ({ mkDerivation, base, criterion, tasty, tasty-hspec }: mkDerivation { pname = "DataIndex"; version = "0.1.1"; @@ -3657,6 +3672,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/yuhangwang/DataIndex#readme"; description = "A package for adding index column to data files"; license = stdenv.lib.licenses.mit; @@ -4342,31 +4358,41 @@ self: { }) {}; "Earley" = callPackage - ({ mkDerivation, base, ListLike, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, criterion, deepseq, ListLike, parsec, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "Earley"; version = "0.11.0.1"; sha256 = "c207a40926bb0b9de05641a0fc03c22849a2c7e0bc007d2ffef37f33793985b3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ListLike ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq ListLike parsec + ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; }) {}; "Earley_0_12_0_0" = callPackage - ({ mkDerivation, base, ListLike, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, criterion, deepseq, ListLike, parsec + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "Earley"; version = "0.12.0.0"; sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ListLike ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq ListLike parsec + ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -4613,6 +4639,8 @@ self: { pname = "EsounD"; version = "0.2"; sha256 = "59b6f6676e5cd005e296ee8e8f0669522d981f94fb96874deb223133d09842b4"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base-unicode-symbols bindings-EsounD monad-control network regions safer-file-handles storablevector transformers unix @@ -4948,8 +4976,8 @@ self: { ({ mkDerivation, base, STMonadTrans, vector }: mkDerivation { pname = "FastPush"; - version = "0.1.0.2"; - sha256 = "301cf0552dc14adc8865038b7d7f5aac7dc791f4039c790c28262603b129c674"; + version = "0.1.0.3"; + sha256 = "61f383fa02c0c2e34e3905be1ededc0db65012e4a7d55bec747e756bacc7aa7b"; libraryHaskellDepends = [ base STMonadTrans vector ]; homepage = "https://github.com/wyager/FastPush/"; description = "A monad and monad transformer for pushing things onto a stack very fast"; @@ -5316,8 +5344,8 @@ self: { }) {}; "ForestStructures" = callPackage - ({ mkDerivation, base, containers, fgl, QuickCheck, test-framework - , test-framework-quickcheck2, test-framework-th + ({ mkDerivation, base, containers, criterion, fgl, QuickCheck + , test-framework, test-framework-quickcheck2, test-framework-th , unordered-containers, vector, vector-th-unbox }: mkDerivation { @@ -5331,6 +5359,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/choener/ForestStructures"; description = "Tree- and forest structures"; license = stdenv.lib.licenses.bsd3; @@ -5376,8 +5405,8 @@ self: { }) {}; "Foster" = callPackage - ({ mkDerivation, array, base, cmdtheline, containers, random - , strict + ({ mkDerivation, array, base, cmdtheline, containers, criterion + , random, strict }: mkDerivation { pname = "Foster"; @@ -5388,6 +5417,9 @@ self: { executableHaskellDepends = [ array base cmdtheline containers random strict ]; + benchmarkHaskellDepends = [ + array base cmdtheline containers criterion random strict + ]; description = "Utilities to generate and solve puzzles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -5443,15 +5475,17 @@ self: { }) {}; "Frames" = callPackage - ({ mkDerivation, base, directory, ghc-prim, hspec, htoml, pipes - , pretty, primitive, readable, regex-applicative, template-haskell - , temporary, text, transformers, unordered-containers, vector - , vinyl + ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml + , pipes, pretty, primitive, readable, regex-applicative + , template-haskell, temporary, text, transformers + , unordered-containers, vector, vinyl }: mkDerivation { pname = "Frames"; version = "0.1.9"; sha256 = "18eaea64c8f3ff7156ca1dcc372bae3e8ff7538cffce4c415710eae770eb6b25"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ghc-prim pipes primitive readable template-haskell text transformers vector vinyl @@ -5460,6 +5494,7 @@ self: { base directory hspec htoml pretty regex-applicative template-haskell temporary text unordered-containers ]; + benchmarkHaskellDepends = [ base criterion pipes transformers ]; description = "Data frames For working with tabular data files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -5485,6 +5520,8 @@ self: { pname = "FreeTypeGL"; version = "0.0.4"; sha256 = "4e85f39777c29cc145b760289906b3a9f8e518296af258004223d87bbbdc5183"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base freetype2 OpenGL ]; description = "Loadable texture fonts for OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -5717,6 +5754,8 @@ self: { pname = "GLUT"; version = "2.7.0.11"; sha256 = "da270ef3027f48fd62115e6f1e90a44334e3da5524e4619dbab6d186f5511b5d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers OpenGL StateVar transformers ]; @@ -6349,6 +6388,8 @@ self: { pname = "GrammarProducts"; version = "0.1.1.2"; sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ADPfusion ansi-wl-pprint base bytestring containers data-default FormalGrammars lens newtype parsers PrimitiveArray semigroups @@ -6795,6 +6836,8 @@ self: { sha256 = "7a3ee21c41e716111c4a3742a66eb448683719a9384afbf7021c5942ac73d2ad"; revision = "1"; editedCabalFile = "da1cef4f99bc200ef3c4c866519859dfee81457aff6a8fa7418c17f210a1e7fd"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers convertible mtl old-time text time utf8-string @@ -6830,6 +6873,8 @@ self: { pname = "HDBC-odbc"; version = "2.5.0.1"; sha256 = "96000a9573e873d231ca09f974c4ff0c4d7ec86d7ec6ceaaeb0cc02fc5e6de99"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring concurrent-extra HDBC mtl time utf8-string ]; @@ -6847,11 +6892,14 @@ self: { pname = "HDBC-postgresql"; version = "2.3.2.4"; sha256 = "71988482df2efc773e8272a041f46c61bb4357aa3856edbc69d3fb9d09c168fd"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring convertible HDBC mtl old-time parsec time utf8-string ]; librarySystemDepends = [ postgresql ]; + executableSystemDepends = [ postgresql ]; homepage = "http://github.com/hdbc/hdbc-postgresql"; description = "PostgreSQL driver for HDBC"; license = stdenv.lib.licenses.bsd3; @@ -6889,8 +6937,11 @@ self: { pname = "HDBC-sqlite3"; version = "2.3.3.1"; sha256 = "a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ]; librarySystemDepends = [ sqlite ]; + executableSystemDepends = [ sqlite ]; homepage = "https://github.com/hdbc/hdbc-sqlite3"; description = "Sqlite v3 driver for HDBC"; license = stdenv.lib.licenses.bsd3; @@ -6943,6 +6994,8 @@ self: { pname = "HFuse"; version = "0.2.4.5"; sha256 = "e28e0689dfe5f7bc312b842adb02e172b56c3f53a1819ebda7ab39eace6c24a1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ fuse ]; preConfigure = '' @@ -7318,10 +7371,11 @@ self: { }) {}; "HGraphStorage" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , directory, filepath, HUnit, lifted-base, monad-control - , monad-logger, QuickCheck, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, transformers-base + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , criterion, data-default, directory, filepath, HUnit, lifted-base + , monad-control, monad-logger, QuickCheck, resourcet, tar, tasty + , tasty-hunit, tasty-quickcheck, text, text-binary, transformers + , transformers-base, zlib }: mkDerivation { pname = "HGraphStorage"; @@ -7337,6 +7391,11 @@ self: { lifted-base monad-control monad-logger QuickCheck resourcet tasty tasty-hunit tasty-quickcheck text transformers transformers-base ]; + benchmarkHaskellDepends = [ + base binary bytestring Cabal containers criterion data-default + directory filepath monad-logger resourcet tar text text-binary + transformers zlib + ]; homepage = "https://github.com/JPMoresmau/HGraphStorage"; description = "Graph database stored on disk"; license = stdenv.lib.licenses.bsd3; @@ -7959,6 +8018,8 @@ self: { pname = "HSH"; version = "2.1.2"; sha256 = "788a7f25336e7fe9c7d38b68bb4cc0030712fc47e0cdf282267dea1e46b0da9f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath hslogger MissingH mtl process regex-base regex-compat regex-posix unix @@ -8562,6 +8623,8 @@ self: { pname = "HandsomeSoup"; version = "0.4.2"; sha256 = "0ae2dad3fbde1efee9e45b84b2aeb5b526cc7b3ea2cbc5715494f7bde3ceeefb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers HTTP hxt hxt-http mtl network network-uri parsec transformers @@ -9109,6 +9172,8 @@ self: { pname = "Hoed"; version = "0.3.6"; sha256 = "8508f5077a0a45662af4dddd44bf1ce55fb4cd007b0246ce193ff6d439c351db"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring cereal containers directory filepath FPretty libgraph mtl process RBTree regex-posix template-haskell @@ -9252,13 +9317,14 @@ self: { }) {}; "HostAndPort" = callPackage - ({ mkDerivation, base, doctest, hspec, parsec }: + ({ mkDerivation, base, criterion, doctest, hspec, parsec }: mkDerivation { pname = "HostAndPort"; version = "0.2.0"; sha256 = "15a625f5e0f1a510fa1a307127abae2ae2589d9525ff60ed33be39230f335be6"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base doctest hspec ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/bacher09/hostandport"; description = "Parser for host and port pairs like localhost:22"; license = stdenv.lib.licenses.mit; @@ -9385,8 +9451,8 @@ self: { }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4"; - sha256 = "6326b9b1fb07e05a72f8435cc3ae777d696251e43e93b25ec2ff513f7f2bed07"; + version = "0.11.4.1"; + sha256 = "03445cb1ed881f3a8825e375d87af92a5521549ab86042a5bd4d6052b4e7bfbd"; libraryHaskellDepends = [ base bytestring integer-gmp network time ]; @@ -9553,7 +9619,7 @@ self: { }) {}; "Hungarian-Munkres" = callPackage - ({ mkDerivation, array, base, Munkres, random, tasty + ({ mkDerivation, array, base, criterion, Munkres, random, tasty , tasty-quickcheck }: mkDerivation { @@ -9564,6 +9630,7 @@ self: { testHaskellDepends = [ array base Munkres random tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ array base criterion Munkres random ]; description = "A Linear Sum Assignment Problem (LSAP) solver"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -9789,13 +9856,19 @@ self: { }) {}; "IntervalMap" = callPackage - ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: + ({ mkDerivation, base, Cabal, containers, criterion, deepseq + , fingertree, QuickCheck, random, SegmentTree, weigh + }: mkDerivation { pname = "IntervalMap"; version = "0.5.2.0"; sha256 = "031a491ae40c333a3227d147aae9ace42f2f4b535fcbbb991c6b4f35a1531684"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq fingertree random SegmentTree + weigh + ]; homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; description = "Containers for intervals, with efficient search"; license = stdenv.lib.licenses.bsd3; @@ -9905,6 +9978,8 @@ self: { sha256 = "477eecd8af2f070ff648f576ee81ee04efa45cc77b606f7fc09b6f2c156df299"; revision = "1"; editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring bytestring-nums bytestring-trie containers utf8-string @@ -9983,8 +10058,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Jdh"; - version = "0.1.0.0"; - sha256 = "df460a97cde668b6d170ddcbfe547e146de56524108a4e811c6ca7bb26b4e864"; + version = "0.1.0.1"; + sha256 = "8005db8ccfcdd6bab84fcfb8bfc2b357161d5999e6a0ff121bfdd4ab06ece77d"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/brunoczim/Json-Data-for-Haskell"; description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding"; @@ -10070,13 +10145,14 @@ self: { }) {}; "JuicyPixels-extra" = callPackage - ({ mkDerivation, base, hspec, JuicyPixels }: + ({ mkDerivation, base, criterion, hspec, JuicyPixels }: mkDerivation { pname = "JuicyPixels-extra"; version = "0.1.1"; sha256 = "d37b257e7780e18a4e8335523b2f8962efb845da3b1dd84435a684b24a82b9fd"; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; description = "Efficiently scale, crop, flip images with JuicyPixels"; license = stdenv.lib.licenses.bsd3; @@ -10416,6 +10492,8 @@ self: { pname = "LDAP"; version = "0.6.11"; sha256 = "01cb48801eb3033fbd8be6d755863e7fea7d9083afc76aff07b9c42f8e1890b3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ lber openldap ]; testHaskellDepends = [ base HUnit ]; @@ -10929,9 +11007,9 @@ self: { "LogicGrowsOnTrees" = callPackage ({ mkDerivation, AbortT-mtl, AbortT-transformers, base, bytestring - , cereal, cmdtheline, composition, containers, data-ivar, derive - , directory, hslogger, hslogger-template, HUnit, lens - , MonadCatchIO-transformers, monoid-statistics, mtl, multiset + , cereal, cmdtheline, composition, containers, criterion, data-ivar + , deepseq, derive, directory, hslogger, hslogger-template, HUnit + , lens, MonadCatchIO-transformers, monoid-statistics, mtl, multiset , old-locale, operational, prefix-units, pretty, PSQueue , QuickCheck, quickcheck-instances, random, sequential-index , smallcheck, split, stm, test-framework, test-framework-hunit @@ -10942,6 +11020,8 @@ self: { pname = "LogicGrowsOnTrees"; version = "1.1.0.2"; sha256 = "f3f6e7ee3022a60d279eff5d27fd6d3a7ca25972f18077594f90a15ed9cf16fb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ AbortT-mtl AbortT-transformers base bytestring cereal cmdtheline composition containers data-ivar derive directory hslogger @@ -10956,6 +11036,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 test-framework-smallcheck time transformers uuid void ]; + benchmarkHaskellDepends = [ base cereal criterion deepseq ]; description = "a parallel implementation of logic programming using distributed tree exploration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -10970,12 +11051,15 @@ self: { pname = "LogicGrowsOnTrees-MPI"; version = "1.0.0.1.1"; sha256 = "22f5bcb22e731984e40a76ae1d48b0e59329ac5d3bd633efef7cb8140de8146b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal cmdtheline containers data-ivar derive hslogger hslogger-template LogicGrowsOnTrees MonadCatchIO-transformers stm transformers ]; librarySystemDepends = [ openmpi ]; + executableSystemDepends = [ openmpi ]; description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -10991,6 +11075,8 @@ self: { pname = "LogicGrowsOnTrees-network"; version = "1.0.0.4"; sha256 = "7a01eb40f87b5810bfccfb23d49e4a04f7bb630f201425caaa0eeb0a82d9b973"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base cereal cmdtheline composition containers hslogger hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers @@ -11007,7 +11093,7 @@ self: { "LogicGrowsOnTrees-processes" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdtheline, containers - , filepath, FindBin, hslogger, hslogger-template, HUnit + , criterion, filepath, FindBin, hslogger, hslogger-template, HUnit , LogicGrowsOnTrees, MonadCatchIO-transformers, process, random , test-framework, test-framework-hunit, transformers }: @@ -11015,6 +11101,8 @@ self: { pname = "LogicGrowsOnTrees-processes"; version = "1.0.0.2"; sha256 = "766b912ffe650e0ab7cd23a54b51fa440b9e411b63be1d520936bb815af93334"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal cmdtheline containers filepath FindBin hslogger hslogger-template LogicGrowsOnTrees @@ -11024,6 +11112,7 @@ self: { base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees random test-framework test-framework-hunit transformers ]; + benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ]; description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11376,6 +11465,8 @@ self: { pname = "MemoTrie"; version = "0.6.7"; sha256 = "cdab03dc1394e982dd3144ac433b7548d51a55a1c44ddb864e5ac14057c41672"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base newtype-generics ]; homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; @@ -11970,7 +12061,7 @@ self: { }) {}; "MyPrimes" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, time }: mkDerivation { pname = "MyPrimes"; version = "0.1.0.0"; @@ -11979,6 +12070,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base containers ]; + benchmarkHaskellDepends = [ base time ]; homepage = "http://afonso.xyz"; description = "Generate all primes"; license = stdenv.lib.licenses.mit; @@ -12103,8 +12195,9 @@ self: { "NaturalLanguageAlphabets" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary - , bytestring, cereal, cereal-text, deepseq, file-embed, hashable - , intern, LinguisticsTypes, QuickCheck, stringable, system-filepath + , bytestring, cereal, cereal-text, containers, criterion, deepseq + , file-embed, hashable, hashtables, intern, LinguisticsTypes + , mwc-random, QuickCheck, random, stringable, system-filepath , test-framework, test-framework-quickcheck2, test-framework-th , text, text-binary, unordered-containers, vector, vector-th-unbox }: @@ -12123,6 +12216,10 @@ self: { test-framework test-framework-quickcheck2 test-framework-th text unordered-containers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashtables LinguisticsTypes + mwc-random random unordered-containers vector + ]; homepage = "https://github.com/choener/NaturalLanguageAlphabets"; description = "Simple scoring schemes for word alignments"; license = stdenv.lib.licenses.bsd3; @@ -12135,6 +12232,8 @@ self: { pname = "NaturalSort"; version = "0.2.1"; sha256 = "49fd310566c86d85714a1839f1bc845891771dbc023a0befee16f073bbac50f6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring strict ]; homepage = "http://github.com/joachifm/natsort"; description = "Natural sorting for strings"; @@ -12800,6 +12899,8 @@ self: { pname = "OpenAL"; version = "1.7.0.4"; sha256 = "3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ObjectName OpenGL StateVar transformers ]; @@ -13021,19 +13122,20 @@ self: { }) {}; "OrderedBits" = callPackage - ({ mkDerivation, base, bits, primitive, QuickCheck, tasty - , tasty-quickcheck, tasty-th, vector, vector-algorithms + ({ mkDerivation, base, bits, criterion, primitive, QuickCheck + , tasty, tasty-quickcheck, tasty-th, vector, vector-algorithms }: mkDerivation { pname = "OrderedBits"; - version = "0.0.1.1"; - sha256 = "084e073c7b310b36fdfb0ad6c5793ef1478890b8a136160ab555e65b54e81284"; + version = "0.0.1.2"; + sha256 = "14855fdeda5822ea54c588085f98984062d5a7febc8cbb6e8b8f62de28375df5"; libraryHaskellDepends = [ base bits primitive vector vector-algorithms ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector ]; + benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/choener/OrderedBits"; description = "Efficient ordered (by popcount) enumeration of bits"; license = stdenv.lib.licenses.bsd3; @@ -13116,6 +13218,8 @@ self: { pname = "PDBtools"; version = "0.0.3"; sha256 = "d80810bd44765b86c0ebf247f32ddded301eddb587fe12a0bdc378ee6b8fb0c4"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; homepage = "http://www.github.com/rotskoff"; description = "A library for analysis of 3-D protein coordinates"; @@ -13534,6 +13638,8 @@ self: { pname = "Plot-ho-matic"; version = "0.11.0.0"; sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cairo cereal Chart Chart-cairo containers data-default-class generic-accessors glib gtk3 lens text time @@ -14041,6 +14147,8 @@ self: { pname = "QuickPlot"; version = "0.1.0.1"; sha256 = "02864cb2f1abcea25b5956421cfdd596c3b4d3ceafcd54d3aad26f443ba53fb5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring haskell-src-meta parsec scientific snap snap-core template-haskell text vector websockets @@ -14356,17 +14464,17 @@ self: { "Raincat" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl - , OpenGL, random, SDL, SDL-image, SDL-mixer, time + , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time }: mkDerivation { pname = "Raincat"; - version = "1.1.1.3"; - sha256 = "28abdf5df4d4654aee515f0629bab153163af5fd603cbfc9ae291d03918154a9"; + version = "1.2"; + sha256 = "93ce80efedffc63e49bcd3e5745521fa810e438cd2f601de54bca9d9e59eddff"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers extensible-exceptions GLUT mtl OpenGL random SDL - SDL-image SDL-mixer time + base containers extensible-exceptions GLUT mtl OpenGL random sdl2 + sdl2-image sdl2-mixer time ]; homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; @@ -14374,8 +14482,9 @@ self: { }) {}; "Random123" = callPackage - ({ mkDerivation, array, base, data-dword, HUnit, QuickCheck, random - , test-framework, test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, array, base, criterion, data-dword, HUnit + , QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "Random123"; @@ -14386,6 +14495,7 @@ self: { base HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion random ]; homepage = "http://github.com/Manticore/haskell-random123"; description = "Haskell port of Random123 library"; license = stdenv.lib.licenses.mit; @@ -14952,6 +15062,8 @@ self: { pname = "SHA"; version = "1.6.4.2"; sha256 = "c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base binary bytestring ]; testHaskellDepends = [ array base binary bytestring QuickCheck test-framework @@ -15264,6 +15376,8 @@ self: { pname = "SegmentTree"; version = "0.3"; sha256 = "6188c1b1276d7fa0391098a563df73dd522d20b57dc5321fe3418a9e3ca84fc1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; description = "Data structure for querying the set (or count) of intervals covering given point"; license = stdenv.lib.licenses.bsd3; @@ -15558,6 +15672,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "SimpleTableGenerator" = callPackage + ({ mkDerivation, base, Cabal, split }: + mkDerivation { + pname = "SimpleTableGenerator"; + version = "0.2.0.0"; + sha256 = "1b58efcfa9689b1d1c82c5e3016b15d3eaa6d104303feabb31064dff16fe71ad"; + libraryHaskellDepends = [ base split ]; + testHaskellDepends = [ base Cabal ]; + description = "Simple table generator"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "SizeCompare" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -16219,8 +16345,9 @@ self: { "SuffixStructures" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs - , containers, data-default-class, ListLike, primitive, vector - , vector-algorithms, vector-binary-instances + , containers, criterion, data-default-class, deepseq, ListLike + , mwc-random, primitive, vector, vector-algorithms + , vector-binary-instances }: mkDerivation { pname = "SuffixStructures"; @@ -16235,6 +16362,9 @@ self: { executableHaskellDepends = [ aeson base binary bytestring cereal cmdargs containers vector ]; + benchmarkHaskellDepends = [ + base bytestring cmdargs criterion deepseq mwc-random vector + ]; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "Suffix array construction"; license = stdenv.lib.licenses.bsd3; @@ -16481,6 +16611,8 @@ self: { pname = "Takusen"; version = "0.8.7"; sha256 = "9e9fe740a9030e27ee84343a7e308853b0e5d50371a841d9a3979a9f8d99ac57"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC"; license = stdenv.lib.licenses.bsd3; @@ -17769,6 +17901,8 @@ self: { pname = "Win32-notify"; version = "0.3.0.1"; sha256 = "c49159d8154f9ff7d30207901125ceadc2aa94baa3b2996ff0884e9f0158eb7f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers directory Win32 ]; description = "A binding to part of the Win32 library for file notification"; license = stdenv.lib.licenses.bsd3; @@ -17781,6 +17915,8 @@ self: { pname = "Win32-security"; version = "0.1.1"; sha256 = "9eca6c3efea64d83ee3aaf2ec0706695087e98e47c77163ac497f70ad4f90436"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base text Win32 Win32-errors ]; homepage = "https://github.com/anton-dessiatov/Win32-security"; description = "Haskell bindings to a security-related functions of the Windows API"; @@ -18261,7 +18397,7 @@ self: { pname = "Yablog"; version = "0.2.0"; sha256 = "737b4a1ab300cc2d5b8689640b51092b5a54d8ad4cb4bb451699b2367caa4761"; - isLibrary = false; + isLibrary = true; isExecutable = true; executableHaskellDepends = [ base blaze-builder blaze-html bytestring case-insensitive @@ -18327,6 +18463,8 @@ self: { pname = "Yampa-core"; version = "0.2.0"; sha256 = "b78b1367c404e50021a7f17748d894e0c74a8b22dc8e48c7fbceea8fa4adaf1a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base deepseq random vector-space ]; homepage = "https://github.com/ony/Yampa-core"; description = "Library for programming hybrid systems"; @@ -18560,6 +18698,8 @@ self: { pname = "abcBridge"; version = "0.15"; sha256 = "45fef882d6e9c3f7ad48621fc835417df5c161c6743ebc4e4d3cabe9445b113c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aig base base-compat containers directory vector ]; @@ -18827,6 +18967,8 @@ self: { pname = "accelerate-cufft"; version = "0.0.0.1"; sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ accelerate accelerate-cuda accelerate-fourier accelerate-utility base cuda cufft @@ -18909,9 +19051,9 @@ self: { }) {}; "accelerate-fourier" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic - , accelerate-utility, base, containers, QuickCheck, transformers - , utility-ht + ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda + , accelerate-utility, base, containers, criterion, QuickCheck + , transformers, utility-ht }: mkDerivation { pname = "accelerate-fourier"; @@ -18925,6 +19067,10 @@ self: { accelerate accelerate-arithmetic accelerate-utility base QuickCheck utility-ht ]; + benchmarkHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-cuda accelerate-utility + base criterion utility-ht + ]; homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; description = "Fast Fourier transform and convolution using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; @@ -19074,8 +19220,9 @@ self: { "acid-state" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, extensible-exceptions, filepath, mtl, network - , safecopy, stm, template-haskell, unix + , criterion, directory, extensible-exceptions, filepath, mtl + , network, random, safecopy, stm, system-fileio, system-filepath + , template-haskell, unix }: mkDerivation { pname = "acid-state"; @@ -19086,6 +19233,9 @@ self: { extensible-exceptions filepath mtl network safecopy stm template-haskell unix ]; + benchmarkHaskellDepends = [ + base criterion directory mtl random system-fileio system-filepath + ]; homepage = "http://acid-state.seize.it/"; description = "Add ACID guarantees to any serializable Haskell data structure"; license = stdenv.lib.licenses.publicDomain; @@ -19093,8 +19243,9 @@ self: { "acid-state-dist" = callPackage ({ mkDerivation, acid-state, base, bytestring, cereal - , concurrent-extra, containers, directory, filepath, mtl, random - , safe, safecopy, semigroups, stm, transformers, zeromq4-haskell + , concurrent-extra, containers, criterion, directory, filepath, mtl + , random, safe, safecopy, semigroups, stm, transformers + , zeromq4-haskell }: mkDerivation { pname = "acid-state-dist"; @@ -19108,6 +19259,9 @@ self: { testHaskellDepends = [ acid-state base directory mtl random safecopy ]; + benchmarkHaskellDepends = [ + acid-state base criterion directory mtl safecopy + ]; description = "A replication backend for acid-state"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -19348,6 +19502,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "acme-kitchen-sink" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-kitchen-sink"; + version = "0.1.0.0"; + sha256 = "252007a08308670edeef46742da25169025f44b52da8c1ce55fe0fd37c3ea82c"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/marcosdumay/acme-kitchen-sink"; + description = "A place for dumping that does-not-feel-right code while you improve it"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-left-pad" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -19618,13 +19784,14 @@ self: { }) {}; "acme-year" = callPackage - ({ mkDerivation, base, time }: + ({ mkDerivation, base, criterion, time }: mkDerivation { pname = "acme-year"; version = "2016"; sha256 = "b43d1f33434930d8f6f2971eef34bd12c305f3976d7115688b87b00c85f170ff"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/joeyadams/hs-acme-year"; description = "Get the current year"; license = stdenv.lib.licenses.publicDomain; @@ -19738,9 +19905,9 @@ self: { }) {}; "ad" = callPackage - ({ mkDerivation, array, base, comonad, containers, data-reify - , directory, doctest, erf, filepath, free, nats, reflection - , transformers + ({ mkDerivation, array, base, comonad, containers, criterion + , data-reify, directory, doctest, erf, filepath, free, nats + , reflection, transformers }: mkDerivation { pname = "ad"; @@ -19751,6 +19918,7 @@ self: { transformers ]; testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion erf ]; homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -19937,6 +20105,8 @@ self: { pname = "adp-multi"; version = "0.2.3"; sha256 = "4728f3d87728adead1d6ebb33e032dd05673cc43573dc00d52a9522154f7b5d2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers htrace ]; testHaskellDepends = [ array base containers htrace HUnit mtl QuickCheck random-shuffle @@ -19956,6 +20126,8 @@ self: { pname = "adp-multi-monadiccp"; version = "0.2.1"; sha256 = "dae838558f728af3cf1e58aaccfcc66fe66a0d3d33332eb365d710e71facf48f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ adp-multi base containers monadiccp ]; testHaskellDepends = [ adp-multi base containers monadiccp mtl QuickCheck test-framework @@ -20240,6 +20412,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-flat" = callPackage + ({ mkDerivation, aeson, base, text, unordered-containers, vector }: + mkDerivation { + pname = "aeson-flat"; + version = "0.1.0.0"; + sha256 = "1db507abdb802732ffa3444cb227411ad68b430692578fc79e7c19b7165a6214"; + libraryHaskellDepends = [ + aeson base text unordered-containers vector + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/seanhess/aeson-flat#readme"; + description = "Tools for creating flat JSON serializations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-flatten" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, text , unordered-containers @@ -20451,8 +20638,9 @@ self: { }) {}; "aeson-quick" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq - , microlens, tasty, tasty-hunit, text, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, microlens, tasty, tasty-hunit, text + , unordered-containers, vector }: mkDerivation { pname = "aeson-quick"; @@ -20464,6 +20652,7 @@ self: { testHaskellDepends = [ aeson attoparsec base bytestring microlens tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ aeson base bytestring criterion text ]; homepage = "https://github.com/libscott/aeson-quick"; description = "Quick JSON extractions with Aeson"; license = stdenv.lib.licenses.bsd3; @@ -20628,16 +20817,17 @@ self: { }) {}; "affection" = callPackage - ({ mkDerivation, babl, base, clock, containers, gegl, glib, linear + ({ mkDerivation, babl, base, clock, containers, gegl, glib , monad-loops, mtl, sdl2, text }: mkDerivation { pname = "affection"; - version = "0.0.0.2"; - sha256 = "e8e0ba4af134cabf1af0b63e1d010e9d868f881074baf8096551dfdf5c68bf29"; + version = "0.0.0.4"; + sha256 = "31d82e66df577e34b0b96a70111d61918db70db93b3b0a66ce4e27c661688a58"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - babl base clock containers gegl glib linear monad-loops mtl sdl2 - text + babl base clock containers gegl glib monad-loops mtl sdl2 text ]; homepage = "https://github.com/nek0/affection#readme"; description = "A simple Game Engine using SDL"; @@ -20785,6 +20975,8 @@ self: { pname = "agentx"; version = "0.2.0.0"; sha256 = "e61dc3994aaf70cf8823064d56e839ee1af18ae6be30e294214f759064ccb65e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bitwise bytestring containers data-default Diff fclabels mtl network pipes pipes-concurrency pipes-network safe @@ -21372,6 +21564,8 @@ self: { pname = "algebraic-prelude"; version = "0.1.0.1"; sha256 = "8bb052b29571d4c07c03d14eb17f9d302f18e619bbe743509b9ec6e4fde2192d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ algebra base basic-prelude lens semigroups ]; @@ -21381,9 +21575,9 @@ self: { }) {}; "algo-s" = callPackage - ({ mkDerivation, base, bytestring, errors, foldl, hspec, mwc-random - , optparse-applicative, primitive, QuickCheck, smallcheck - , unordered-containers + ({ mkDerivation, base, bytestring, criterion, errors, foldl, hspec + , mwc-random, optparse-applicative, primitive, QuickCheck + , smallcheck, unordered-containers }: mkDerivation { pname = "algo-s"; @@ -21400,6 +21594,7 @@ self: { testHaskellDepends = [ base errors foldl hspec mwc-random QuickCheck smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; description = "An implementation of Knuth's algorithm S"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -21667,6 +21862,8 @@ self: { pname = "alsa-pcm"; version = "0.6.0.4"; sha256 = "9aae1379903b8445073f8a2b6ccf86b904b4045247747516530a165a3f76ca2a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ alsa-core array base extensible-exceptions sample-frame storable-record @@ -21700,6 +21897,8 @@ self: { pname = "alsa-seq"; version = "0.6.0.7"; sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ alsa-core array base bytestring data-accessor enumset extensible-exceptions poll transformers utility-ht @@ -23197,7 +23396,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "amazonka-s3-streaming_0_2_0_0" = callPackage + "amazonka-s3-streaming_0_2_0_1" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet @@ -23205,8 +23404,8 @@ self: { }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.0"; - sha256 = "d4a583eead4b7d050c9a6e762d77050cf07c5da541a04e25424850fa0e66dbd7"; + version = "0.2.0.1"; + sha256 = "714c62e6b903dfc968f72c3966ffbce14dd1f885f4c95a34a7bd1a49e84c6966"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23578,6 +23777,7 @@ self: { safe scientific statistics text vector vector-algorithms ]; testHaskellDepends = [ base doctest tasty tasty-hunit vector ]; + benchmarkHaskellDepends = [ base statistics ]; homepage = "https://github.com/jsermeno/amby#readme"; description = "Statistical data visualization"; license = stdenv.lib.licenses.bsd3; @@ -23894,9 +24094,9 @@ self: { }) {}; "angle" = callPackage - ({ mkDerivation, base, containers, directory, filepath, haskeline - , mtl, process, QuickCheck, split, tasty, tasty-quickcheck - , transformers, transformers-compat + ({ mkDerivation, base, containers, criterion, directory, filepath + , haskeline, mtl, process, QuickCheck, split, tasty + , tasty-quickcheck, transformers, transformers-compat }: mkDerivation { pname = "angle"; @@ -23916,6 +24116,7 @@ self: { base containers mtl QuickCheck tasty tasty-quickcheck transformers transformers-compat ]; + benchmarkHaskellDepends = [ base criterion ]; description = "A small, general-purpose programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -24054,6 +24255,8 @@ self: { pname = "ansi-terminal"; version = "0.6.2.3"; sha256 = "4dc02cb53e9ca7c8800bbdfc0337b961e5a945382cd09a6a40c6170126e0ee42"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base unix ]; homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; @@ -24066,6 +24269,8 @@ self: { pname = "ansi-wl-pprint"; version = "0.6.7.3"; sha256 = "3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; homepage = "http://github.com/ekmett/ansi-wl-pprint"; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; @@ -24262,6 +24467,8 @@ self: { pname = "anydbm"; version = "1.0.7"; sha256 = "d33410fc5fad79bd5a5bcc24248f6e5a7a3133ede5111c31a8c58068b219b3e7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl ]; homepage = "http://software.complete.org/anydbm"; description = "Interface for DBM-like database systems"; @@ -24303,9 +24510,9 @@ self: { }) {}; "apache-md5" = callPackage - ({ mkDerivation, base, bytestring, HUnit, MonadRandom, openssl - , process, random, test-framework, test-framework-hunit - , transformers + ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit + , MonadRandom, openssl, process, random, test-framework + , test-framework-hunit, transformers }: mkDerivation { pname = "apache-md5"; @@ -24320,6 +24527,10 @@ self: { test-framework-hunit transformers ]; testSystemDepends = [ openssl ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq MonadRandom + ]; + benchmarkSystemDepends = [ openssl ]; homepage = "https://github.com/trskop/apache-md5"; description = "Apache specific MD5 digest algorighm"; license = stdenv.lib.licenses.bsd3; @@ -24799,12 +25010,15 @@ self: { }) {}; "app-lens" = callPackage - ({ mkDerivation, base, containers, lens, mtl }: + ({ mkDerivation, base, containers, criterion, deepseq, lens, mtl }: mkDerivation { pname = "app-lens"; version = "0.1.0.3"; sha256 = "ecb966a61eee1465d2e89d98ee2dfbdd52c7bc37707e817809ff520c91f9d744"; libraryHaskellDepends = [ base containers lens mtl ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq lens mtl + ]; homepage = "https://bitbucket.org/kztk/app-lens"; description = "applicative (functional) bidirectional programming beyond composition chains"; license = stdenv.lib.licenses.bsd3; @@ -25261,9 +25475,9 @@ self: { }) {}; "arena" = callPackage - ({ mkDerivation, base, bytes, bytestring, containers, digest - , directory, filepath, mtl, persistent-vector, safe, semigroups - , unix + ({ mkDerivation, base, bytes, bytestring, containers, criterion + , digest, directory, filepath, mtl, persistent-vector, safe + , semigroups, unix }: mkDerivation { pname = "arena"; @@ -25278,6 +25492,9 @@ self: { testHaskellDepends = [ base bytes containers directory mtl semigroups ]; + benchmarkHaskellDepends = [ + base criterion directory mtl semigroups + ]; description = "A journaled data store"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -25508,9 +25725,9 @@ self: { }) {}; "arithmoi" = callPackage - ({ mkDerivation, array, base, containers, ghc-prim, integer-gmp - , mtl, QuickCheck, random, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, transformers + ({ mkDerivation, array, base, containers, criterion, ghc-prim + , integer-gmp, mtl, QuickCheck, random, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers , transformers-compat }: mkDerivation { @@ -25525,6 +25742,7 @@ self: { base containers QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck transformers transformers-compat ]; + benchmarkHaskellDepends = [ base containers criterion random ]; homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; @@ -25635,7 +25853,7 @@ self: { }) {}; "array-primops" = callPackage - ({ mkDerivation, base, ghc-prim, QuickCheck, tasty + ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, tasty , tasty-quickcheck }: mkDerivation { @@ -25646,6 +25864,7 @@ self: { testHaskellDepends = [ base ghc-prim QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ghc-prim ]; description = "Extra foreign primops for primitive arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -25846,6 +26065,8 @@ self: { pname = "ascii-progress"; version = "0.3.3.0"; sha256 = "7e3fa6b80c09a83c9ba8a0644ef304ca92d65b76383b8dd023ff9f89ebec913e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base concurrent-output data-default time ]; @@ -25976,6 +26197,8 @@ self: { sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1"; revision = "1"; editedCabalFile = "1543bc1ee13d3f4b9ee6f9445edede596d5fe7f8a4551333b54634aad5b112a3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal mtl text ]; homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; @@ -26243,8 +26466,8 @@ self: { }: mkDerivation { pname = "async-extras"; - version = "0.1.3.1"; - sha256 = "c134da7e8955354670916cde8c5199b2bf08e455605d19a355a781d925b4d28e"; + version = "0.1.3.2"; + sha256 = "ac26da945147b74c5f1a29c7765e08d081d15dea5e609e5dc086a7b09efa32c7"; libraryHaskellDepends = [ async base lifted-async lifted-base monad-control SafeSemaphore stm transformers-base @@ -26256,12 +26479,12 @@ self: { }) {}; "async-io-either" = callPackage - ({ mkDerivation, async, base, transformers }: + ({ mkDerivation, async, base, retry, transformers }: mkDerivation { pname = "async-io-either"; - version = "0.1.0.2"; - sha256 = "71d7ed0974ac8aaaeba0a53268f13ad7277a24b224762b33837d0aab93d76601"; - libraryHaskellDepends = [ async base transformers ]; + version = "0.1.0.4"; + sha256 = "f0326b543a51cf06e3bd8375d2ce18d6a60f7dd413bac1e740dc90083cbc7a6a"; + libraryHaskellDepends = [ async base retry transformers ]; homepage = "https://github.com/mankyKitty/async-io-either#readme"; description = "Could be useful"; license = stdenv.lib.licenses.bsd3; @@ -26733,9 +26956,11 @@ self: { }) {}; "attoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , QuickCheck, quickcheck-unicode, scientific, tasty - , tasty-quickcheck, text, transformers, vector + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "attoparsec"; @@ -26749,6 +26974,11 @@ self: { array base bytestring deepseq QuickCheck quickcheck-unicode scientific tasty tasty-quickcheck text transformers vector ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; @@ -26967,6 +27197,8 @@ self: { pname = "audacity"; version = "0.0"; sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base deepseq utility-ht ]; homepage = "http://code.haskell.org/~thielema/audacity"; description = "Interchange with the Audacity sound signal editor"; @@ -27369,8 +27601,8 @@ self: { "avers" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, clock, containers, cryptohash, cryptonite, filepath - , hspec, inflections, memory, MonadRandom, mtl, network + , bytestring, clock, containers, criterion, cryptohash, cryptonite + , filepath, hspec, inflections, memory, MonadRandom, mtl, network , network-uri, resource-pool, rethinkdb-client-driver, safe, scrypt , stm, template-haskell, text, time, unordered-containers, vector }: @@ -27378,8 +27610,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5"; - revision = "6"; - editedCabalFile = "4fdb981cfedcc58b8b64a823d826fafd32c7b0fce7e01bd816db1474994d6018"; + revision = "7"; + editedCabalFile = "fb4e416f91c130daa956139b2d2cac7c92735879c699802e7f2acb0115eb671f"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -27392,6 +27624,10 @@ self: { rethinkdb-client-driver scrypt stm text time unordered-containers vector ]; + benchmarkHaskellDepends = [ + aeson base criterion mtl network-uri resource-pool + rethinkdb-client-driver text + ]; description = "empty"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -27605,6 +27841,8 @@ self: { pname = "aws"; version = "0.16"; sha256 = "84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring blaze-builder byteable bytestring case-insensitive cereal conduit @@ -27742,6 +27980,8 @@ self: { pname = "aws-elastic-transcoder"; version = "0.2.0.2"; sha256 = "896b7cdb17313b8a5e848de797ab61a3d1ab3779b6bf2d571cda50e5317ebe09"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aws aws-sign4 base bytestring conduit containers http-conduit http-types QuickCheck regex-compat safe text time transformers @@ -28104,12 +28344,17 @@ self: { }) {control-invariants = null;}; "azubi" = callPackage - ({ mkDerivation, base, filepath, options }: + ({ mkDerivation, base, Diff, directory, filepath, hspec, options + , process, unix + }: mkDerivation { pname = "azubi"; - version = "0.1.0.1"; - sha256 = "b75133db17e6dfe66593dca1e2809e096a8473463950826c31c8ac9a1497468e"; - libraryHaskellDepends = [ base filepath options ]; + version = "0.2.0.0"; + sha256 = "c3ac3b5ff5960c7ba0349bae282be1b0e4f361268b85aa80d57f399bac5a455c"; + libraryHaskellDepends = [ + base Diff directory filepath options process unix + ]; + testHaskellDepends = [ base filepath hspec ]; homepage = "http://palovandalo.com/azubi"; description = "A simple DevOps tool which will never \"reach\" enterprice level"; license = stdenv.lib.licenses.gpl3; @@ -28204,9 +28449,9 @@ self: { }) {}; "b-tree" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , errors, filepath, lens, mmap, mtl, pipes, pipes-interleave - , QuickCheck, transformers, vector + ({ mkDerivation, base, binary, bytestring, containers, criterion + , directory, errors, filepath, lens, mmap, mtl, pipes + , pipes-interleave, QuickCheck, transformers, vector }: mkDerivation { pname = "b-tree"; @@ -28217,6 +28462,7 @@ self: { mmap mtl pipes pipes-interleave transformers vector ]; testHaskellDepends = [ base binary containers pipes QuickCheck ]; + benchmarkHaskellDepends = [ base criterion pipes ]; homepage = "http://github.com/bgamari/b-tree"; description = "Immutable disk-based B* trees"; license = stdenv.lib.licenses.bsd3; @@ -28677,6 +28923,8 @@ self: { pname = "barrier"; version = "0.1.1"; sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blaze-svg bytestring template-haskell text unordered-containers @@ -28815,8 +29063,8 @@ self: { }) {}; "base32-bytestring" = callPackage - ({ mkDerivation, base, bits-extras, bytestring, cpu, hspec - , QuickCheck + ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion + , hspec, QuickCheck }: mkDerivation { pname = "base32-bytestring"; @@ -28824,6 +29072,7 @@ self: { sha256 = "74bee674a45705347954f4e7e6eda01c123751fa51ac846b7ff97e39b81b187c"; libraryHaskellDepends = [ base bits-extras bytestring cpu ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/pxqr/base32-bytestring"; description = "Fast base32 and base32hex codec for ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -28843,7 +29092,7 @@ self: { }) {}; "base58-bytestring" = callPackage - ({ mkDerivation, base, bytestring, quickcheck-assertions + ({ mkDerivation, base, bytestring, criterion, quickcheck-assertions , quickcheck-instances, tasty, tasty-quickcheck }: mkDerivation { @@ -28855,6 +29104,7 @@ self: { base bytestring quickcheck-assertions quickcheck-instances tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://bitbucket.org/s9gf4ult/base58-bytestring"; description = "Implementation of BASE58 transcoding for ByteStrings"; license = stdenv.lib.licenses.publicDomain; @@ -29284,9 +29534,9 @@ self: { }) {}; "beamable" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim - , integer-gmp, murmur-hash, QuickCheck, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, base, blaze-builder, bytestring, criterion + , deepseq, ghc-prim, integer-gmp, murmur-hash, QuickCheck + , test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "beamable"; @@ -29299,6 +29549,10 @@ self: { base blaze-builder bytestring ghc-prim integer-gmp murmur-hash QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq ghc-prim + integer-gmp murmur-hash + ]; description = "Generic serializer/deserializer with compact representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -29433,8 +29687,9 @@ self: { }) {}; "bencoding" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , ghc-prim, hspec, mtl, pretty, QuickCheck, text + ({ mkDerivation, AttoBencode, attoparsec, base, bencode, bytestring + , containers, criterion, deepseq, ghc-prim, hspec, mtl, pretty + , QuickCheck, text }: mkDerivation { pname = "bencoding"; @@ -29446,6 +29701,10 @@ self: { testHaskellDepends = [ attoparsec base bytestring containers ghc-prim hspec QuickCheck ]; + benchmarkHaskellDepends = [ + AttoBencode attoparsec base bencode bytestring criterion deepseq + ghc-prim + ]; homepage = "https://github.com/cobit/bencoding"; description = "A library for encoding and decoding of BEncode data"; license = stdenv.lib.licenses.bsd3; @@ -29550,6 +29809,8 @@ self: { pname = "bet"; version = "0.1.2.3"; sha256 = "a818d927e09c0386842658f70682089c16bc241961834af07fdbb0155015c13f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bifunctors binary bytestring containers exceptions HsOpenSSL http-client http-client-openssl lens mtl semigroupoids @@ -29613,6 +29874,8 @@ self: { pname = "bff"; version = "0.3.1.2"; sha256 = "5d44be6c1890b08ed18b8ebac8cf2565747f2c20f143edb7c0d0c311e73dbec4"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bimap category-extras containers derive haskell98 mtl template-haskell unix @@ -29694,6 +29957,8 @@ self: { pname = "bibtex"; version = "0.1.0.6"; sha256 = "090a3b9589388bdf9d2bf60d8d1898aa0313a2874b551ba86cbbd049f3ee5f04"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base latex parsec utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/BibTeX"; description = "Parse, format and processing BibTeX files"; @@ -29934,8 +30199,8 @@ self: { "bimaps" = callPackage ({ mkDerivation, aeson, base, binary, cereal, cereal-vector - , containers, deepseq, hashable, primitive, QuickCheck - , storable-tuple, tasty, tasty-quickcheck, tasty-th + , containers, criterion, deepseq, hashable, mwc-random, primitive + , QuickCheck, storable-tuple, tasty, tasty-quickcheck, tasty-th , unordered-containers, vector, vector-binary-instances , vector-th-unbox }: @@ -29951,15 +30216,19 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq mwc-random unordered-containers + vector + ]; homepage = "https://github.com/choener/bimaps"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; }) {}; "binary_0_7_6_1" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers - , directory, filepath, HUnit, QuickCheck, random, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal + , containers, criterion, deepseq, directory, filepath, HUnit, mtl + , QuickCheck, random, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "binary"; @@ -29970,6 +30239,10 @@ self: { array base bytestring Cabal containers directory filepath HUnit QuickCheck random test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + array attoparsec base bytestring cereal containers criterion + deepseq mtl + ]; homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -29977,9 +30250,10 @@ self: { }) {}; "binary_0_8_4_1" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers - , directory, filepath, HUnit, QuickCheck, random, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal + , containers, criterion, deepseq, directory, filepath, HUnit, mtl + , QuickCheck, random, tar, test-framework + , test-framework-quickcheck2, unordered-containers, zlib }: mkDerivation { pname = "binary"; @@ -29992,6 +30266,10 @@ self: { array base bytestring Cabal containers directory filepath HUnit QuickCheck random test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + array attoparsec base bytestring Cabal cereal containers criterion + deepseq directory filepath mtl tar unordered-containers zlib + ]; homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -30150,8 +30428,8 @@ self: { }) {}; "binary-list" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, phantom-state - , transformers + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , phantom-state, transformers }: mkDerivation { pname = "binary-list"; @@ -30160,6 +30438,7 @@ self: { libraryHaskellDepends = [ base binary bytestring deepseq phantom-state transformers ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Lists of length a power of two"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30220,14 +30499,17 @@ self: { "binary-parsers" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-lexing, deepseq, directory, filepath, QuickCheck - , quickcheck-instances, quickcheck-unicode, scientific, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + , bytestring-lexing, case-insensitive, criterion, deepseq + , directory, filepath, http-types, QuickCheck, quickcheck-instances + , quickcheck-unicode, scanner, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "binary-parsers"; version = "0.2.3.0"; sha256 = "bc6195493b950efcbeb9ef54dfe47a6badf894dff934cf02a4b170331c1b217a"; + revision = "1"; + editedCabalFile = "25e07c108ea6f11588d74be3c3d7f3010859706961a9c3077546d4903d0a4f25"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing scientific ]; @@ -30237,6 +30519,11 @@ self: { quickcheck-unicode scientific tasty tasty-hunit tasty-quickcheck text unordered-containers vector ]; + benchmarkHaskellDepends = [ + attoparsec base binary bytestring case-insensitive criterion + deepseq directory filepath http-types scanner scientific text + unordered-containers vector + ]; homepage = "https://github.com/winterland1989/binary-parsers"; description = "Extends binary with parsec/attoparsec style parsing combinators"; license = stdenv.lib.licenses.bsd3; @@ -30261,6 +30548,8 @@ self: { pname = "binary-protocol-zmq"; version = "0.2"; sha256 = "beaad38fb11794b368e69f3b84d46809440a1afae26110401c79c9c0a6b94a92"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring mtl zeromq-haskell ]; @@ -30365,10 +30654,10 @@ self: { "binary-tagged" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-orphans, bytestring, containers, generics-sop - , hashable, nats, quickcheck-instances, scientific, semigroups, SHA - , tagged, tasty, tasty-quickcheck, text, time, unordered-containers - , vector + , binary, binary-orphans, bytestring, containers, criterion + , deepseq, generics-sop, hashable, nats, quickcheck-instances + , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck + , text, time, unordered-containers, vector }: mkDerivation { pname = "binary-tagged"; @@ -30387,14 +30676,19 @@ self: { quickcheck-instances scientific semigroups SHA tagged tasty tasty-quickcheck text time unordered-containers vector ]; + benchmarkHaskellDepends = [ + aeson array base base16-bytestring binary binary-orphans bytestring + containers criterion deepseq generics-sop hashable nats scientific + semigroups SHA tagged text time unordered-containers vector + ]; homepage = "https://github.com/phadej/binary-tagged#readme"; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; }) {}; "binary-typed" = callPackage - ({ mkDerivation, base, binary, bytestring, murmur-hash, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , murmur-hash, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "binary-typed"; @@ -30404,6 +30698,9 @@ self: { testHaskellDepends = [ base binary bytestring tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq + ]; homepage = "https://github.com/quchen/binary-typed"; description = "Type-safe binary serialization"; license = stdenv.lib.licenses.bsd2; @@ -31418,7 +31715,7 @@ self: { "bioinformatics-toolkit" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , bytestring-lexing, case-insensitive, clustering, conduit - , conduit-combinators, containers, data-default-class + , conduit-combinators, containers, criterion, data-default-class , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap , math-functions, matrices, mtl, parallel, primitive, random, split , statistics, tasty, tasty-golden, tasty-hunit, text, transformers @@ -31441,6 +31738,10 @@ self: { matrices mtl random tasty tasty-golden tasty-hunit unordered-containers vector ]; + benchmarkHaskellDepends = [ + base bytestring clustering conduit criterion data-default-class mtl + random + ]; description = "A collection of bioinformatics tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -31678,10 +31979,10 @@ self: { "bitcoin-payment-channel" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, cereal, deepseq, errors, haskoin-core, hexstring - , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific - , semigroups, string-conversions, tagged, test-framework - , test-framework-quickcheck2, text, tf-random, time + , bytestring, cereal, criterion, deepseq, errors, haskoin-core + , hexstring, hspec, monad-time, mtl, QuickCheck, random, rbpcp-api + , scientific, semigroups, string-conversions, tagged + , test-framework, test-framework-quickcheck2, text, tf-random, time }: mkDerivation { pname = "bitcoin-payment-channel"; @@ -31699,6 +32000,11 @@ self: { string-conversions tagged test-framework test-framework-quickcheck2 text tf-random time ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring bytestring cereal criterion deepseq + errors haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api + scientific semigroups string-conversions tagged text time + ]; homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; description = "Instant, two-party Bitcoin payments"; license = "unknown"; @@ -31865,45 +32171,60 @@ self: { pname = "bits-atomic"; version = "0.1.3"; sha256 = "e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; description = "Atomic bit operations on memory locations for low-level synchronization"; license = stdenv.lib.licenses.bsd3; }) {}; "bits-bytestring" = callPackage - ({ mkDerivation, base, bits, bytestring, hspec, QuickCheck }: + ({ mkDerivation, base, bits, bytestring, criterion, hspec + , QuickCheck + }: mkDerivation { pname = "bits-bytestring"; version = "0.1.0.1"; sha256 = "d9e90f0b05589d9fcb4a807242a3b92e25786c118d168cbb7ccdbaf8076b6152"; libraryHaskellDepends = [ base bits bytestring ]; testHaskellDepends = [ base bits bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/oldmanmike/bits-bytestring"; description = "Bits instance for bytestrings"; license = stdenv.lib.licenses.bsd3; }) {}; "bits-bytestring-lazy" = callPackage - ({ mkDerivation, base, bits, bytestring, hspec, QuickCheck }: + ({ mkDerivation, base, bits, bits-bytestring, bytestring, criterion + , hspec, QuickCheck + }: mkDerivation { pname = "bits-bytestring-lazy"; version = "0.1.0.1"; sha256 = "f222dd064307db289e6aacbffdbede82c8b459d80cb85d328a82fe8ef125eaf5"; libraryHaskellDepends = [ base bits bytestring ]; testHaskellDepends = [ base bits bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base bits-bytestring bytestring criterion + ]; homepage = "https://github.com/semaj/bits-bytestring-lazy"; description = "Bits instance for lazy bytestrings"; license = stdenv.lib.licenses.bsd3; }) {}; "bits-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, hspec, HUnit, mtl }: + ({ mkDerivation, base, bytestring, conduit, criterion, hspec, HUnit + , mtl, random + }: mkDerivation { pname = "bits-conduit"; version = "0.2.0.0"; sha256 = "32b7f730be27810519f1ea32bdb82e25c187373dd407cdf0cbb629be6fa00f22"; libraryHaskellDepends = [ base bytestring conduit mtl ]; testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion random + ]; description = "Bitstream support for Conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31915,6 +32236,8 @@ self: { pname = "bits-extras"; version = "0.1.3"; sha256 = "27a5dcf562e5f4c011421263859e09f65d4c382cd123abd73807f456f56cc96b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; @@ -31922,8 +32245,9 @@ self: { }) {gcc_s = null;}; "bitset" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp - , QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , gmp, integer-gmp, QuickCheck, random, random-shuffle, tasty + , tasty-quickcheck }: mkDerivation { pname = "bitset"; @@ -31932,6 +32256,11 @@ self: { libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; librarySystemDepends = [ gmp ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim integer-gmp random + random-shuffle + ]; + benchmarkSystemDepends = [ gmp ]; description = "A space-efficient set data structure"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -32041,13 +32370,14 @@ self: { }) {}; "bitwise" = callPackage - ({ mkDerivation, array, base, bytestring, QuickCheck }: + ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { pname = "bitwise"; version = "0.1.1.1"; sha256 = "cde04615108c8e1e4b9f3a6fd7115b6fe40068385489fc5fc3d41e3700d69486"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ array base bytestring criterion ]; homepage = "http://code.mathr.co.uk/bitwise"; description = "fast multi-dimensional unboxed bit packed Bool arrays"; license = stdenv.lib.licenses.bsd3; @@ -32077,6 +32407,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bizzlelude" = callPackage + ({ mkDerivation, base, containers, directory, text }: + mkDerivation { + pname = "bizzlelude"; + version = "1.0.1"; + sha256 = "0b1fa2c6e0ab2fa3830bbd41a18d93e34f8f035b1c7439fa1424e38a5f44a399"; + libraryHaskellDepends = [ base containers directory text ]; + homepage = "http://github.com/TheBizzle"; + description = "A lousy Prelude replacement by a lousy dude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -32163,9 +32505,9 @@ self: { }) {}; "blacktip" = callPackage - ({ mkDerivation, base, bitwise, bytestring, deepseq - , deepseq-generics, hspec, locators, network-info, safe, split - , system-fileio, system-filepath, time + ({ mkDerivation, async, base, bitwise, bytestring, criterion + , deepseq, deepseq-generics, hspec, locators, network-info, safe + , split, system-fileio, system-filepath, time }: mkDerivation { pname = "blacktip"; @@ -32176,6 +32518,9 @@ self: { network-info safe split system-fileio system-filepath time ]; testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ + async base criterion network-info time + ]; homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; @@ -32183,8 +32528,8 @@ self: { }) {}; "blake2" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, hlint - , QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , hlint, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "blake2"; @@ -32195,6 +32540,7 @@ self: { base base16-bytestring bytestring hlint QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/centromere/blake2"; description = "A library providing BLAKE2"; license = stdenv.lib.licenses.publicDomain; @@ -32401,8 +32747,8 @@ self: { }: mkDerivation { pname = "blaze-colonnade"; - version = "0.1"; - sha256 = "cee73ec0777ecc268958699ead67b527b2b99cfbad38532b4687628bf70138e8"; + version = "1.1.0"; + sha256 = "194fd18e3d911dbe4b4f229df37b90e739fbb3c389a9c85cf9333f5a7159b37b"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text ]; @@ -32918,9 +33264,9 @@ self: { }) {}; "bloomfilter-redis" = callPackage - ({ mkDerivation, arithmoi, base, binary, bytestring, hashable - , hedis, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun + ({ mkDerivation, arithmoi, base, binary, bytestring, criterion + , hashable, hedis, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, tasty-rerun }: mkDerivation { pname = "bloomfilter-redis"; @@ -32933,6 +33279,7 @@ self: { base bytestring hashable hedis QuickCheck tasty tasty-hunit tasty-quickcheck tasty-rerun ]; + benchmarkHaskellDepends = [ base criterion random ]; description = "Distributed bloom filters on Redis (using the Hedis client)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -33209,9 +33556,9 @@ self: { "bond-haskell" = callPackage ({ mkDerivation, aeson, array, base, binary, bond-haskell-compiler - , bytestring, containers, deepseq, either, extra, filepath - , hashable, mtl, scientific, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector + , bytestring, containers, criterion, deepseq, either, extra + , filepath, hashable, mtl, scientific, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "bond-haskell"; @@ -33227,6 +33574,9 @@ self: { tasty-golden tasty-hunit tasty-quickcheck unordered-containers vector ]; + benchmarkHaskellDepends = [ + base bytestring criterion filepath vector + ]; homepage = "http://github.com/rblaze/bond-haskell#readme"; description = "Runtime support for BOND serialization"; license = stdenv.lib.licenses.bsd3; @@ -33257,8 +33607,8 @@ self: { }) {}; "bookkeeper" = callPackage - ({ mkDerivation, base, data-default-class, doctest, Glob, hspec - , markdown-unlit, QuickCheck, type-level-sets, yaml + ({ mkDerivation, base, criterion, data-default-class, doctest, Glob + , hspec, markdown-unlit, QuickCheck, type-level-sets, yaml }: mkDerivation { pname = "bookkeeper"; @@ -33276,6 +33626,9 @@ self: { base data-default-class doctest Glob hspec QuickCheck type-level-sets yaml ]; + benchmarkHaskellDepends = [ + base criterion data-default-class type-level-sets + ]; homepage = "http://github.com/turingjump/bookkeeper#readme"; description = "Anonymous records and overloaded labels"; license = stdenv.lib.licenses.bsd3; @@ -33299,8 +33652,8 @@ self: { ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }: mkDerivation { pname = "bookkeeping"; - version = "0.1.0.1"; - sha256 = "3fcfd3c8754c14b4882c35bb9762d928ada95fc099bac3ab5bb4821aeb879a58"; + version = "0.2.1.1"; + sha256 = "d920c7865a11a35af8147e79e2c48028831d5f6c0227cdf2ee65ec32b0e17fb5"; libraryHaskellDepends = [ base dlist mtl text time ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; @@ -33308,6 +33661,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bookkeeping-jp" = callPackage + ({ mkDerivation, base, bookkeeping, doctest, Glob }: + mkDerivation { + pname = "bookkeeping-jp"; + version = "0.1.0.1"; + sha256 = "10cb27933f689d38c0bc6e24ae6b1a06cdd9f69aef83dc6aa779c9872410cde5"; + libraryHaskellDepends = [ base bookkeeping ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; + description = "Helper functions for Japanese bookkeeping"; + license = stdenv.lib.licenses.mit; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33822,8 +34188,8 @@ self: { }: mkDerivation { pname = "breve"; - version = "0.4.3.1"; - sha256 = "2c1a7d1cb1653a4bf66d5cb53e064b498d8165aa67d7380580a0b69d0f5f2581"; + version = "0.4.4.0"; + sha256 = "1701c1550b07051e9c6f1c89713a2d3c6d5feb348e04e5bd957952543b8f72de"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -33860,8 +34226,10 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.17"; - sha256 = "891cb3323b1de2ed27849399cf8ab1ed1467560813a6182edb53b3726e4b3b68"; + version = "0.17.1"; + sha256 = "8c7ae11cbe393d3498e8e4a2e2b6eb1ee8b0582b3724fe6e844104e479c48511"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers contravariant deepseq dlist microlens microlens-mtl microlens-th stm template-haskell text text-zipper transformers @@ -34020,8 +34388,8 @@ self: { }) {}; "bspack" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, mtl, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, blaze-builder, bytestring, criterion + , ghc-prim, mtl, sandi, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "bspack"; @@ -34031,6 +34399,9 @@ self: { testHaskellDepends = [ base bytestring mtl tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion sandi + ]; homepage = "https://github.com/NicolasDP/hs-bspack"; description = "A simple and fast bytestring packer"; license = stdenv.lib.licenses.bsd3; @@ -34077,6 +34448,8 @@ self: { pname = "btrfs"; version = "0.1.2.3"; sha256 = "7efc0b5c65623dcf60910baf896aec7da7ac2df4231f03a3072c78fb5b2fb88d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring time unix ]; homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; @@ -34125,8 +34498,8 @@ self: { "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, HTF, mtl, quickcheck-instances, text - , unordered-containers, vector + , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances + , text, unordered-containers, vector }: mkDerivation { pname = "buffer-builder"; @@ -34139,6 +34512,10 @@ self: { aeson attoparsec base bytestring criterion deepseq HTF quickcheck-instances text vector ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq http-types json-builder + text vector + ]; homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; license = stdenv.lib.licenses.bsd3; @@ -34147,9 +34524,9 @@ self: { "buffer-builder-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, buffer-builder - , bytestring, hashable, HUnit, integer-gmp, QuickCheck, scientific - , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text - , unordered-containers, vector + , bytestring, criterion, deepseq, hashable, HUnit, integer-gmp + , QuickCheck, scientific, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, text, unordered-containers, vector }: mkDerivation { pname = "buffer-builder-aeson"; @@ -34166,6 +34543,9 @@ self: { QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th text unordered-containers vector ]; + benchmarkHaskellDepends = [ + aeson base buffer-builder bytestring criterion deepseq text vector + ]; description = "Serialize Aeson values with Data.BufferBuilder"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -34211,6 +34591,8 @@ self: { pname = "bugzilla"; version = "0.2.1.1"; sha256 = "ad30a9b8cbe7e9b994d6898ff68007e0c5a5a45b873e9a52dd51cf68d5945ea5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base blaze-builder bytestring connection containers data-default http-conduit http-types iso8601-time resourcet text @@ -34342,13 +34724,14 @@ self: { }) {}; "burst-detection" = callPackage - ({ mkDerivation, base, deepseq }: + ({ mkDerivation, base, criterion, deepseq }: mkDerivation { pname = "burst-detection"; version = "1.0"; sha256 = "953742286dddadd2bd54e13a72916044e1c1a7acada5a5e5d12759c29ac4f9dd"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://parsci.com/"; description = "Burst detection algorithms"; license = stdenv.lib.licenses.gpl2; @@ -34479,6 +34862,8 @@ self: { pname = "bv"; version = "0.4.1"; sha256 = "dd092150f1792e76e168365d69798d3a27b911ce9de8b21a47c5fed42acf45bb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; homepage = "https://github.com/iagoabal/haskell-bv"; description = "Bit-vector arithmetic library"; @@ -34493,6 +34878,8 @@ self: { pname = "byline"; version = "0.2.3.0"; sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-terminal base colour containers exceptions haskeline mtl terminfo-hs text transformers @@ -34533,6 +34920,8 @@ self: { pname = "bytedump"; version = "1.0"; sha256 = "ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/vincenthz/hs-bytedump"; description = "Flexible byte dump helpers for human readers"; @@ -34603,13 +34992,18 @@ self: { }) {}; "bytestring-arbitrary" = callPackage - ({ mkDerivation, base, bytestring, cryptohash, QuickCheck }: + ({ mkDerivation, base, bytestring, criterion, cryptohash + , QuickCheck + }: mkDerivation { pname = "bytestring-arbitrary"; version = "0.1.1"; sha256 = "bbe78d37e9788ecf6fc4d64633047579b66e71ffcab70cbc8be100a722056efd"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptohash QuickCheck + ]; homepage = "https://github.com/tsuraan/bytestring-arbitrary"; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -34644,7 +35038,8 @@ self: { "bytestring-conversion" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive - , double-conversion, QuickCheck, tasty, tasty-quickcheck, text + , criterion, double-conversion, QuickCheck, tasty, tasty-quickcheck + , text, transformers }: mkDerivation { pname = "bytestring-conversion"; @@ -34658,6 +35053,9 @@ self: { testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion text transformers + ]; homepage = "https://github.com/twittner/bytestring-conversion/"; description = "Type-classes to convert values to and from ByteString"; license = stdenv.lib.licenses.mpl20; @@ -34754,6 +35152,8 @@ self: { pname = "bytestring-nums"; version = "0.3.6"; sha256 = "bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; homepage = "http://github.com/solidsnack/bytestring-nums"; description = "Parse numeric literals from ByteStrings"; @@ -34792,7 +35192,8 @@ self: { }) {}; "bytestring-read" = callPackage - ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck + ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing + , criterion, doctest, scientific, tasty, tasty-quickcheck, text , types-compat }: mkDerivation { @@ -34805,6 +35206,10 @@ self: { testHaskellDepends = [ base bytestring doctest tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring bytestring-lexing criterion scientific + text + ]; homepage = "https://github.com/philopon/bytestring-read"; description = "fast ByteString to number converting library"; license = stdenv.lib.licenses.mit; @@ -34874,7 +35279,7 @@ self: { }) {}; "bytestring-tree-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring + ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq , quickcheck-instances, semigroups, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, text }: @@ -34889,6 +35294,9 @@ self: { base-prelude bytestring quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + benchmarkHaskellDepends = [ + base-prelude bytestring criterion deepseq + ]; homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; @@ -34908,7 +35316,7 @@ self: { "bytestring-typenats" = callPackage ({ mkDerivation, base, binary, blake2, bytestring, cereal - , cryptohash, deepseq, entropy, QuickCheck + , criterion, cryptohash, deepseq, entropy, QuickCheck }: mkDerivation { pname = "bytestring-typenats"; @@ -34919,6 +35327,7 @@ self: { QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; + benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ]; homepage = "https://github.com/tsuraan/bytestring-typenats"; description = "Bytestrings with typenat lengths"; license = stdenv.lib.licenses.bsd3; @@ -34990,6 +35399,7 @@ self: { base bytestring conduit conduit-extra hspec QuickCheck random resourcet ]; + benchmarkHaskellDepends = [ base conduit conduit-extra resourcet ]; homepage = "https://github.com/snoyberg/bzlib-conduit"; description = "Streaming compression/decompression via conduits"; license = stdenv.lib.licenses.bsd3; @@ -35622,8 +36032,8 @@ self: { }: mkDerivation { pname = "cabal-macosx"; - version = "0.2.3.5"; - sha256 = "6f5604cd4d1e7e67736c408babda35fdf1b1ff7348254d1f308ccea953615633"; + version = "0.2.4.0"; + sha256 = "41fb5231327860676eb4496fedba4da7df00f7cff969589a86e4b687177788fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35993,15 +36403,15 @@ self: { "cabal2nix" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal - , containers, deepseq, directory, distribution-nixpkgs, filepath - , hackage-db, language-nix, lens, monad-par, monad-par-extras, mtl - , optparse-applicative, pretty, process, SHA, split, text, time - , transformers, utf8-string, yaml + , containers, deepseq, directory, distribution-nixpkgs, doctest + , filepath, hackage-db, language-nix, lens, monad-par + , monad-par-extras, mtl, optparse-applicative, pretty, process, SHA + , split, text, time, transformers, utf8-string, yaml }: mkDerivation { pname = "cabal2nix"; - version = "2.0.4"; - sha256 = "b20b597df92787ba878073cd7cc855b3c0186f1781ac65056f261c420a1c7fe3"; + version = "2.1"; + sha256 = "6874df33b6a208d7715f673ceded9e09a7e8188a0a94651b14e208b928256f6e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36016,6 +36426,12 @@ self: { lens monad-par monad-par-extras mtl optparse-applicative pretty process SHA split text time transformers utf8-string yaml ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base bytestring Cabal containers deepseq + directory distribution-nixpkgs doctest filepath hackage-db + language-nix lens optparse-applicative pretty process SHA split + text transformers yaml + ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; @@ -36223,13 +36639,16 @@ self: { "cacophony" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , cryptonite, directory, exceptions, free, hlint, lens, memory - , monad-coroutine, mtl, safe-exceptions, text, transformers + , criterion, cryptonite, deepseq, directory, exceptions, free + , hlint, lens, memory, monad-coroutine, mtl, safe-exceptions, text + , transformers }: mkDerivation { pname = "cacophony"; version = "0.9.1"; sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cryptonite exceptions free lens memory monad-coroutine mtl safe-exceptions transformers @@ -36238,6 +36657,10 @@ self: { aeson async base base16-bytestring bytestring directory free hlint lens memory mtl text ]; + benchmarkHaskellDepends = [ + async base base16-bytestring bytestring criterion deepseq lens + memory + ]; homepage = "https://github.com/centromere/cacophony"; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; @@ -36535,6 +36958,8 @@ self: { pname = "call"; version = "0.1.4.2"; sha256 = "2fe8f1ade21ea24c67ab2447189f756b75a60cbb4d2221a0058bc62050c00461"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bindings-portaudio boundingboxes colors containers control-bool deepseq directory filepath free freetype2 GLFW-b @@ -36671,17 +37096,19 @@ self: { }) {}; "canteven-http" = callPackage - ({ mkDerivation, base, bytestring, canteven-log, exceptions - , http-types, monad-logger, text, time, transformers, uuid, wai + ({ mkDerivation, base, bytestring, canteven-log, directory + , exceptions, filepath, http-types, mime-types, monad-logger + , template-haskell, text, time, transformers, unix, uuid, wai , wai-extra }: mkDerivation { pname = "canteven-http"; - version = "0.1.2.0"; - sha256 = "194fbbb36eaa70c4ed2dbf8cdc9e5831761bbefba2cccd473f1068bf33ac0977"; + version = "0.1.3.0"; + sha256 = "d427d5bc77861c2a648a604443f2a5ca882b911487ac313dbb5db6b0271870d4"; libraryHaskellDepends = [ - base bytestring canteven-log exceptions http-types monad-logger - text time transformers uuid wai wai-extra + base bytestring canteven-log directory exceptions filepath + http-types mime-types monad-logger template-haskell text time + transformers unix uuid wai wai-extra ]; homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; @@ -36872,6 +37299,8 @@ self: { pname = "caramia"; version = "0.7.2.2"; sha256 = "fa3129d63816e1ccb47a57808ece432a2b6ab652eeba15ac6a76d6799af277b3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers exceptions gl lens linear mtl semigroups text transformers vector @@ -36937,6 +37366,7 @@ self: { array base binary bytestring ix-shapable QuickCheck syb ]; testHaskellDepends = [ array base ix-shapable QuickCheck ]; + benchmarkHaskellDepends = [ array base ]; description = "A C-compatible array library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37149,8 +37579,8 @@ self: { }) {}; "case-insensitive" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit - , test-framework, test-framework-hunit, text + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , HUnit, test-framework, test-framework-hunit, text }: mkDerivation { pname = "case-insensitive"; @@ -37160,13 +37590,16 @@ self: { testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; license = stdenv.lib.licenses.bsd3; }) {}; "case-insensitive-match" = callPackage - ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }: + ({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl + , QuickCheck, random-strings, tagsoup, text + }: mkDerivation { pname = "case-insensitive-match"; version = "0.1.1.0"; @@ -37176,6 +37609,10 @@ self: { libraryHaskellDepends = [ base bytestring text ]; executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring mtl QuickCheck text ]; + benchmarkHaskellDepends = [ + base bytestring case-insensitive criterion random-strings tagsoup + text + ]; homepage = "https://github.com/mikehat/case-insensitive-match"; description = "A simplified, faster way to do case-insensitive matching"; license = stdenv.lib.licenses.bsd3; @@ -37195,8 +37632,9 @@ self: { }) {}; "cases" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit - , loch-th, placeholders, QuickCheck, text + ({ mkDerivation, attoparsec, base, base-prelude, criterion, HTF + , HUnit, loch-th, mwc-random, placeholders, QuickCheck, rerebase + , text }: mkDerivation { pname = "cases"; @@ -37206,6 +37644,7 @@ self: { testHaskellDepends = [ base HTF HUnit loch-th placeholders QuickCheck text ]; + benchmarkHaskellDepends = [ criterion mwc-random rerebase ]; homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; @@ -37462,14 +37901,16 @@ self: { "cassava" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, hashable, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , unordered-containers, vector + , containers, criterion, deepseq, hashable, HUnit, lazy-csv + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, unordered-containers, vector }: mkDerivation { pname = "cassava"; version = "0.4.5.1"; sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f"; + revision = "1"; + editedCabalFile = "c04d2ca56a5c725b3044ccf06c6fd09ff47265e3a1e125ae364363bfed2a0314"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -37479,6 +37920,10 @@ self: { test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; + benchmarkHaskellDepends = [ + array attoparsec base blaze-builder bytestring containers criterion + deepseq hashable lazy-csv text unordered-containers vector + ]; homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; @@ -37486,7 +37931,8 @@ self: { "cassava-conduit" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava - , conduit, conduit-extra, containers, mtl, QuickCheck, text + , conduit, conduit-extra, containers, criterion, mtl, QuickCheck + , text }: mkDerivation { pname = "cassava-conduit"; @@ -37499,6 +37945,7 @@ self: { testHaskellDepends = [ base bytestring cassava conduit conduit-extra QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; @@ -37534,6 +37981,8 @@ self: { pname = "cassava-streams"; version = "0.3.0.0"; sha256 = "81a4548c78474d025c525728a57616a657e5d59c377625c54ebb3f1818f5c49b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cassava io-streams vector ]; @@ -37803,6 +38252,8 @@ self: { pname = "cci"; version = "0.3.1"; sha256 = "87390d636e6877bfb982ce60b3accef9d73153ea03632cec967526eb8eb96a5f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ cci ]; testHaskellDepends = [ @@ -38023,8 +38474,9 @@ self: { }) {}; "cereal-io-streams" = callPackage - ({ mkDerivation, base, bytestring, cereal, derive, HUnit - , io-streams, mtl, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , conduit-extra, criterion, derive, HUnit, io-streams, mtl + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "cereal-io-streams"; @@ -38035,6 +38487,10 @@ self: { base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring cereal cereal-conduit conduit conduit-extra + criterion io-streams + ]; description = "io-streams support for the cereal binary serialization library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -38065,8 +38521,9 @@ self: { }) {}; "cereal-streams" = callPackage - ({ mkDerivation, base, bytestring, cereal, derive, HUnit - , io-streams, mtl, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , conduit-extra, criterion, derive, HUnit, io-streams, mtl + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "cereal-streams"; @@ -38077,6 +38534,10 @@ self: { base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring cereal cereal-conduit conduit conduit-extra + criterion io-streams transformers + ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -38117,6 +38578,8 @@ self: { sha256 = "e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1"; revision = "1"; editedCabalFile = "6b4b703a1c34a9fa3e0223f3ff2796183c7b9b7351da1ad34478225637e837ba"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ asn1-data base bytestring containers crypto-pubkey-types cryptohash directory filepath mtl pem process time @@ -38701,6 +39164,8 @@ self: { pname = "check-email"; version = "1.0"; sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7"; + revision = "1"; + editedCabalFile = "39f8616eeee765838400cd6754f864e9e65e8a89123327161227b6a424c20d75"; libraryHaskellDepends = [ base bytestring email-validate ]; librarySystemDepends = [ resolv ]; description = "Confirm whether an email is valid and probably existant"; @@ -39194,8 +39659,9 @@ self: { }) {}; "cipher-aes" = callPackage - ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests - , crypto-cipher-types, QuickCheck, securemem, test-framework + ({ mkDerivation, base, byteable, bytestring, criterion + , crypto-cipher-benchmarks, crypto-cipher-tests + , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework , test-framework-quickcheck2 }: mkDerivation { @@ -39209,28 +39675,40 @@ self: { base byteable bytestring crypto-cipher-tests crypto-cipher-types QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring criterion crypto-cipher-benchmarks + crypto-cipher-types mtl + ]; homepage = "https://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; license = stdenv.lib.licenses.bsd3; }) {}; "cipher-aes128" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: + ({ mkDerivation, base, bytestring, cereal, criterion, crypto-api + , entropy, tagged + }: mkDerivation { pname = "cipher-aes128"; version = "0.7.0.3"; sha256 = "6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal crypto-api tagged ]; + benchmarkHaskellDepends = [ + base bytestring cereal criterion crypto-api entropy tagged + ]; homepage = "https://github.com/TomMD/cipher-aes128"; description = "AES and common modes using AES-NI when available"; license = stdenv.lib.licenses.bsd3; }) {}; "cipher-blowfish" = callPackage - ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests - , crypto-cipher-types, QuickCheck, securemem, test-framework + ({ mkDerivation, base, byteable, bytestring, criterion + , crypto-cipher-benchmarks, crypto-cipher-tests + , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework , test-framework-quickcheck2, vector }: mkDerivation { @@ -39244,14 +39722,19 @@ self: { base byteable bytestring crypto-cipher-tests crypto-cipher-types QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring criterion crypto-cipher-benchmarks + crypto-cipher-types mtl + ]; homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Blowfish cipher"; license = stdenv.lib.licenses.bsd3; }) {}; "cipher-camellia" = callPackage - ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests - , crypto-cipher-types, QuickCheck, securemem, test-framework + ({ mkDerivation, base, byteable, bytestring, criterion + , crypto-cipher-benchmarks, crypto-cipher-tests + , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework , test-framework-quickcheck2, vector }: mkDerivation { @@ -39265,14 +39748,19 @@ self: { base byteable bytestring crypto-cipher-tests crypto-cipher-types QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring criterion crypto-cipher-benchmarks + crypto-cipher-types mtl + ]; homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Camellia block cipher primitives"; license = stdenv.lib.licenses.bsd3; }) {}; "cipher-des" = callPackage - ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests - , crypto-cipher-types, QuickCheck, securemem, test-framework + ({ mkDerivation, base, byteable, bytestring, criterion + , crypto-cipher-benchmarks, crypto-cipher-tests + , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework , test-framework-quickcheck2 }: mkDerivation { @@ -39286,14 +39774,19 @@ self: { base byteable bytestring crypto-cipher-tests crypto-cipher-types QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring criterion crypto-cipher-benchmarks + crypto-cipher-types mtl + ]; homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "DES and 3DES primitives"; license = stdenv.lib.licenses.bsd3; }) {}; "cipher-rc4" = callPackage - ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests - , crypto-cipher-types, QuickCheck, test-framework + ({ mkDerivation, base, byteable, bytestring, criterion + , crypto-cipher-benchmarks, crypto-cipher-tests + , crypto-cipher-types, deepseq, mtl, QuickCheck, test-framework , test-framework-quickcheck2 }: mkDerivation { @@ -39307,6 +39800,10 @@ self: { base bytestring crypto-cipher-tests crypto-cipher-types QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring criterion crypto-cipher-benchmarks + crypto-cipher-types deepseq mtl + ]; homepage = "http://github.com/vincenthz/hs-cipher-rc4"; description = "Fast RC4 cipher implementation"; license = stdenv.lib.licenses.bsd3; @@ -39608,6 +40105,8 @@ self: { pname = "clang-pure"; version = "0.2.0.2"; sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers contravariant inline-c microlens microlens-contra singletons stm template-haskell vector @@ -39740,10 +40239,11 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, constraints, data-binary-ieee754 - , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , lens, QuickCheck, reflection, singletons, template-haskell + ({ mkDerivation, array, base, constraints, criterion + , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, integer-gmp, lens, QuickCheck + , reflection, singletons, template-haskell }: mkDerivation { pname = "clash-prelude"; @@ -39756,6 +40256,9 @@ self: { singletons template-haskell ]; testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; @@ -39841,14 +40344,15 @@ self: { "classy-influxdb-simple" = callPackage ({ mkDerivation, aeson, async-io-either, base, bytestring, lens - , mtl, text, wreq + , mtl, scientific, text, time, vector, wreq }: mkDerivation { pname = "classy-influxdb-simple"; - version = "0.1.0.1"; - sha256 = "37655507a92d3bc9c019a5d25b746db95f948b57f5d58126bac4abba38d37383"; + version = "0.2.1.0"; + sha256 = "75b4a50512fd4d9cc785620b1bd01c683cc6cb8940157b8e871fa89ec7c95961"; libraryHaskellDepends = [ - aeson async-io-either base bytestring lens mtl text wreq + aeson async-io-either base bytestring lens mtl scientific text time + vector wreq ]; homepage = "https://github.com/mankyKitty/classy-influxdb-simple#readme"; description = "Super simple InfluxDB package in Classy-MTL style"; @@ -40356,7 +40860,7 @@ self: { "clif" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty - , tasty-quickcheck, tasty-th + , tasty-quickcheck, tasty-th, time }: mkDerivation { pname = "clif"; @@ -40366,6 +40870,7 @@ self: { testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th ]; + benchmarkHaskellDepends = [ base time ]; description = "A Clifford algebra number type for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -40396,6 +40901,9 @@ self: { testHaskellDepends = [ base hspec nats numeric-prelude QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion numeric-prelude stream-fusion + ]; homepage = "http://github.com/spacekitteh/haskell-clifford"; description = "A Clifford algebra library"; license = stdenv.lib.licenses.bsd3; @@ -40718,9 +41226,10 @@ self: { }) {}; "clustering" = callPackage - ({ mkDerivation, base, binary, containers, hierarchical-clustering - , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty - , tasty-hunit, tasty-quickcheck, unordered-containers, vector + ({ mkDerivation, base, binary, containers, criterion + , hierarchical-clustering, matrices, mwc-random, parallel + , primitive, Rlang-QQ, split, tasty, tasty-hunit, tasty-quickcheck + , unordered-containers, vector }: mkDerivation { pname = "clustering"; @@ -40734,6 +41243,9 @@ self: { base binary hierarchical-clustering matrices mwc-random Rlang-QQ split tasty tasty-hunit tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base criterion hierarchical-clustering matrices mwc-random vector + ]; description = "High performance clustering algorithms"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -40793,13 +41305,18 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, bytestring, HUnit, text }: + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: mkDerivation { pname = "cmark"; version = "0.5.5"; sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; homepage = "https://github.com/jgm/cmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; @@ -40910,6 +41427,8 @@ self: { pname = "cmdargs"; version = "0.10.14"; sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base filepath process template-haskell transformers ]; @@ -40944,6 +41463,8 @@ self: { pname = "cmdlib"; version = "0.3.6"; sha256 = "5643d219c371f903c3f877b5955de4ca99a723bc96165f4f629d3e3dbc3fb357"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mtl split syb transformers ]; description = "a library for command line parsing & online help"; license = stdenv.lib.licenses.bsd3; @@ -41080,8 +41601,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.1.1"; - sha256 = "16b8b802bca21b71dd782560978b7ac88866c129df83b760e9059a7da04d70f7"; + version = "0.1.2"; + sha256 = "aef2b0b043767ef28496aa6b8c744db8185492c0d1e94e567a62eb4fdcaa3b09"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/code-page"; @@ -41539,15 +42060,15 @@ self: { }) {}; "colonnade" = callPackage - ({ mkDerivation, base, bytestring, contravariant, doctest, text - , vector + ({ mkDerivation, base, bytestring, contravariant, doctest + , profunctors, text, vector }: mkDerivation { pname = "colonnade"; - version = "1.0.0"; - sha256 = "47280e7dc733a66d0e507492e2b5499115027911d6ab859e29c602308f7bdf08"; + version = "1.1.0"; + sha256 = "e86e90e2eb8e983a0916b8651b248ad9d11202add0cab034f609d5e80923eafc"; libraryHaskellDepends = [ - base bytestring contravariant text vector + base bytestring contravariant profunctors text vector ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/andrewthad/colonnade#readme"; @@ -41689,8 +42210,7 @@ self: { pname = "com"; version = "1.2.3.1"; sha256 = "f5085572cd0b0c8f8fdf115fad5c842657e803c70b2ce1c230ee452f87a9dff8"; - isLibrary = false; - isExecutable = false; + doHaddock = false; description = "Haskell COM support library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42033,6 +42553,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compact" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, ghc-compact + }: + mkDerivation { + pname = "compact"; + version = "0.1.0.1"; + sha256 = "ee8533e16b94bbbf3519ccad26f3e569d60d33a5a9d2e3636e0764aff7b2d653"; + libraryHaskellDepends = [ base binary bytestring ghc-compact ]; + testHaskellDepends = [ base directory ]; + homepage = "https://github.com/ezyang/compact"; + description = "Non-GC'd, contiguous storage for immutable data structures"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghc-compact = null;}; + "compact-map" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers }: mkDerivation { @@ -42061,8 +42596,7 @@ self: { ]; description = "Socket functions for compact normal form"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {compact = null;}; + }) {}; "compact-string" = callPackage ({ mkDerivation, base, bytestring }: @@ -42116,10 +42650,10 @@ self: { }) {}; "compdata" = callPackage - ({ mkDerivation, base, containers, deepseq, derive, HUnit, mtl - , QuickCheck, template-haskell, test-framework + ({ mkDerivation, base, containers, criterion, deepseq, derive + , HUnit, mtl, QuickCheck, random, template-haskell, test-framework , test-framework-hunit, test-framework-quickcheck2, th-expand-syns - , transformers, tree-view + , transformers, tree-view, uniplate }: mkDerivation { pname = "compdata"; @@ -42134,12 +42668,17 @@ self: { template-haskell test-framework test-framework-hunit test-framework-quickcheck2 th-expand-syns transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq derive mtl QuickCheck random + template-haskell th-expand-syns transformers uniplate + ]; description = "Compositional Data Types"; license = stdenv.lib.licenses.bsd3; }) {}; "compdata-automata" = callPackage - ({ mkDerivation, base, compdata, containers, projection }: + ({ mkDerivation, base, compdata, containers, criterion, projection + }: mkDerivation { pname = "compdata-automata"; version = "0.9"; @@ -42147,6 +42686,9 @@ self: { revision = "1"; editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130"; libraryHaskellDepends = [ base compdata containers projection ]; + benchmarkHaskellDepends = [ + base compdata containers criterion projection + ]; description = "Tree automata on Compositional Data Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42364,12 +42906,13 @@ self: { }) {}; "compound-types" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, base-prelude }: mkDerivation { pname = "compound-types"; version = "0.1.3.1"; sha256 = "81c67beb0379502875e2fbec9c346db7221f598197534064a4b4bd3d4ae930f2"; libraryHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base-prelude ]; homepage = "https://github.com/nikita-volkov/compound-types"; description = "Sum and Product types and such"; license = stdenv.lib.licenses.mit; @@ -42446,19 +42989,22 @@ self: { "computational-algebra" = callPackage ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base - , constraints, containers, control-monad-loop, convertible, deepseq - , dlist, entropy, equational-reasoning, ghc-typelits-knownnat - , hashable, heaps, hmatrix, hspec, HUnit, hybrid-vectors, lens - , matrix, monad-loops, MonadRandom, mono-traversable, monomorphic - , mtl, parallel, primes, process, QuickCheck, quickcheck-instances - , reflection, semigroups, singletons, sized, smallcheck, tagged - , template-haskell, test-framework, test-framework-hunit, text + , constraints, containers, control-monad-loop, convertible + , criterion, deepseq, dlist, entropy, equational-reasoning + , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit + , hybrid-vectors, lens, matrix, monad-loops, MonadRandom + , mono-traversable, monomorphic, mtl, parallel, primes, process + , QuickCheck, quickcheck-instances, random, reflection, semigroups + , singletons, sized, smallcheck, tagged, template-haskell + , test-framework, test-framework-hunit, text, transformers , type-natural, unamb, unordered-containers, vector }: mkDerivation { pname = "computational-algebra"; version = "0.5.0.0"; sha256 = "fce631557cfcef120382e91744279f5e7a61c0afaae95cf2159195f7e57fda49"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ algebra algebraic-prelude arithmoi base constraints containers control-monad-loop convertible deepseq dlist entropy @@ -42475,6 +43021,13 @@ self: { singletons sized smallcheck tagged test-framework test-framework-hunit text type-natural vector ]; + benchmarkHaskellDepends = [ + algebra base constraints containers criterion deepseq + equational-reasoning hspec HUnit lens matrix MonadRandom + monomorphic parallel process QuickCheck quickcheck-instances random + reflection singletons sized smallcheck tagged test-framework + test-framework-hunit transformers type-natural vector + ]; homepage = "https://github.com/konn/computational-algebra"; description = "Well-kinded computational algebra library, currently supporting Groebner basis"; license = stdenv.lib.licenses.bsd3; @@ -42541,6 +43094,8 @@ self: { pname = "concraft"; version = "0.9.4"; sha256 = "030f63c8c08dba11ac85b08746a145df45276930de8fc937ecf6260b1cac079f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson array base binary bytestring cmdargs comonad containers crf-chain1-constrained crf-chain2-tiers data-lens lazy-io @@ -42672,6 +43227,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "concurrency_1_1_0_0" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.1.0.0"; + sha256 = "bc6e4d9db178937bf5223b8534bb56bf508242259ee489709af203ad39914605"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -42741,6 +43314,7 @@ self: { testHaskellDepends = [ base machines tasty tasty-hunit time transformers ]; + benchmarkHaskellDepends = [ base machines time ]; description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42801,6 +43375,8 @@ self: { pname = "concurrent-state"; version = "0.6.0.0"; sha256 = "e6071814c277106cb13b458a7161dd42269e9a7c2419b17992a1908a7fb3342d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base exceptions mtl stm transformers ]; homepage = "https://github.com/joelteon/concurrent-state"; description = "MTL-like library using TVars"; @@ -42949,9 +43525,10 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, QuickCheck, resourcet, safe, split - , transformers, transformers-base + ({ mkDerivation, base, containers, criterion, deepseq, exceptions + , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl + , mwc-random, QuickCheck, resourcet, safe, split, transformers + , transformers-base, vector }: mkDerivation { pname = "conduit"; @@ -42965,6 +43542,10 @@ self: { base containers exceptions hspec mtl QuickCheck resourcet safe split transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hspec kan-extensions mwc-random + transformers vector + ]; homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; @@ -43096,9 +43677,9 @@ self: { "conduit-extra" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , hspec, monad-control, network, primitive, process, QuickCheck - , resourcet, stm, streaming-commons, text, transformers + , bytestring-builder, conduit, criterion, directory, exceptions + , filepath, hspec, monad-control, network, primitive, process + , QuickCheck, resourcet, stm, streaming-commons, text, transformers , transformers-base }: mkDerivation { @@ -43115,6 +43696,10 @@ self: { conduit directory exceptions hspec process QuickCheck resourcet stm streaming-commons text transformers transformers-base ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring bytestring-builder conduit criterion + transformers + ]; homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; @@ -43157,8 +43742,8 @@ self: { }) {}; "conduit-iconv" = callPackage - ({ mkDerivation, base, bytestring, conduit, mtl, QuickCheck - , test-framework, test-framework-quickcheck2, text + ({ mkDerivation, base, bytestring, conduit, criterion, mtl + , QuickCheck, test-framework, test-framework-quickcheck2, text }: mkDerivation { pname = "conduit-iconv"; @@ -43169,6 +43754,9 @@ self: { base bytestring conduit mtl QuickCheck test-framework test-framework-quickcheck2 text ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mtl text + ]; homepage = "https://github.com/sdroege/conduit-iconv"; description = "Conduit for character encoding conversion"; license = stdenv.lib.licenses.bsd3; @@ -43325,6 +43913,8 @@ self: { pname = "config-ini"; version = "0.1.2.0"; sha256 = "d3a2b77545fba315db644ce177248e59f918cf4b6e17123c04d66e8bb3c7ee15"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base megaparsec text transformers unordered-containers ]; @@ -43413,6 +44003,8 @@ self: { pname = "configifier"; version = "0.1.1"; sha256 = "52cbd5b32d438766e655104e583baa5379e618bc2526382c970bde313db72e11"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring case-insensitive containers directory either functor-infix mtl safe string-conversions template-haskell @@ -43736,6 +44328,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "constrained-monads" = callPackage + ({ mkDerivation, base, containers, doctest, QuickCheck + , transformers + }: + mkDerivation { + pname = "constrained-monads"; + version = "0.1.0.0"; + sha256 = "1822fb5f5bec60b9c7efc11b776718bcdc66399a8c34687fe6173975ec010184"; + libraryHaskellDepends = [ base containers transformers ]; + testHaskellDepends = [ + base containers doctest QuickCheck transformers + ]; + homepage = "https://github.com/oisdk/constrained-monads#readme"; + description = "Typeclasses and instances for monads with constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "constrained-normal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -43910,9 +44519,9 @@ self: { }) {}; "containers_0_5_10_1" = callPackage - ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers + ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq + , ghc-prim, HUnit, QuickCheck, random, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; @@ -43924,6 +44533,9 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; + benchmarkHaskellDepends = [ + base criterion deepseq ghc-prim random transformers + ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44040,19 +44652,22 @@ self: { }) {}; "continuum" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, mtl - , nanomsg-haskell, time + ({ mkDerivation, base, bytestring, cereal, containers, hyperleveldb + , mtl, nanomsg-haskell, time }: mkDerivation { pname = "continuum"; version = "0.1.0.7"; sha256 = "a6bbd7bee80d5216e4678fc9bdf85f4136b079ed8d2e2cf8585c76420bb0386e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal containers mtl nanomsg-haskell time ]; + executableSystemDepends = [ hyperleveldb ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {hyperleveldb = null;}; "continuum-client" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, mtl @@ -44453,6 +45068,8 @@ self: { pname = "convertible"; version = "1.1.1.0"; sha256 = "e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers mtl old-locale old-time text time ]; @@ -44487,6 +45104,8 @@ self: { pname = "convertible-text"; version = "0.4.0.2"; sha256 = "df8dc391ff4d82e3d18b049e3c4db50198aa1345c101d088683a075d5ba217f3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attempt base bytestring containers old-time template-haskell text time @@ -45003,6 +45622,8 @@ self: { pname = "country-codes"; version = "0.1.3"; sha256 = "062843cebfcb4df513e4688456311f07a2eb693935a053ce2eade2c8d586d1b5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base shakespeare text ]; testHaskellDepends = [ aeson base HTF HUnit ]; homepage = "https://github.com/prowdsponsor/country-codes"; @@ -45147,9 +45768,31 @@ self: { license = "LGPL"; }) {}; + "cpphs_1_20_4" = callPackage + ({ mkDerivation, base, directory, filepath, old-locale, old-time + , polyparse + }: + mkDerivation { + pname = "cpphs"; + version = "1.20.4"; + sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath old-locale old-time polyparse + ]; + executableHaskellDepends = [ + base directory filepath old-locale old-time polyparse + ]; + homepage = "http://projects.haskell.org/cpphs/"; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cprng-aes" = callPackage - ({ mkDerivation, base, byteable, bytestring, cipher-aes - , crypto-random + ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion + , crypto-random, mtl }: mkDerivation { pname = "cprng-aes"; @@ -45158,6 +45801,9 @@ self: { libraryHaskellDepends = [ base byteable bytestring cipher-aes crypto-random ]; + benchmarkHaskellDepends = [ + base bytestring criterion crypto-random mtl + ]; homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; license = stdenv.lib.licenses.bsd3; @@ -45202,6 +45848,8 @@ self: { pname = "cpu"; version = "0.1.2"; sha256 = "5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; homepage = "http://github.com/vincenthz/hs-cpu"; description = "Cpu information and properties helpers"; @@ -45214,6 +45862,8 @@ self: { pname = "cpuid"; version = "0.2.3"; sha256 = "f8198ab4408219fe001c0a50908af38a766e2a0b3afb8260307838e5517add88"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base data-accessor enumset ]; homepage = "http://code.haskell.org/cpuid/"; description = "Binding for the cpuid machine instruction on x86 compatible processors"; @@ -45555,6 +46205,8 @@ self: { pname = "craftwerk"; version = "0.1"; sha256 = "a39d24c7e05469883f35d642c393c04a8bca6d03d1bd41905fd5a981ddb00200"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base colour mtl vector-space ]; homepage = "http://mahrz.github.com/craftwerk.html"; description = "2D graphics library with integrated TikZ output"; @@ -45583,6 +46235,8 @@ self: { pname = "craftwerk-gtk"; version = "0.1"; sha256 = "ced95080b5b735d57a13b9082ebdadf5015926f4f49a3b181a3e974ba01f66a1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base cairo containers craftwerk craftwerk-cairo gtk mtl ]; @@ -45645,7 +46299,7 @@ self: { "crc" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra - , resourcet, tasty, tasty-golden, vector + , criterion, resourcet, tasty, tasty-golden, vector }: mkDerivation { pname = "crc"; @@ -45655,6 +46309,7 @@ self: { testHaskellDepends = [ base bytestring conduit conduit-extra resourcet tasty tasty-golden ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "http://github.com/MichaelXavier/crc"; description = "Implements various Cyclic Redundancy Checks (CRC)"; license = stdenv.lib.licenses.mit; @@ -45858,9 +46513,10 @@ self: { }) {}; "critbit" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq + ({ mkDerivation, array, base, bytestring, bytestring-trie + , containers, criterion, deepseq, hashable, mtl, mwc-random , QuickCheck, test-framework, test-framework-quickcheck2, text - , transformers, vector + , transformers, unordered-containers, vector }: mkDerivation { pname = "critbit"; @@ -45873,6 +46529,11 @@ self: { base bytestring containers QuickCheck test-framework test-framework-quickcheck2 text transformers vector ]; + benchmarkHaskellDepends = [ + base bytestring bytestring-trie containers criterion deepseq + hashable mtl mwc-random text transformers unordered-containers + vector + ]; homepage = "https://github.com/bos/critbit"; description = "Crit-bit maps and sets"; license = stdenv.lib.licenses.bsd3; @@ -46017,9 +46678,9 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, data-default-class, generics-sop - , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups - , tasty, tasty-hunit, tasty-quickcheck, text, time + ({ mkDerivation, attoparsec, base, criterion, data-default-class + , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time , transformers-compat }: mkDerivation { @@ -46034,6 +46695,7 @@ self: { attoparsec base generics-sop quickcheck-instances semigroups tasty tasty-hunit tasty-quickcheck text time transformers-compat ]; + benchmarkHaskellDepends = [ attoparsec base criterion text time ]; homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; @@ -46267,9 +46929,9 @@ self: { }) {}; "crypto-numbers" = callPackage - ({ mkDerivation, base, byteable, bytestring, crypto-random - , ghc-prim, integer-gmp, tasty, tasty-hunit, tasty-quickcheck - , vector + ({ mkDerivation, base, byteable, bytestring, criterion + , crypto-random, ghc-prim, integer-gmp, mtl, tasty, tasty-hunit + , tasty-quickcheck, vector }: mkDerivation { pname = "crypto-numbers"; @@ -46284,15 +46946,16 @@ self: { base byteable bytestring crypto-random tasty tasty-hunit tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ base bytestring criterion mtl ]; homepage = "https://github.com/vincenthz/hs-crypto-numbers"; description = "Cryptographic numbers: functions and algorithms"; license = stdenv.lib.licenses.bsd3; }) {}; "crypto-pubkey" = callPackage - ({ mkDerivation, base, byteable, bytestring, crypto-numbers - , crypto-pubkey-types, crypto-random, cryptohash, tasty - , tasty-hunit, tasty-kat, tasty-quickcheck + ({ mkDerivation, base, byteable, bytestring, criterion + , crypto-numbers, crypto-pubkey-types, crypto-random, cryptohash + , deepseq, mtl, tasty, tasty-hunit, tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypto-pubkey"; @@ -46307,6 +46970,10 @@ self: { crypto-random cryptohash tasty tasty-hunit tasty-kat tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion crypto-pubkey-types crypto-random + cryptohash deepseq mtl + ]; homepage = "https://github.com/vincenthz/hs-crypto-pubkey"; description = "Public Key cryptography"; license = stdenv.lib.licenses.bsd3; @@ -46458,8 +47125,9 @@ self: { }) {}; "cryptohash" = callPackage - ({ mkDerivation, base, byteable, bytestring, cryptonite, ghc-prim - , HUnit, memory, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite + , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "cryptohash"; @@ -46472,6 +47140,7 @@ self: { base byteable bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base byteable bytestring criterion ]; homepage = "http://github.com/vincenthz/hs-cryptohash"; description = "collection of crypto hashes, fast, pure and practical"; license = stdenv.lib.licenses.bsd3; @@ -46511,8 +47180,8 @@ self: { }) {}; "cryptohash-md5" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, pureMD5 - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , pureMD5, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "cryptohash-md5"; @@ -46523,14 +47192,15 @@ self: { base base16-bytestring bytestring pureMD5 tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/hvr/cryptohash-md5"; description = "Fast, pure and practical MD5 implementation"; license = stdenv.lib.licenses.bsd3; }) {}; "cryptohash-sha1" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , SHA, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "cryptohash-sha1"; @@ -46541,14 +47211,15 @@ self: { base base16-bytestring bytestring SHA tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/hvr/cryptohash-sha1"; description = "Fast, pure and practical SHA-1 implementation"; license = stdenv.lib.licenses.bsd3; }) {}; "cryptohash-sha256" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , SHA, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "cryptohash-sha256"; @@ -46559,14 +47230,15 @@ self: { base base16-bytestring bytestring SHA tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/hvr/cryptohash-sha256"; description = "Fast, pure and practical SHA-256 implementation"; license = stdenv.lib.licenses.bsd3; }) {}; "cryptohash-sha512" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , SHA, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "cryptohash-sha512"; @@ -46577,6 +47249,7 @@ self: { base base16-bytestring bytestring SHA tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/hvr/cryptohash-sha512"; description = "Fast, pure and practical SHA-512 implementation"; license = stdenv.lib.licenses.bsd3; @@ -46584,11 +47257,12 @@ self: { "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base - , base-compat, bytestring, containers, deepseq, directory, filepath - , gitrev, GraphSCC, happy, haskeline, heredoc, monad-control - , monadLib, old-time, presburger, pretty, process, QuickCheck - , random, sbv, simple-smt, smtLib, syb, template-haskell, text - , tf-random, transformers, transformers-base, utf8-string + , base-compat, bytestring, containers, criterion, deepseq + , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc + , monad-control, monadLib, old-time, presburger, pretty, process + , QuickCheck, random, sbv, simple-smt, smtLib, syb + , template-haskell, text, tf-random, transformers + , transformers-base, utf8-string }: mkDerivation { pname = "cryptol"; @@ -46611,6 +47285,7 @@ self: { filepath haskeline monad-control monadLib process random sbv tf-random transformers ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; homepage = "http://www.cryptol.net/"; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; @@ -46637,6 +47312,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_22" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, integer-gmp + , memory, tasty, tasty-hunit, tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.22"; + sha256 = "4be312a42a12ccd2ca60272ef485664f242c7ed89fa1909ba36a54c5fb6ff5f0"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + homepage = "https://github.com/haskell-crypto/cryptonite"; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit @@ -46933,6 +47628,8 @@ self: { pname = "csv-conduit"; version = "0.6.7"; sha256 = "501e6b0b7c6f0e80ba381b5f18af5ec343eb5e1afb4f5fc4e5e318ce51eeb33d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default ghc-prim mmorph monad-control @@ -47058,8 +47755,10 @@ self: { }) {}; "ctrie" = callPackage - ({ mkDerivation, atomic-primops, base, containers, hashable - , primitive, QuickCheck, test-framework, test-framework-quickcheck2 + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , deepseq, hashable, primitive, QuickCheck, random, random-shuffle + , stm, test-framework, test-framework-quickcheck2, transformers + , unordered-containers }: mkDerivation { pname = "ctrie"; @@ -47070,6 +47769,10 @@ self: { base containers hashable QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + async base containers criterion deepseq hashable random + random-shuffle stm transformers unordered-containers + ]; homepage = "https://github.com/mcschroeder/ctrie"; description = "Non-blocking concurrent map"; license = stdenv.lib.licenses.mit; @@ -47082,6 +47785,8 @@ self: { pname = "cube"; version = "0.2.0"; sha256 = "d71f6392f0323ab12da36c43e8780a39c3d547e217d63d19205f056839a30c6a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal containers STL ]; testHaskellDepends = [ base bytestring cereal containers hspec STL @@ -47377,6 +48082,7 @@ self: { sha256 = "1cdb55745936dbca5224dbb36a7006b85164a3bcc3e6af0c2670c0c0f8bb9adb"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ]; homepage = "https://github.com/mgattozzi/curryrs#readme"; description = "Easy to use FFI Bridge for using Rust in Haskell"; license = "unknown"; @@ -47998,7 +48704,7 @@ self: { }) {}; "darkplaces-demo" = callPackage - ({ mkDerivation, base, binary, bytestring, containers + ({ mkDerivation, base, binary, bytestring, containers, criterion , darkplaces-text, data-binary-ieee754, directory, mtl , optparse-applicative, regex-tdfa, transformers }: @@ -48017,6 +48723,9 @@ self: { executableHaskellDepends = [ base bytestring darkplaces-text directory mtl optparse-applicative ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion transformers + ]; homepage = "https://github.com/bacher09/darkplaces-demo"; description = "Utility and parser for DarkPlaces demo files"; license = stdenv.lib.licenses.gpl2; @@ -48868,12 +49577,13 @@ self: { }) {}; "data-has" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion, transformers }: mkDerivation { pname = "data-has"; version = "0.2.1.0"; sha256 = "c13dd9875174926b41911a826bbf6d616ceabc56d27017a76a39d097e170f890"; libraryHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion transformers ]; homepage = "https://github.com/winterland1989/data-has"; description = "Simple extensible product"; license = stdenv.lib.licenses.bsd3; @@ -49104,7 +49814,7 @@ self: { }) {}; "data-msgpack" = callPackage - ({ mkDerivation, base, binary, bytestring, containers + ({ mkDerivation, base, binary, bytestring, containers, criterion , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck , text, unordered-containers, vector, void }: @@ -49123,6 +49833,9 @@ self: { base bytestring containers hashable hspec QuickCheck text unordered-containers vector void ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; homepage = "http://msgpack.org/"; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; @@ -49193,6 +49906,8 @@ self: { pname = "data-object-yaml"; version = "0.3.4.2"; sha256 = "5785ea86b5c2da50edc5dc595d9deadae0a5868f294a6b9664f1aceb38c949a1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring conduit containers convertible-text data-object failure text transformers yaml @@ -49301,6 +50016,8 @@ self: { sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202"; revision = "1"; editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers ]; homepage = "http://ku-fpg.github.io/software/data-reify/"; description = "Reify a recursive data structure into an explicit graph"; @@ -49428,9 +50145,10 @@ self: { }) {}; "data-store" = callPackage - ({ mkDerivation, base, cereal, containers, deepseq, lens - , QuickCheck, safecopy, test-framework, test-framework-quickcheck2 - , transformers, vector + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, ixset, lens, mtl, QuickCheck, random, safecopy, tables + , tagged, test-framework, test-framework-quickcheck2, transformers + , unordered-containers, vector }: mkDerivation { pname = "data-store"; @@ -49443,6 +50161,11 @@ self: { base cereal containers deepseq lens QuickCheck safecopy test-framework test-framework-quickcheck2 transformers vector ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers criterion deepseq ixset lens mtl + random safecopy tables tagged transformers unordered-containers + vector + ]; homepage = "https://github.com/Palmik/data-store"; description = "Type safe, in-memory dictionary with multidimensional keys"; license = stdenv.lib.licenses.bsd3; @@ -49669,6 +50392,8 @@ self: { pname = "dataenc"; version = "0.14.0.7"; sha256 = "f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers ]; homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding"; description = "Data encoding library"; @@ -50084,9 +50809,9 @@ self: { "dbus" = callPackage ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck - , containers, directory, filepath, libxml-sax, network, parsec - , process, QuickCheck, random, text, transformers, unix, vector - , xml-types + , containers, criterion, deepseq, directory, filepath, libxml-sax + , network, parsec, process, QuickCheck, random, text, transformers + , unix, vector, xml-types }: mkDerivation { pname = "dbus"; @@ -50101,6 +50826,7 @@ self: { filepath libxml-sax network parsec process QuickCheck random text transformers unix vector xml-types ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; doCheck = false; homepage = "https://john-millikin.com/software/haskell-dbus/"; description = "A client library for the D-Bus IPC system"; @@ -50197,8 +50923,9 @@ self: { }) {}; "dclabel" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck - , quickcheck-instances, test-framework, test-framework-quickcheck2 + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , QuickCheck, quickcheck-instances, test-framework + , test-framework-quickcheck2 }: mkDerivation { pname = "dclabel"; @@ -50209,6 +50936,10 @@ self: { base bytestring cereal containers QuickCheck quickcheck-instances test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers criterion QuickCheck + quickcheck-instances + ]; description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -51107,6 +51838,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_0_5_1_1" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, exceptions + , monad-loops, mtl, random, ref-fd, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "dejafu"; + version = "0.5.1.1"; + sha256 = "c8ba221dd45a107488e5b499fc59f66587a66eb366c4e3dafb76b84b9d38488a"; + libraryHaskellDepends = [ + base concurrency containers deepseq exceptions monad-loops mtl + random ref-fd semigroups transformers transformers-base + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Systematic testing for Haskell concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -51485,8 +52235,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.5.26"; - sha256 = "b6ef2e5e7fa79d3b76053c97bf88cd2ab77fe15065bf321a135a29d18b4e4a6d"; + version = "2.6.1"; + sha256 = "8544ac13c09059acd2914da86506206879e3feb375361fc5e312548c4d9b6d72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52208,7 +52958,7 @@ self: { "diagrams-lib" = callPackage ({ mkDerivation, active, adjunctions, array, base, cereal, colour - , containers, data-default-class, deepseq, diagrams-core + , containers, criterion, data-default-class, deepseq, diagrams-core , diagrams-solve, directory, distributive, dual-tree, exceptions , filepath, fingertree, fsnotify, hashable, intervals, JuicyPixels , lens, linear, monoid-extras, mtl, numeric-extras @@ -52234,6 +52984,7 @@ self: { base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion diagrams-core ]; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; @@ -52451,6 +53202,8 @@ self: { pname = "diagrams-wx"; version = "0.1.1.0"; sha256 = "472855bcd4f7df78002a35099ba9b0eb21e5473c30e6eff74ecc9dcafa35b9ba"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base cairo diagrams-cairo diagrams-lib wx wxcore ]; @@ -52475,6 +53228,7 @@ self: { homepage = "https://gitlab.com/lamefun/dialog"; description = "Simple dialog-based user interfaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dib" = callPackage @@ -53023,7 +53777,8 @@ self: { }) {}; "dimensional" = callPackage - ({ mkDerivation, base, deepseq, exact-pi, HUnit, numtype-dk, vector + ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit + , numtype-dk, vector }: mkDerivation { pname = "dimensional"; @@ -53033,6 +53788,7 @@ self: { base deepseq exact-pi numtype-dk vector ]; testHaskellDepends = [ base HUnit ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/bjornbm/dimensional/"; description = "Statically checked physical dimensions, using Type Families and Data Kinds"; license = stdenv.lib.licenses.bsd3; @@ -53390,8 +54146,8 @@ self: { }: mkDerivation { pname = "dirstream"; - version = "1.0.1"; - sha256 = "76136a076311a19e4e3242ef15bd21e39b8eade315d03b92f9b8750daffdbe59"; + version = "1.0.2"; + sha256 = "ff5e186dffbb2308a81312c17147609bc9d0352c829a3f138119810f4b70fa75"; libraryHaskellDepends = [ base directory pipes pipes-safe system-fileio system-filepath unix ]; @@ -53436,6 +54192,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "discord-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, data-default, hakyll, hashable, hslogger, lens + , mmorph, mtl, pipes, split, stm, stm-conduit, text, time + , transformers, unordered-containers, url, vector, websockets, wreq + , wuss + }: + mkDerivation { + pname = "discord-hs"; + version = "0.1.3"; + sha256 = "4cdcbc983ef10838e96344ad9b63e772296d9e734b4dc87768f657b7aaa106fc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers data-default + hashable hslogger lens mmorph mtl pipes stm stm-conduit text time + transformers unordered-containers url vector websockets wreq wuss + ]; + executableHaskellDepends = [ base hakyll split ]; + homepage = "https://github.com/jano017/Discord.hs"; + description = "An API wrapper for Discord in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "discordian-calendar" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -53480,9 +54260,10 @@ self: { }) {}; "discrimination" = callPackage - ({ mkDerivation, array, base, containers, contravariant, deepseq - , ghc-prim, hashable, primitive, profunctors, promises, semigroups - , transformers, transformers-compat, vector, void + ({ mkDerivation, array, base, containers, contravariant, criterion + , deepseq, ghc-prim, hashable, primitive, profunctors, promises + , semigroups, transformers, transformers-compat + , unordered-containers, vector, void }: mkDerivation { pname = "discrimination"; @@ -53495,6 +54276,10 @@ self: { primitive profunctors promises semigroups transformers transformers-compat vector void ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim primitive + unordered-containers + ]; homepage = "http://github.com/ekmett/discrimination/"; description = "Fast generic linear-time sorting, joins and container construction"; license = stdenv.lib.licenses.bsd3; @@ -53544,6 +54329,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "display-haskell-do" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "display-haskell-do"; + version = "0.1.0.0"; + sha256 = "78c4fd335953e51394476a6643dac326645877c91f076f12079ebb595fd55948"; + libraryHaskellDepends = [ aeson base text ]; + homepage = "https://github.com/KitFreddura/HaskellDO-Display"; + description = "A display API for HaskellDO"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "disposable" = callPackage + ({ mkDerivation, base, dlist }: + mkDerivation { + pname = "disposable"; + version = "0.1.0.0"; + sha256 = "fc7d7dc460566c9f3ac965c355792806278a19a0fa35e89ab3a5df465fb34e43"; + libraryHaskellDepends = [ base dlist ]; + homepage = "https://github.com/louispan/disposable#readme"; + description = "Allows storing different resource-releasing actions together"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dist-upload" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, process }: mkDerivation { @@ -53605,8 +54414,8 @@ self: { "distributed-process" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-accessor, deepseq, distributed-static, exceptions, hashable - , mtl, network-transport, random, rank1dynamic, stm, syb - , template-haskell, time, transformers + , mtl, network-transport, network-transport-tcp, random + , rank1dynamic, stm, syb, template-haskell, time, transformers }: mkDerivation { pname = "distributed-process"; @@ -53619,6 +54428,9 @@ self: { distributed-static exceptions hashable mtl network-transport random rank1dynamic stm syb template-haskell time transformers ]; + benchmarkHaskellDepends = [ + base binary bytestring network-transport-tcp + ]; homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -53664,6 +54476,8 @@ self: { pname = "distributed-process-azure"; version = "0.1.0"; sha256 = "4f64d22e0ff0dc94e6ecfd99cc7133ab5c5df4dbbe3415bd2c99fdaee98f8035"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ azure-service-api base binary bytestring certificate distributed-process distributed-static executable-path filepath @@ -53773,12 +54587,11 @@ self: { }: mkDerivation { pname = "distributed-process-extras"; - version = "0.3.0"; - sha256 = "bffa1640ec7f59bf415e18fb68e6085bf1cf96d4fc4c51c260ef554385e3cb36"; + version = "0.3.1"; + sha256 = "feeb3891a60c8f1833aec4e3a7eeae34a54f0baf83f6ebfb5610bb14b4f66bdc"; libraryHaskellDepends = [ - base binary containers data-accessor deepseq distributed-process - exceptions fingertree hashable mtl stm time transformers - unordered-containers + base binary containers deepseq distributed-process exceptions + fingertree hashable mtl stm time transformers unordered-containers ]; testHaskellDepends = [ ansi-terminal base binary bytestring containers data-accessor @@ -53847,6 +54660,8 @@ self: { pname = "distributed-process-p2p"; version = "0.1.3.2"; sha256 = "613c65aa986085e61cf65b55bf174cc2f31a79e5b666daf1ef402bcad940a28e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers distributed-process mtl network network-transport network-transport-tcp @@ -53869,6 +54684,8 @@ self: { pname = "distributed-process-platform"; version = "0.1.0"; sha256 = "752980d006aaa5319b91da7b5bd5124322552fff9e9cb7de816aff89b7f5ae2f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process fingertree hashable mtl stm time transformers unordered-containers @@ -53931,6 +54748,8 @@ self: { sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316"; revision = "1"; editedCabalFile = "4ccf03a12611141e322511b6370e2f757e215f17e68fc3f68485ec5b48fa8f70"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers data-accessor distributed-process network network-multicast network-transport network-transport-tcp @@ -54068,6 +54887,8 @@ self: { pname = "distributed-process-zookeeper"; version = "0.2.2.0"; sha256 = "df15044fe0f74e4034be2f58d589e2ffa1e46c36e8024c07d6db56fe39697928"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers deepseq distributed-process hzk mtl network network-transport network-transport-tcp transformers @@ -54490,13 +55311,14 @@ self: { }) {dns_sd = null;}; "do-list" = callPackage - ({ mkDerivation, base, hspec }: + ({ mkDerivation, base, criterion, hspec, mtl, text }: mkDerivation { pname = "do-list"; version = "1.0.1"; sha256 = "b377193461b0ad7a81f9e66bcf10f8838b6f1e39f4a5de3b2e2f45c749c5b694"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion mtl text ]; homepage = "https://github.com/tserduke/do-list#readme"; description = "Do notation for free"; license = stdenv.lib.licenses.bsd3; @@ -55051,6 +55873,8 @@ self: { pname = "dotgen"; version = "0.4.2"; sha256 = "cf0de20a435d74aeb9a32b8bcb3ebfa1b6659ac3f26edefe2df9e1aaf1481891"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/ku-fpg/dotgen"; description = "A simple interface for building .dot graph files."; @@ -55457,6 +56281,8 @@ self: { pname = "drawille"; version = "0.1.2.0"; sha256 = "b8188ee87a06c168974c9655188450eb86c331c556decb31cf084efa846237df"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; homepage = "https://github.com/yamadapc/haskell-drawille#readme"; @@ -55791,6 +56617,8 @@ self: { pname = "dtrace"; version = "0.1"; sha256 = "393b9e0f3ed92d2b817ae162ad5478116d001ec8e05ddf3c65a0334029a45f63"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; description = "Haskell interface to the DTrace system tracing utility"; license = stdenv.lib.licenses.bsd3; @@ -56284,6 +57112,8 @@ self: { pname = "dynobud"; version = "1.9.1.0"; sha256 = "3995a1186ca493ae30fc38b72fbfa49b8f4b5858e266a9b6b24135267deedde5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base binary casadi-bindings casadi-bindings-core cereal containers data-default-class directory distributive @@ -56605,6 +57435,8 @@ self: { pname = "echo"; version = "0.1.3"; sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/RyanGlScott/echo"; description = "A cross-platform, cross-console way to handle echoing terminal input"; @@ -56651,8 +57483,8 @@ self: { }) {canlib = null;}; "ed25519" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, filepath - , ghc-prim, hlint, QuickCheck + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , doctest, filepath, ghc-prim, hlint, QuickCheck }: mkDerivation { pname = "ed25519"; @@ -56664,6 +57496,7 @@ self: { testHaskellDepends = [ base bytestring directory doctest filepath hlint QuickCheck ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; homepage = "http://thoughtpolice.github.com/hs-ed25519"; description = "Ed25519 cryptographic signatures"; license = stdenv.lib.licenses.mit; @@ -56802,8 +57635,9 @@ self: { }) {}; "edit-distance" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, random - , test-framework, test-framework-quickcheck2 + ({ mkDerivation, array, base, containers, criterion, deepseq + , process, QuickCheck, random, test-framework + , test-framework-quickcheck2, time, unix }: mkDerivation { pname = "edit-distance"; @@ -56816,6 +57650,9 @@ self: { array base containers QuickCheck random test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + array base containers criterion deepseq process random time unix + ]; homepage = "http://github.com/phadej/edit-distance"; description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; license = stdenv.lib.licenses.bsd3; @@ -56930,8 +57767,8 @@ self: { }) {}; "effect-handlers" = callPackage - ({ mkDerivation, base, free, hspec, hspec-discover, HUnit - , kan-extensions, mtl, QuickCheck + ({ mkDerivation, base, criterion, free, hspec, hspec-discover + , HUnit, kan-extensions, mtl, QuickCheck }: mkDerivation { pname = "effect-handlers"; @@ -56941,6 +57778,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover HUnit QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/edofic/effect-handlers"; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; @@ -57040,10 +57878,11 @@ self: { }) {}; "egison" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath, ghc - , ghc-paths, Glob, haskeline, HUnit, monad-parallel, mtl, parsec - , process, random, regex-tdfa, test-framework, test-framework-hunit - , text, transformers, unordered-containers, vector + ({ mkDerivation, array, base, containers, criterion, deepseq + , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit + , monad-parallel, mtl, parsec, process, random, regex-tdfa + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "egison"; @@ -57065,6 +57904,9 @@ self: { base Glob HUnit mtl test-framework test-framework-hunit transformers ]; + benchmarkHaskellDepends = [ + base criterion deepseq mtl transformers + ]; homepage = "http://www.egison.org"; description = "Programming language with non-linear pattern-matching against non-free data"; license = stdenv.lib.licenses.mit; @@ -57136,6 +57978,8 @@ self: { sha256 = "3d84485f15b876982c857a57e6e0fec85417c85eddd6b6f4344b3db30f8b934d"; revision = "3"; editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring haskell-src-meta parsec template-haskell text transformers @@ -57315,6 +58159,7 @@ self: { libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; + benchmarkHaskellDepends = [ base ]; homepage = "https://github.com/tibbe/ekg-core"; description = "Tracking of system metrics"; license = stdenv.lib.licenses.bsd3; @@ -57396,6 +58241,8 @@ self: { pname = "ekg-push"; version = "0.0.3"; sha256 = "be683041cb6935aa194a9d241b5f11c2038b7056884fbc0a10ec1f148706b7fb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring ekg-core text time unordered-containers ]; @@ -57443,6 +58290,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-wai" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, http-types, network, text, time, transformers + , unordered-containers, wai, wai-app-static, warp + }: + mkDerivation { + pname = "ekg-wai"; + version = "0.1.0.0"; + sha256 = "48a7e64ac613caf2eea1db79a20785d66552ea0f6943941468b0b6e44dfa7798"; + libraryHaskellDepends = [ + aeson base bytestring ekg-core ekg-json filepath http-types network + text time transformers unordered-containers wai wai-app-static warp + ]; + homepage = "https://github.com/tvh/ekg-wai"; + description = "Remote monitoring of processes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "electrum-mnemonic" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck }: mkDerivation { @@ -57512,10 +58377,10 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "elf"; - version = "0.27"; - sha256 = "5ade563fb19d75af6bf02effe6f9fa8fc207102c259b8d9fe394096f4798d4a7"; + version = "0.28"; + sha256 = "9e27129a3b10386e719e8caeed1cdff6a2a1f3a3c9a81ee493dfb6d11e9ff157"; libraryHaskellDepends = [ base binary bytestring ]; - homepage = "http://github.com/erikcharlebois/elf"; + homepage = "https://github.com/wangbj/elf"; description = "Parser for ELF object format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58165,6 +59030,8 @@ self: { pname = "enchant"; version = "0.1.0.0"; sha256 = "553536cc63fa18dfa07441e03166f10ae71d19c6dbfd04a996a91c318be36dfc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ enchant ]; libraryToolDepends = [ c2hs ]; @@ -58487,9 +59354,9 @@ self: { }) {}; "enummapmap" = callPackage - ({ mkDerivation, base, cereal, containers, contravariant + ({ mkDerivation, base, cereal, containers, contravariant, criterion , data-default, deepseq, ghc-prim, hspec, hspec-expectations, HUnit - , lens, QuickCheck, safecopy, semigroups + , lens, mtl, QuickCheck, safecopy, semigroups }: mkDerivation { pname = "enummapmap"; @@ -58503,6 +59370,9 @@ self: { base cereal containers deepseq hspec hspec-expectations HUnit lens QuickCheck safecopy semigroups ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq mtl + ]; description = "Map of maps using Enum types as keys"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58611,8 +59481,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "1.3.0.1"; - sha256 = "ac630e03e9f4c8c99c39e622b9638c3bdc3b71300ef92597d60acac7ace8e85c"; + version = "1.3.0.2"; + sha256 = "4ca0af8de7d089cf9f1e16e46a6a1300e901907f4edb3a8d393e5af11868899b"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -59145,6 +60015,8 @@ self: { sha256 = "b83980c6f537ab812ac8605a9fe8c3bb9764bb5ae098e20ef882fd5aa824f7b6"; revision = "1"; editedCabalFile = "146f86cb3df790cd26c0ec2f7061027257c7932a64ff8a6725eee5356a887776"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers ersatz toysolver transformers ]; @@ -59474,8 +60346,8 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base, directory, happy, hlint, hspec, process - , regex-posix, xml + ({ mkDerivation, base, criterion, directory, happy, hlint, hspec + , process, regex-posix, xml }: mkDerivation { pname = "euler"; @@ -59486,15 +60358,17 @@ self: { base directory hlint hspec process regex-posix xml ]; testToolDepends = [ happy ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; }) {}; "euphoria" = callPackage - ({ mkDerivation, base, containers, deepseq, elerea, enummapset-th - , hashable, HUnit, test-framework, test-framework-hunit - , test-framework-th, transformers, unordered-containers + ({ mkDerivation, base, containers, criterion, deepseq, elerea + , enummapset-th, hashable, HUnit, test-framework + , test-framework-hunit, test-framework-th, transformers + , unordered-containers }: mkDerivation { pname = "euphoria"; @@ -59507,6 +60381,9 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit test-framework-th ]; + benchmarkHaskellDepends = [ + base criterion deepseq enummapset-th unordered-containers + ]; homepage = "http://github.com/tsurucapital/euphoria"; description = "Dynamic network FRP with events and continuous values"; license = stdenv.lib.licenses.publicDomain; @@ -59832,8 +60709,8 @@ self: { }) {}; "exact-real" = callPackage - ({ mkDerivation, base, checkers, directory, doctest, filepath - , groups, integer-gmp, memoize, QuickCheck, random, tasty + ({ mkDerivation, base, checkers, criterion, directory, doctest + , filepath, groups, integer-gmp, memoize, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, tasty-th }: mkDerivation { @@ -59845,6 +60722,7 @@ self: { base checkers directory doctest filepath groups QuickCheck random tasty tasty-hunit tasty-quickcheck tasty-th ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/expipiplus1/exact-real"; description = "Exact real arithmetic"; license = stdenv.lib.licenses.mit; @@ -60364,6 +61242,8 @@ self: { pname = "explicit-exception"; version = "0.1.8"; sha256 = "7fee7a3781db3c3bf82079e635d510088dbb6f4295fde887c603819ec14cd16f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base deepseq transformers ]; homepage = "http://www.haskell.org/haskellwiki/Exception"; description = "Exceptions which are explicit in the type signature"; @@ -60962,21 +61842,23 @@ self: { }) {}; "farmhash" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck }: + ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck }: mkDerivation { pname = "farmhash"; version = "0.1.0.5"; sha256 = "0e685a5445f7bce88682d209bccb47d03f06065a627475df44a8e2af8bc20fa1"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/abhinav/farmhash"; description = "Fast hash functions"; license = stdenv.lib.licenses.bsd3; }) {}; "fast-builder" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck - , stm + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector }: mkDerivation { pname = "fast-builder"; @@ -60984,14 +61866,19 @@ self: { sha256 = "4a83c2fb4e21ec43d7cf9b2412286e1fea036f7c5cbfd4dcee8914f8b2ae9e1c"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; homepage = "http://github.com/takano-akio/fast-builder"; description = "Fast ByteString Builder"; license = stdenv.lib.licenses.publicDomain; }) {}; "fast-digits" = callPackage - ({ mkDerivation, base, digits, integer-gmp, QuickCheck, smallcheck - , tasty, tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck + , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "fast-digits"; @@ -61002,6 +61889,7 @@ self: { base digits QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion digits ]; homepage = "https://github.com/Bodigrim/fast-digits"; description = "The fast library for integer-to-digits conversion"; license = stdenv.lib.licenses.gpl3; @@ -61189,8 +62077,8 @@ self: { }) {}; "fastpbkdf2" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, openssl - , tasty, tasty-hunit + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , cryptonite, openssl, pbkdf, tasty, tasty-hunit }: mkDerivation { pname = "fastpbkdf2"; @@ -61201,6 +62089,9 @@ self: { testHaskellDepends = [ base base16-bytestring bytestring tasty tasty-hunit ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite pbkdf + ]; homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme"; description = "Haskell bindings to the fastpbkdf2 C library"; license = stdenv.lib.licenses.bsd3; @@ -61535,7 +62426,8 @@ self: { }) {}; "fclabels" = callPackage - ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers + ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell + , transformers }: mkDerivation { pname = "fclabels"; @@ -61545,6 +62437,7 @@ self: { testHaskellDepends = [ base HUnit mtl template-haskell transformers ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels implemented as lenses"; license = stdenv.lib.licenses.bsd3; @@ -61820,11 +62713,11 @@ self: { }) {}; "feldspar-compiler" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, data-default - , directory, feldspar-language, filepath, gcc_s, ghc-paths, mtl - , plugins, plugins-multistage, pretty, process, QuickCheck - , storable-record, storable-tuple, syntactic, tasty, tasty-golden - , tasty-quickcheck, template-haskell + ({ mkDerivation, base, bytestring, Cabal, containers, criterion + , data-default, deepseq, directory, feldspar-language, filepath + , gcc_s, ghc-paths, mtl, plugins, plugins-multistage, pretty + , process, QuickCheck, storable-record, storable-tuple, syntactic + , tasty, tasty-golden, tasty-quickcheck, template-haskell }: mkDerivation { pname = "feldspar-compiler"; @@ -61840,6 +62733,9 @@ self: { base bytestring Cabal feldspar-language mtl process QuickCheck tasty tasty-golden tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base criterion data-default deepseq feldspar-language + ]; homepage = "http://feldspar.github.com"; description = "Compiler for the Feldspar language"; license = stdenv.lib.licenses.bsd3; @@ -62012,6 +62908,8 @@ self: { pname = "ffmpeg-light"; version = "0.11.3"; sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base either exceptions JuicyPixels mtl transformers vector ]; @@ -62805,7 +63703,9 @@ self: { }) {inherit (pkgs) cfitsio;}; "fitspec" = callPackage - ({ mkDerivation, base, cmdargs, leancheck, template-haskell }: + ({ mkDerivation, base, cmdargs, haskell-src, haskell-src-exts + , leancheck, pretty, template-haskell + }: mkDerivation { pname = "fitspec"; version = "0.4.0"; @@ -62814,6 +63714,10 @@ self: { base cmdargs leancheck template-haskell ]; testHaskellDepends = [ base cmdargs leancheck template-haskell ]; + benchmarkHaskellDepends = [ + base cmdargs haskell-src haskell-src-exts leancheck pretty + template-haskell + ]; homepage = "https://github.com/rudymatela/fitspec#readme"; description = "refining property sets for testing Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -63493,13 +64397,14 @@ self: { }) {}; "floating-bits" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion }: mkDerivation { pname = "floating-bits"; version = "0.3.0.0"; sha256 = "b2cf891588df5adc6633c26d8e75c582c0cecfcf7f48e3a889e8013d739ae2b2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Conversions between floating and integral values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -63726,8 +64631,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.1.0"; - sha256 = "0153c9fe8224f1cf72acfd6b738f03fed28e7b498ececaec176edb98556ef184"; + version = "0.5.1.1"; + sha256 = "9230417d449ea9af3257dbaba15a7aada3db6289b2e26246bbd92787f3cb394c"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -63803,9 +64708,9 @@ self: { "fluent-logger" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal - , cereal-conduit, conduit, conduit-extra, containers, exceptions - , hspec, messagepack, network, network-socket-options, random, stm - , text, time, transformers, vector + , cereal-conduit, conduit, conduit-extra, containers, criterion + , exceptions, hspec, messagepack, network, network-socket-options + , random, stm, text, time, transformers, vector }: mkDerivation { pname = "fluent-logger"; @@ -63820,6 +64725,7 @@ self: { conduit-extra containers exceptions hspec messagepack network text time transformers ]; + benchmarkHaskellDepends = [ base criterion ]; description = "A structured logger for Fluentd (Haskell)"; license = stdenv.lib.licenses.asl20; }) {}; @@ -63886,13 +64792,21 @@ self: { }) {}; "fmt" = callPackage - ({ mkDerivation, base, hspec, text, text-format }: + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, containers, hspec, microlens, neat-interpolation + , text, text-format, vector + }: mkDerivation { pname = "fmt"; - version = "0.0.0.2"; - sha256 = "8cf2554099987e09090d8b7ac084ff1b389c934e3de1cc99c0f29d754ff0a20a"; - libraryHaskellDepends = [ base text text-format ]; - testHaskellDepends = [ base hspec text ]; + version = "0.0.0.3"; + sha256 = "a6cc32309e996acc4db281368184a1333b52072023315dfa8f20fbfa235ed81b"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring microlens text + text-format + ]; + testHaskellDepends = [ + base bytestring containers hspec neat-interpolation text vector + ]; homepage = "http://github.com/aelve/fmt"; description = "Nice formatting library"; license = stdenv.lib.licenses.bsd3; @@ -63991,8 +64905,8 @@ self: { "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, mwc-random, primitive, profunctors, text - , transformers, vector + , contravariant, criterion, mwc-random, primitive, profunctors + , text, transformers, vector }: mkDerivation { pname = "foldl"; @@ -64002,13 +64916,14 @@ self: { base bytestring comonad containers contravariant mwc-random primitive profunctors text transformers vector ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; }) {}; "foldl-incremental" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, foldl - , histogram-fill, mwc-random, pipes, QuickCheck, tasty + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty , tasty-golden, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { @@ -64022,6 +64937,7 @@ self: { base bytestring containers foldl histogram-fill mwc-random pipes QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ base containers criterion foldl ]; homepage = "https://github.com/tonyday567/foldl-incremental"; description = "incremental folds"; license = stdenv.lib.licenses.mit; @@ -64029,8 +64945,8 @@ self: { }) {}; "foldl-statistics" = callPackage - ({ mkDerivation, base, foldl, math-functions, profunctors - , quickcheck-instances, semigroups, statistics, tasty + ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random + , profunctors, quickcheck-instances, semigroups, statistics, tasty , tasty-quickcheck, vector }: mkDerivation { @@ -64044,6 +64960,9 @@ self: { base foldl profunctors quickcheck-instances semigroups statistics tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base criterion foldl mwc-random statistics vector + ]; homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; @@ -64051,9 +64970,9 @@ self: { "foldl-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers - , doctest, foldl, free, monoid-subclasses, profunctors - , semigroupoids, semigroups, split, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, void + , criterion, doctest, foldl, free, lens-family-core + , monoid-subclasses, profunctors, semigroupoids, semigroups, split + , tasty, tasty-hunit, tasty-quickcheck, text, transformers, void }: mkDerivation { pname = "foldl-transduce"; @@ -64068,6 +64987,9 @@ self: { base doctest foldl free monoid-subclasses split tasty tasty-hunit tasty-quickcheck text ]; + benchmarkHaskellDepends = [ + base criterion foldl lens-family-core + ]; description = "Transducers for foldl folds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64699,7 +65621,7 @@ self: { }) {}; "foundation" = callPackage - ({ mkDerivation, base, ghc-prim, mtl, QuickCheck, tasty + ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: mkDerivation { @@ -64712,6 +65634,7 @@ self: { testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; @@ -65054,8 +65977,8 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "0.7.1"; - sha256 = "051dff857638b93e574aecce065860e1985e71a8e0f07c410966cdf87880930c"; + version = "0.7.2"; + sha256 = "de9a834164e97e1b025ca01d58833e8d91afe68e7152e0af40e30050b3898121"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad constraints contravariant profunctors template-haskell transformers @@ -65287,8 +66210,8 @@ self: { libfreenect = null;}; "freer" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "freer"; @@ -65301,6 +66224,7 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion free mtl ]; homepage = "https://gitlab.com/queertypes/freer"; description = "Implementation of the Freer Monad"; license = stdenv.lib.licenses.bsd3; @@ -65371,6 +66295,8 @@ self: { pname = "freetype2"; version = "0.1.1"; sha256 = "da18f9d3047277ba47e162dafa0b2a4777bfb6157b39ad91f9e808ba36f65e99"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; description = "Haskell binding for FreeType 2 library"; license = stdenv.lib.licenses.bsd3; @@ -65482,6 +66408,8 @@ self: { pname = "friday-scale-dct"; version = "1.0.0.1"; sha256 = "0a40db255149c553169d8c2cc8f7ae11b511061b45a3e5c810f9be3390951b48"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base-compat carray fft friday vector ]; @@ -65773,6 +66701,8 @@ self: { pname = "ftdi"; version = "0.2.0.1"; sha256 = "a892fae6e1c12c3fc1db3f10e84b99c46f6145ac3fb3bcad519bcb619f5dcebe"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base-unicode-symbols bytestring safe transformers usb ]; @@ -65844,6 +66774,8 @@ self: { pname = "ftphs"; version = "1.0.9.1"; sha256 = "ce0b05b2fc7f93a6195184ed1a8edee69a7a9cf4aa3d15ebeb25421715571bf2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hslogger MissingH mtl network parsec regex-compat ]; @@ -65907,14 +66839,17 @@ self: { }) {}; "full-text-search" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, tasty - , tasty-quickcheck, text, vector + ({ mkDerivation, alex, array, base, containers, happy, QuickCheck + , tasty, tasty-quickcheck, text, vector }: mkDerivation { pname = "full-text-search"; version = "0.2.1.3"; sha256 = "f3de82428b67819c1284f18192922e20cda5cb3cdb447297018507b13e3ca368"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers text vector ]; + executableToolDepends = [ alex happy ]; testHaskellDepends = [ array base containers QuickCheck tasty tasty-quickcheck text vector ]; @@ -66222,13 +67157,16 @@ self: { }) {}; "funnyprint" = callPackage - ({ mkDerivation, base, hscolour, ipprint, tasty, tasty-hspec }: + ({ mkDerivation, base, criterion, hscolour, ipprint, tasty + , tasty-hspec + }: mkDerivation { pname = "funnyprint"; version = "0.0.5"; sha256 = "8f13d87e1a47957cad27e4753af10d375406e503d90a9e1cb193aec68eeef99e"; libraryHaskellDepends = [ base hscolour ipprint ]; testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion hscolour ipprint ]; homepage = "https://github.com/Pitometsu/funnyprint#readme"; description = "funnyPrint function to colorize GHCi output"; license = stdenv.lib.licenses.mit; @@ -66763,8 +67701,8 @@ self: { }: mkDerivation { pname = "gdo"; - version = "0.1.2"; - sha256 = "0a4612e13b97de8950ff87779a98ca837ed5de78baf9754d465b648edcc44018"; + version = "0.1.5"; + sha256 = "9c128b9e29799b761e289bbfa7125e655acc934a84615b84164f3ba8188d1627"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66843,6 +67781,8 @@ self: { pname = "gegl"; version = "0.0.0.4"; sha256 = "cd938dcc3042980669f01186cc4d0a52d03a5b8cf14553598ef6c04e0748f822"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ babl base containers glib inline-c monad-loops random split template-haskell @@ -66953,8 +67893,8 @@ self: { }: mkDerivation { pname = "gendocs"; - version = "0.1.0.0"; - sha256 = "5ed453b7811e8b43ff5d660acbf6f75e6022a63c546ca282b2ea9b3474e762f0"; + version = "0.1.2"; + sha256 = "60e9e403012fdf31fd99a7ec1e89034b3cabb32de167af9ad54a1d5da45c7a64"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring safe text ]; @@ -66964,6 +67904,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "general-games" = callPackage + ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom + , random, random-shuffle + }: + mkDerivation { + pname = "general-games"; + version = "0.4.0"; + sha256 = "ffd2e343716ee1bc73d6abfc810c06528e85eed083878f0c73cdc3510aa30642"; + libraryHaskellDepends = [ + base monad-loops MonadRandom random random-shuffle + ]; + testHaskellDepends = [ base hspec HUnit MonadRandom ]; + homepage = "https://github.com/cgorski/general-games"; + description = "Library supporting simulation of a number of games"; + license = stdenv.lib.licenses.mit; + }) {}; + "general-prelude" = callPackage ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath }: @@ -67126,9 +68083,9 @@ self: { }) {}; "generic-maybe" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , doctest, filepath, generic-deriving, ghc-prim, hlint, mtl, nats - , parallel, semigroups, simple-reflect, split, text + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , directory, doctest, filepath, generic-deriving, ghc-prim, hlint + , mtl, nats, parallel, semigroups, simple-reflect, split, text , unordered-containers, vector }: mkDerivation { @@ -67141,6 +68098,7 @@ self: { generic-deriving hlint mtl nats parallel semigroups simple-reflect split text unordered-containers vector ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/jfischoff/generic-maybe"; description = "A generic version of Data.Maybe"; license = stdenv.lib.licenses.bsd3; @@ -68170,6 +69128,8 @@ self: { pname = "ghc-exactprint"; version = "0.5.3.0"; sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers directory filepath free ghc ghc-boot ghc-paths mtl syb @@ -68479,6 +69439,8 @@ self: { pname = "ghc-prof"; version = "1.3.0.2"; sha256 = "99a13463bf12803c02071206b090c1e4a1364f6f0bbc4162155c478a2c740fa1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers scientific text time ]; @@ -68499,6 +69461,8 @@ self: { pname = "ghc-prof"; version = "1.4.0"; sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers scientific text time ]; @@ -68633,6 +69597,8 @@ self: { pname = "ghc-time-alloc-prof"; version = "0.1.0"; sha256 = "61a877a8f7a7dbfc8ceeac0e7b20f63a52183b7d1690d0557b4300c0bbfe30d5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers text time ]; testHaskellDepends = [ attoparsec base directory filepath process tasty tasty-hunit @@ -68711,6 +69677,8 @@ self: { pname = "ghc-typelits-presburger"; version = "0.1.1.0"; sha256 = "bcb005e8c4ae609a75ceef344abe5b2282d23f0dc409426bda9965e02d2d4f92"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base equational-reasoning ghc ghc-tcplugins-extra presburger reflection @@ -68950,8 +69918,6 @@ self: { pname = "ghcjs-dom-jsffi"; version = "0.7.0.4"; sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619"; - isLibrary = false; - isExecutable = false; description = "DOM library using JSFFI and GHCJS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -68969,6 +69935,7 @@ self: { ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-hplay" = callPackage @@ -69021,6 +69988,8 @@ self: { pname = "ghcjs-vdom"; version = "0.2.0.0"; sha256 = "4a53dba09fc79b495f172584d0fa4e60d14453466098d9e221c8f3d0dc5d68c5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split template-haskell @@ -69335,7 +70304,7 @@ self: { "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; @@ -69347,18 +70316,17 @@ self: { haskell-gi haskell-gi-base text transformers ]; librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; + libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gobjectIntrospection, gst-plugins-base + , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { @@ -69371,19 +70339,18 @@ self: { haskell-gi-base text transformers ]; librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; + libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstvideo"; @@ -69395,14 +70362,13 @@ self: { haskell-gi haskell-gi-base text transformers ]; librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; + libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -69566,8 +70532,8 @@ self: { }: mkDerivation { pname = "gi-pango"; - version = "1.0.11"; - sha256 = "8e709c61b8e6a8d2973d7206b15e324327d79ec4b6c301b949837d33d1f7ec66"; + version = "1.0.12"; + sha256 = "8a2badc09262448996bc3b4b82d6fdc69b423d4a34d57cdc859c89f8ae74250d"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -69595,8 +70561,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.11"; - sha256 = "604c2759510e6987fb2ca63c4b20940147fd07fcf56f701c221bf836de0481ad"; + version = "1.0.12"; + sha256 = "e24214f43c50ecb1077168298bf48e447ddcb80ee8c8452fc02ef04df971a787"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango @@ -69669,8 +70635,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.12"; - sha256 = "c286d581ad3f3e25dc4f7b5b8439d4e6a0e2d6312218e5cc528c490c07573670"; + version = "2.91.13"; + sha256 = "4dfce5aefb7e2e8daad8be77f3c64580bd5c1b90287513153f668497308c1b40"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject @@ -69821,7 +70787,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ginger_0_5_0_0" = callPackage + "ginger_0_5_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers @@ -69829,8 +70795,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.5.0.0"; - sha256 = "619261156d6d5fa5cdde9b2f39429c22b20b9d9159dcb4e867a598f5ed5c7f5c"; + version = "0.5.1.2"; + sha256 = "f6eb7424e05408227d405607c12e6efce129da54693c6c56527a42cff9c82077"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69927,6 +70893,8 @@ self: { pname = "giphy-api"; version = "0.5.2.0"; sha256 = "447111d3fa32a76ffc50b26fbec59d9e9a097d7e2facb04a7a272cb9abd97ce9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base containers http-api-data http-client http-client-tls microlens microlens-th mtl network-uri servant servant-client text @@ -70456,8 +71424,8 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20161118"; - sha256 = "5278f8f3502721cb677b4ac0de4df8c2954ddb0335ceb9e63c4b29e77912a21b"; + version = "1.20170221"; + sha256 = "2838227d760bb0ea933a84023ec3eeda23ffc0dc870c290dfcd6b9b19d02b869"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -70847,9 +71815,9 @@ self: { "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , conduit-combinators, conduit-extra, directory, doctest, errors - , filepath, flock, Glob, hspec, lifted-base, monad-control, process - , transformers + , conduit-combinators, conduit-extra, criterion, directory, doctest + , errors, filepath, flock, Glob, hspec, lifted-base, monad-control + , process, random, transformers }: mkDerivation { pname = "gitson"; @@ -70863,6 +71831,9 @@ self: { testHaskellDepends = [ aeson base directory doctest Glob hspec process transformers ]; + benchmarkHaskellDepends = [ + aeson base criterion directory random transformers + ]; homepage = "https://github.com/myfreeweb/gitson"; description = "A document store library for Git + JSON"; license = stdenv.lib.licenses.publicDomain; @@ -71089,14 +72060,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glazier_0_10_0_0" = callPackage + "glazier_0_11_0_0" = callPackage ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids , transformers }: mkDerivation { pname = "glazier"; - version = "0.10.0.0"; - sha256 = "af7325fd898b62b8a29c106836b25fd334ab637d5d773a55da1fc25942af5167"; + version = "0.11.0.0"; + sha256 = "8ef0c04025f7d6942eeee13f9f376ed8019e38b6cd48e1eaffff5f5cd789c0ff"; libraryHaskellDepends = [ base lens mmorph mtl semigroupoids transformers ]; @@ -71256,8 +72227,8 @@ self: { }) {}; "glob-posix" = callPackage - ({ mkDerivation, base, directory, filepath, tasty - , tasty-expected-failure, tasty-hunit, unix + ({ mkDerivation, base, criterion, directory, filepath, Glob + , MissingH, tasty, tasty-expected-failure, tasty-hunit, unix }: mkDerivation { pname = "glob-posix"; @@ -71268,6 +72239,7 @@ self: { base directory filepath tasty tasty-expected-failure tasty-hunit unix ]; + benchmarkHaskellDepends = [ base criterion Glob MissingH ]; homepage = "https://github.com/rdnetto/glob-posix#readme"; description = "Haskell bindings for POSIX glob library"; license = stdenv.lib.licenses.asl20; @@ -71796,15 +72768,16 @@ self: { }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage - ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring - , conduit, conduit-extra, exceptions, extra, HUnit-approx, lens - , monad-control, mtl, resourcet, rtcm, sbp, tasty, tasty-hunit - , time, transformers-base, unordered-containers + ({ mkDerivation, base, basic-prelude, binary, binary-conduit + , bytestring, conduit, conduit-extra, exceptions, extra + , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp + , tasty, tasty-hunit, text, time, transformers-base + , unordered-containers }: mkDerivation { pname = "gnss-converters"; - version = "0.2.1"; - sha256 = "47732c64bb1091ac79386d142ba790cf809b4390244c710d3a5c246feb24e4c2"; + version = "0.2.4"; + sha256 = "0781dbaaece9a06a2ded982b193e6a5fed7a4a36f4e3ac031f89d710e97dfafd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71816,9 +72789,9 @@ self: { base basic-prelude binary-conduit conduit conduit-extra resourcet ]; testHaskellDepends = [ - base basic-prelude binary-conduit bytestring conduit conduit-extra - HUnit-approx lens resourcet rtcm sbp tasty tasty-hunit - unordered-containers + base basic-prelude binary binary-conduit bytestring conduit + conduit-extra HUnit-approx lens resourcet rtcm sbp tasty + tasty-hunit text unordered-containers ]; homepage = "http://github.com/swift-nav/gnss-converters"; description = "GNSS Converters"; @@ -71858,6 +72831,8 @@ self: { pname = "gnuplot"; version = "0.5.4.1"; sha256 = "fa54c95f5dad96e3af6a13429cf6852bffe97bd52bdd99bdce60ca9e78bee8f7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers data-accessor data-accessor-transformers deepseq filepath process temporary time transformers utility-ht @@ -74829,6 +75804,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-translate_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-api-data + , http-client, servant, servant-client, text, transformers + }: + mkDerivation { + pname = "google-translate"; + version = "0.4"; + sha256 = "acd1fe031674f578e83e7736335bfa9999b430c19afbd5ca89aae97179be4929"; + libraryHaskellDepends = [ + aeson base bytestring http-api-data http-client servant + servant-client text transformers + ]; + description = "Google Translate API bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "googleplus" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , enumerator, haskell98, http-enumerator, http-types, mtl, text @@ -75019,6 +76011,8 @@ self: { pname = "gore-and-ash-lambdacube"; version = "0.2.0.0"; sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash hashable lambdacube-compiler lambdacube-gl mtl text unordered-containers @@ -75713,6 +76707,8 @@ self: { pname = "graphics-drawingcombinators"; version = "1.5.1"; sha256 = "4e8ffecad64bc9529869059a62c3dc2ca177465dc8c3890e0be6b74b4aa61148"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bitmap bitmap-opengl FTGL OpenGL stb-image ]; @@ -75803,9 +76799,10 @@ self: { }) {}; "graphql-api" = callPackage - ({ mkDerivation, aeson, attoparsec, base, containers, directory - , doctest, exceptions, hspec, protolude, QuickCheck, raw-strings-qq - , scientific, tasty, tasty-hspec, text, transformers + ({ mkDerivation, aeson, attoparsec, base, containers, criterion + , directory, doctest, exceptions, hspec, protolude, QuickCheck + , raw-strings-qq, scientific, tasty, tasty-hspec, text + , transformers }: mkDerivation { pname = "graphql-api"; @@ -75821,6 +76818,9 @@ self: { aeson attoparsec base containers directory doctest exceptions hspec protolude QuickCheck raw-strings-qq tasty tasty-hspec transformers ]; + benchmarkHaskellDepends = [ + attoparsec base criterion exceptions protolude transformers + ]; homepage = "https://github.com/jml/graphql-api#readme"; description = "Write type-safe GraphQL services in Haskell"; license = stdenv.lib.licenses.asl20; @@ -75863,14 +76863,17 @@ self: { }) {}; "graphviz" = callPackage - ({ mkDerivation, base, bytestring, colour, containers, directory - , dlist, fgl, fgl-arbitrary, filepath, polyparse, process - , QuickCheck, temporary, text, transformers, wl-pprint-text + ({ mkDerivation, base, bytestring, colour, containers, criterion + , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath + , polyparse, process, QuickCheck, temporary, text, transformers + , wl-pprint-text }: mkDerivation { pname = "graphviz"; version = "2999.18.1.2"; sha256 = "b08c2026d3810c15f6ad49a07fd7b879978d958fa477b369b719ec00741c85fc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring colour containers directory dlist fgl filepath polyparse process temporary text transformers wl-pprint-text @@ -75878,6 +76881,7 @@ self: { testHaskellDepends = [ base containers fgl fgl-arbitrary filepath QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -76157,6 +77161,8 @@ self: { pname = "gridland"; version = "0.1.0.3"; sha256 = "2936472e5eb065e1fe28bd5d2f9d524be8d63f6eba0627527acf1668ec38b760"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array astar base containers grid htiled mtl random safe SDL SDL-gfx SDL-image SDL-mixer tuple vector @@ -76370,8 +77376,8 @@ self: { }) {}; "grouped-list" = callPackage - ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck - , tasty, tasty-quickcheck + ({ mkDerivation, base, containers, criterion, deepseq, pointed + , QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "grouped-list"; @@ -76379,6 +77385,7 @@ self: { sha256 = "5bc49f34b1d9759a819c919971d789b14d37a8e22de811a5fc062675e3f8e875"; libraryHaskellDepends = [ base containers deepseq pointed ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; description = "Grouped lists. Equal consecutive elements are grouped."; license = stdenv.lib.licenses.bsd3; @@ -76588,7 +77595,7 @@ self: { "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib - , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl + , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl }: mkDerivation { pname = "gstreamer"; @@ -76598,11 +77605,11 @@ self: { libraryHaskellDepends = [ array base bytestring directory glib mtl ]; - libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; + libraryPkgconfigDepends = [ gst_plugins_base gstreamer ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; + }) {gst_plugins_base = null; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -76944,6 +77951,8 @@ self: { pname = "gtk3"; version = "0.14.6"; sha256 = "f4c0d3c51a5e06e5f6a8fcfc2a1303e0a3ed0242309fc6c1b9603be9de1f4258"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers gio glib mtl pango text @@ -77399,7 +78408,7 @@ self: { "hOpenPGP" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, binary, binary-conduit, byteable - , bytestring, bzlib, conduit, conduit-extra, containers + , bytestring, bzlib, conduit, conduit-extra, containers, criterion , crypto-cipher-types, cryptonite, data-default-class, errors , hashable, incremental-parser, ixset-typed, lens, memory , monad-loops, nettle, network, network-uri, newtype @@ -77432,6 +78441,16 @@ self: { tasty-quickcheck text time time-locale-compat transformers unordered-containers wl-pprint-extras zlib ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bifunctors binary + binary-conduit byteable bytestring bzlib conduit conduit-extra + containers criterion crypto-cipher-types cryptonite + data-default-class errors hashable incremental-parser ixset-typed + lens memory monad-loops nettle network network-uri newtype + openpgp-asciiarmor resourcet securemem semigroups split text time + time-locale-compat transformers unordered-containers + wl-pprint-extras zlib + ]; homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; @@ -78535,8 +79554,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.5.1"; - sha256 = "667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad"; + version = "0.5.2"; + sha256 = "fa38878313ab5075d86438d3853760b48c5a943a822a91f6a4057424abed7c63"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79055,10 +80074,10 @@ self: { }) {}; "hairy" = callPackage - ({ mkDerivation, aeson, base, data-default, heroku, hspec - , http-types, monad-logger, mtl, persistent, persistent-postgresql - , persistent-template, scotty, text, time, transformers, wai - , wai-extra, warp + ({ mkDerivation, aeson, base, criterion, data-default, heroku + , hspec, http-types, monad-logger, mtl, persistent + , persistent-postgresql, persistent-template, scotty, text, time + , transformers, wai, wai-extra, warp }: mkDerivation { pname = "hairy"; @@ -79075,6 +80094,9 @@ self: { testHaskellDepends = [ base hspec http-types mtl persistent scotty time wai wai-extra ]; + benchmarkHaskellDepends = [ + base criterion http-types mtl persistent scotty time wai wai-extra + ]; homepage = "https://github.com/tfausak/hairy"; description = "A JSON REST API"; license = stdenv.lib.licenses.mit; @@ -79083,11 +80105,11 @@ self: { "hakaru" = callPackage ({ mkDerivation, aeson, array, base, bytestring, Cabal, cassava - , containers, directory, hmatrix, HUnit, integration, logfloat - , math-functions, monad-loops, mwc-random, parallel, parsec, pretty - , primitive, QuickCheck, random, statistics, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers, vector, zlib + , containers, criterion, deepseq, directory, ghc-prim, hmatrix + , HUnit, integration, logfloat, math-functions, monad-loops + , mwc-random, parallel, parsec, pretty, primitive, QuickCheck + , random, statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, transformers, vector, zlib }: mkDerivation { pname = "hakaru"; @@ -79105,6 +80127,7 @@ self: { statistics test-framework test-framework-hunit test-framework-quickcheck2 vector ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ]; homepage = "http://indiana.edu/~ppaml/"; description = "A probabilistic programming embedded DSL"; license = stdenv.lib.licenses.bsd3; @@ -79391,8 +80414,8 @@ self: { ({ mkDerivation, base, hakyll, ogmarkup }: mkDerivation { pname = "hakyll-ogmarkup"; - version = "1.0"; - sha256 = "eee4e2f63409f209f77903cc18c86a68529b46e4af7eaa2497af849a4588ce24"; + version = "3.0"; + sha256 = "c7b1584e06384b18d2e1bc07ce55fbfc22c40592f330e4e155be7732bc641021"; libraryHaskellDepends = [ base hakyll ogmarkup ]; homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; description = "Integrate ogmarkup document with Hakyll"; @@ -79534,8 +80557,8 @@ self: { }: mkDerivation { pname = "halive"; - version = "0.1.2"; - sha256 = "465255836639653f42763d8b04a39840af35bde77b3cdfc53a419a44a96f902d"; + version = "0.1.3"; + sha256 = "e80cb5da27691a969de1e9526bfe24cabb3bfa5f170b2af6066885518d6ece65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79927,6 +80950,8 @@ self: { pname = "hans"; version = "3.0.1"; sha256 = "24da2418908a3297901c8b7e273b70a44a6b7255659de31b76afa4e3ffcc57ad"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base BoundedChan bytestring cereal containers cryptonite hashable heaps memory monadLib psqueues random time unix @@ -80009,6 +81034,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_0_1" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, hspec, mtl + , optparse-applicative, path, path-io, process, temporary, time + , transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.0.1"; + sha256 = "ab0da599f2b4cb7208b2bdc349844bedb28141937a4aa0b3546f57b98854a6dc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson base optparse-applicative path path-io yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -80033,6 +81084,8 @@ self: { pname = "happindicator3"; version = "0.2.1"; sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ libappindicator-gtk3 ]; homepage = "https://github.com/mlacorte/happindicator3"; @@ -80117,6 +81170,8 @@ self: { pname = "happstack"; version = "7.0.2"; sha256 = "d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base happstack-server ]; doHaddock = false; homepage = "http://happstack.com"; @@ -80200,6 +81255,8 @@ self: { pname = "happstack-contrib"; version = "0.2.1"; sha256 = "e550c0e74b1873ac051a886626f44571cf8543e179096f391f1cbecaa4750d33"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring directory happstack-data happstack-ixset happstack-server happstack-state happstack-util HTTP mtl network @@ -80222,6 +81279,8 @@ self: { sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c"; revision = "1"; editedCabalFile = "dbf53b1d5012ac975d184455269f3d631ba2352e9642b707b98465c47225fd06"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers mtl pretty syb syb-with-class syb-with-class-instances-text template-haskell text time @@ -80256,13 +81315,15 @@ self: { , filepath, happstack, happstack-data, happstack-hsp , happstack-ixset, happstack-server, happstack-state , happstack-util, harp, hsp, hsx, html, HTTP, json, mtl, network - , old-time, random, RJson, syb, text, time, utf8-string, web-routes - , web-routes-mtl + , old-time, random, RJson, syb, text, time, trhsx, utf8-string + , web-routes, web-routes-mtl }: mkDerivation { pname = "happstack-facebook"; version = "0.30"; sha256 = "0c517c663da5323fe6677fa73f8ba862725e1bb813566af63d38ee1f6716cde5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ applicative-extras base bytestring containers filepath happstack happstack-data happstack-hsp happstack-ixset happstack-server @@ -80270,6 +81331,7 @@ self: { network old-time random RJson syb text time utf8-string web-routes web-routes-mtl ]; + executableToolDepends = [ trhsx ]; homepage = "http://src.seereason.com/happstack-facebook/"; description = "A package for building Facebook applications using Happstack"; license = stdenv.lib.licenses.bsd3; @@ -80440,6 +81502,8 @@ self: { pname = "happstack-ixset"; version = "6.0.1"; sha256 = "d122eeff5fa0e0321a8a76d2b1ff39f9d99cc70df5dc13be9db970e723b0d0c2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers happstack-data happstack-util mtl syb syb-with-class template-haskell @@ -80591,6 +81655,8 @@ self: { pname = "happstack-state"; version = "6.1.4"; sha256 = "09f7d8eaa7eec13f99d59b7c5bf7e88b3d2889b6879f0f54731a9c6f4801d7f5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers directory extensible-exceptions filepath happstack-data happstack-util hslogger mtl old-time random @@ -80629,6 +81695,8 @@ self: { pname = "happstack-util"; version = "6.0.3"; sha256 = "10de089778b70311d290420c7e6ad987da711b1c1961436ccf26c7cf4bd31a43"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring directory extensible-exceptions filepath hslogger mtl network old-locale old-time parsec process random @@ -80976,6 +82044,8 @@ self: { pname = "has"; version = "0.5.0.1"; sha256 = "5a5cdc8fafbb89a79e6831a707ce303c18edf54e0b389aab9dc6302532e4cd7f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/nonowarn/has"; description = "Entity based records"; @@ -81003,8 +82073,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.0.9"; - sha256 = "8b013b4fc84019eff89ba9d9e1cba86e84cd5570c8acb51aba9b68a958002097"; + version = "0.1.1.1"; + sha256 = "c715475ce67d5b311f6dc252d2d2e58cac9a12e417c007e28635c30c8ca619b1"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default hex network network-simple text transformers @@ -81019,18 +82089,17 @@ self: { }) {}; "hascal" = callPackage - ({ mkDerivation, base, HUnit, numbers }: + ({ mkDerivation, base, data-default, split }: mkDerivation { pname = "hascal"; - version = "2.0.0.1"; - sha256 = "344062494982b809fef504496c7bbacf0932fd7fd35c5b5716c832f1dc4003db"; + version = "3.0.1"; + sha256 = "012e1ed3ac556697f5b1c6888bdf0e6cab126a3fa0e01f2f07c52469856a3145"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base numbers ]; - testHaskellDepends = [ HUnit ]; - homepage = "http://darcsden.com/mekeor/hascal"; - description = "A minimalistic but extensible and precise calculator"; + libraryHaskellDepends = [ base data-default split ]; + executableHaskellDepends = [ base data-default split ]; + homepage = "https://github.com/mekeor/hascal"; + description = "tiny calculator library and command-line program"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -81043,8 +82112,8 @@ self: { }: mkDerivation { pname = "hascar"; - version = "0.2.1.0"; - sha256 = "1a09890e2b3d0955a966a1b7e84995957b44fab8c34c1afaabe7213610d244e1"; + version = "0.2.1.1"; + sha256 = "ff801c3a9595b9afa732194b7d992e1b1a264813f04bdf7bb1de097a7b5c4086"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81183,14 +82252,16 @@ self: { }) {}; "hashable" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp - , QuickCheck, random, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unix + ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit + , integer-gmp, QuickCheck, random, siphash, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; version = "1.2.5.0"; sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring ghc-prim integer-gmp text ]; @@ -81198,6 +82269,9 @@ self: { base bytestring ghc-prim HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 text unix ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim integer-gmp siphash text + ]; homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; @@ -81224,7 +82298,7 @@ self: { }) {}; "hashable-generics" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, QuickCheck + ({ mkDerivation, base, criterion, ghc-prim, hashable, QuickCheck , test-framework, test-framework-quickcheck2 }: mkDerivation { @@ -81236,6 +82310,7 @@ self: { base ghc-prim hashable QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion ghc-prim hashable ]; homepage = "https://github.com/wowus/hashable-generics"; description = "Automatically generates Hashable instances with GHC.Generics."; license = stdenv.lib.licenses.bsd3; @@ -81282,6 +82357,8 @@ self: { pname = "hashed-storage"; version = "0.5.11"; sha256 = "734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers dataenc directory extensible-exceptions filepath mmap mtl zlib @@ -81406,7 +82483,9 @@ self: { }) {}; "hashtables-plus" = callPackage - ({ mkDerivation, base, hashable, hashtables, loch-th, placeholders + ({ mkDerivation, base, criterion-plus, deepseq, hashable + , hashtables, lens, loch-th, mtl, mwc-random, placeholders + , string-conversions, text, th-printf, transformers }: mkDerivation { pname = "hashtables-plus"; @@ -81415,6 +82494,11 @@ self: { libraryHaskellDepends = [ base hashable hashtables loch-th placeholders ]; + benchmarkHaskellDepends = [ + base criterion-plus deepseq hashable hashtables lens loch-th mtl + mwc-random placeholders string-conversions text th-printf + transformers + ]; homepage = "https://github.com/nikita-volkov/hashtables-plus"; description = "Extensions for a \"hashtables\" library"; license = stdenv.lib.licenses.mit; @@ -82173,11 +83257,15 @@ self: { pname = "haskell-mpi"; version = "1.4.0"; sha256 = "c0aa02ffe77d4a39d5b33e3f846e7615c78b2ddfb6b36c9cdec335edb79488ab"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring cereal extensible-exceptions ]; librarySystemDepends = [ open-pal open-rte openmpi ]; libraryToolDepends = [ c2hs ]; + executableSystemDepends = [ open-pal open-rte openmpi ]; + executableToolDepends = [ c2hs ]; homepage = "http://github.com/bjpop/haskell-mpi"; description = "Distributed parallel programming in Haskell using MPI"; license = stdenv.lib.licenses.bsd3; @@ -82589,6 +83677,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-time-range" = callPackage + ({ mkDerivation, base, doctest, lens, semigroups, text, time }: + mkDerivation { + pname = "haskell-time-range"; + version = "0.2.0.0"; + sha256 = "73c6258304465cd4e243287e7012a9630a6835025104414105c29c9e9f5503c7"; + libraryHaskellDepends = [ base lens semigroups text time ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/mankyKitty/haskell-time-range#readme"; + description = "Some useful wrappers and functions for building time ranges"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-token-utils" = callPackage ({ mkDerivation, base, containers, Diff, directory, dual-tree, ghc , ghc-mod, ghc-paths, ghc-prim, ghc-syb-utils, haskell-src-exts @@ -82705,10 +83806,10 @@ self: { }) {}; "haskell-tools-cli" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint - , haskell-tools-refactor, knob, mtl, process, references, split - , tasty, tasty-hunit + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl + , process, references, split, tasty, tasty-hunit, time }: mkDerivation { pname = "haskell-tools-cli"; @@ -82725,6 +83826,9 @@ self: { testHaskellDepends = [ base bytestring directory filepath knob tasty tasty-hunit ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath knob split time + ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; @@ -82984,6 +84088,8 @@ self: { pname = "haskell-xmpp"; version = "1.0.2"; sha256 = "a9345eb03a7ea0dc4a50af3a916ad2c455fb2232c6d36830afc8e70d6c259dfc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base HaXml html mtl network polyparse pretty random regex-compat stm utf8-string @@ -83887,6 +84993,8 @@ self: { pname = "haskore"; version = "0.2.0.8"; sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring containers data-accessor event-list haskell-src markov-chain midi non-negative parsec process random @@ -83953,6 +85061,8 @@ self: { pname = "haskore-synthesizer"; version = "0.0.3.3"; sha256 = "64ddc8bf5a6b5c7f7f0986aada8016c8a09ca21ef3e3320565006bea53a3a4ee"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base data-accessor event-list haskore non-negative numeric-prelude random synthesizer-core synthesizer-filter utility-ht @@ -83981,8 +85091,8 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.69.2.1"; - sha256 = "9d369830ac5e146f7b2a2ed584eec732b0da85af00ed7b91a72e208f6ef5144a"; + version = "0.69.3"; + sha256 = "4e069aa63c2a7d762332d1acbc12a3d705abdc5e24c06d55129e1a3fd66e5afa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84031,6 +85141,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasmin" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, doctest + , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec + , mainland-pretty, matrix, mtl, numbers, optparse-applicative + , parsers, QuickCheck, semigroups, text + }: + mkDerivation { + pname = "hasmin"; + version = "0.3.0.1"; + sha256 = "b4b7b8fbe3553a2b93de7a7f3a90b9e8a5410a5e79f59db15e1f08ef62777e38"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers mainland-pretty matrix mtl + numbers parsers semigroups text + ]; + executableHaskellDepends = [ + attoparsec base bytestring containers gitrev hopfli mainland-pretty + matrix mtl numbers optparse-applicative parsers text + ]; + testHaskellDepends = [ + attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl + QuickCheck text + ]; + homepage = "https://github.com/contivero/hasmin/"; + description = "\"A CSS Minifier\""; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hasparql-client" = callPackage ({ mkDerivation, base, HTTP, monads-fd, network, xml }: mkDerivation { @@ -84060,11 +85199,12 @@ self: { "hasql" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras - , data-default-class, dlist, either, hashable, hashtables, loch-th - , mtl, placeholders, postgresql-binary, postgresql-libpq - , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase - , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, text, time, transformers, uuid, vector + , criterion, data-default-class, deepseq, dlist, either, hashable + , hashtables, loch-th, mtl, placeholders, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector }: mkDerivation { pname = "hasql"; @@ -84081,6 +85221,11 @@ self: { data-default-class QuickCheck quickcheck-instances rebase rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + benchmarkHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + criterion data-default-class deepseq dlist either hashable + profunctors scientific text time transformers uuid vector + ]; homepage = "https://github.com/nikita-volkov/hasql"; description = "An efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; @@ -84246,11 +85391,13 @@ self: { "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring - , directory, doctest, either, filepath, free, hashable, hashtables - , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude - , old-locale, placeholders, postgresql-binary, postgresql-libpq - , QuickCheck, quickcheck-instances, scientific, template-haskell - , text, time, transformers, uuid, vector + , criterion-plus, deepseq, directory, doctest, either, filepath + , free, hashable, hashtables, hasql, hasql-backend, HDBC + , HDBC-postgresql, hspec, list-t, loch-th, mmorph, monad-control + , mtl-prelude, old-locale, placeholders, postgresql-binary + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, uuid, vector }: mkDerivation { pname = "hasql-postgres"; @@ -84268,6 +85415,11 @@ self: { old-locale postgresql-binary QuickCheck quickcheck-instances scientific text time vector ]; + benchmarkHaskellDepends = [ + base-prelude criterion-plus deepseq either hasql hasql-backend HDBC + HDBC-postgresql list-t monad-control mtl-prelude postgresql-simple + QuickCheck quickcheck-instances scientific text time vector + ]; homepage = "https://github.com/nikita-volkov/hasql-postgres"; description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = stdenv.lib.licenses.mit; @@ -84396,6 +85548,8 @@ self: { version = "0.5.5.1"; sha256 = "c93d1dce0f0024ecae56019b1c7a5b68ca37cf32ba7a8ee7b2f248981af4865c"; configureFlags = [ "-fportable" ]; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 directory filepath ghc ghc-paths ghc-prim monads-tf network network-uri @@ -84563,10 +85717,10 @@ self: { "hats" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , conduit, conduit-extra, connection, deepseq, HUnit, network - , network-uri, process, QuickCheck, random, stm, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers, unordered-containers + , conduit, conduit-extra, connection, criterion, deepseq, HUnit + , network, network-uri, process, QuickCheck, random, stm + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers, unordered-containers }: mkDerivation { pname = "hats"; @@ -84584,6 +85738,9 @@ self: { aeson attoparsec base bytestring HUnit process QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + benchmarkHaskellDepends = [ + async attoparsec base bytestring criterion random stm + ]; homepage = "https://github.com/kosmoskatten/hats"; description = "Haskell client for the NATS messaging system"; license = stdenv.lib.licenses.mit; @@ -85623,8 +86780,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.0.2"; - sha256 = "bcaf93d7febb8f04540010b2b0a244030bda1d5002b7cc158bbd05ba5acc9172"; + version = "0.5.1.0"; + sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85687,8 +86844,8 @@ self: { }) {}; "hdr-histogram" = callPackage - ({ mkDerivation, base, deepseq, hspec, primitive, QuickCheck - , random, tagged, vector, vector-algorithms + ({ mkDerivation, base, criterion, deepseq, hspec, primitive + , QuickCheck, random, tagged, vector, vector-algorithms }: mkDerivation { pname = "hdr-histogram"; @@ -85700,6 +86857,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck random tagged vector vector-algorithms ]; + benchmarkHaskellDepends = [ base criterion deepseq primitive ]; homepage = "http://github.com/joshbohde/hdr-histogram#readme"; description = "Haskell implementation of High Dynamic Range (HDR) Histograms"; license = stdenv.lib.licenses.gpl3; @@ -85839,6 +86997,7 @@ self: { async base bytestring HUnit mtl slave-thread stm test-framework test-framework-hunit text time ]; + benchmarkHaskellDepends = [ base mtl time ]; homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; @@ -85994,12 +87153,12 @@ self: { "heist" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder - , blaze-html, bytestring, containers, directory, directory-tree - , dlist, filepath, hashable, HUnit, lens, lifted-base, map-syntax - , monad-control, mtl, process, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, transformers-base, unordered-containers, vector - , xmlhtml + , blaze-html, bytestring, containers, criterion, directory + , directory-tree, dlist, filepath, hashable, HUnit, lens + , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck + , random, statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unordered-containers, vector, xmlhtml }: mkDerivation { pname = "heist"; @@ -86021,6 +87180,13 @@ self: { test-framework-quickcheck2 text time transformers transformers-base unordered-containers vector xmlhtml ]; + benchmarkHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers criterion directory directory-tree dlist filepath + hashable HUnit lifted-base map-syntax monad-control mtl process + random statistics test-framework test-framework-hunit text time + transformers transformers-base unordered-containers vector xmlhtml + ]; homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; @@ -86091,6 +87257,8 @@ self: { sha256 = "4cbc6fe323dd997d17b7c3724ec229d78209796133611af3379c7e5ab320721a"; revision = "1"; editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring bytestring-show data-default-class time unix ]; @@ -86112,6 +87280,8 @@ self: { pname = "helics-wai"; version = "0.5.1"; sha256 = "61ac00d92870d2c5cb86fb15bcea21a0522bf12665f35b5c2a300ca7094d2b83"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring data-default-class helics vault wai ]; @@ -86359,8 +87529,8 @@ self: { "hemokit" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cairo - , cipher-aes, conduit, deepseq, deepseq-generics, gtk, hidapi - , hspec, HUnit, mtl, network-simple, optparse-applicative + , cipher-aes, conduit, criterion, deepseq, deepseq-generics, gtk + , hidapi, hspec, HUnit, mtl, network-simple, optparse-applicative , pretty-show, robot, split, svgcairo, text, time, transformers , vector, vector-fftw, websockets }: @@ -86381,6 +87551,7 @@ self: { transformers vector vector-fftw websockets ]; testHaskellDepends = [ base bytestring hspec HUnit vector ]; + benchmarkHaskellDepends = [ base conduit criterion mtl ]; homepage = "https://github.com/nh2/hemokit"; description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; @@ -86727,8 +87898,8 @@ self: { }) {}; "hetero-dict" = callPackage - ({ mkDerivation, aeson, base, primitive, template-haskell, text - , unordered-containers + ({ mkDerivation, aeson, base, criterion, deepseq, hvect, primitive + , template-haskell, text, unordered-containers, vinyl }: mkDerivation { pname = "hetero-dict"; @@ -86737,6 +87908,9 @@ self: { libraryHaskellDepends = [ aeson base primitive template-haskell text unordered-containers ]; + benchmarkHaskellDepends = [ + base criterion deepseq hvect template-haskell vinyl + ]; description = "Fast heterogeneous data structures"; license = stdenv.lib.licenses.mit; }) {}; @@ -87092,9 +88266,12 @@ self: { pname = "hfann"; version = "0.4.2"; sha256 = "5a25fc2af7f99f1ba0d25394f7f98c657c24aa5d9a193bfdce71981f3311f926"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ doublefann ]; libraryPkgconfigDepends = [ fann ]; + executableSystemDepends = [ doublefann ]; description = "Haskell binding to the FANN library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -87402,16 +88579,18 @@ self: { "hgeometry" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, containers - , contravariant, data-clist, deepseq, directory, doctest - , fixed-vector, Frames, hexpat, hspec, lens, linear, mtl - , optparse-applicative, parsec, QuickCheck, random, semigroupoids - , semigroups, singletons, template-haskell, text, time, vector - , vinyl + , contravariant, criterion, data-clist, deepseq, deepseq-generics + , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens + , linear, mtl, optparse-applicative, parsec, QuickCheck, random + , semigroupoids, semigroups, singletons, template-haskell, text + , time, vector, vinyl }: mkDerivation { pname = "hgeometry"; version = "0.6.0.0"; sha256 = "328e0e4438b729084b301b22f31d9f880157a5b317eacc48ddcf585d685bf0de"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bifunctors bytestring containers contravariant data-clist deepseq directory fixed-vector Frames hexpat lens linear mtl @@ -87422,6 +88601,10 @@ self: { array base bytestring containers data-clist doctest Frames hspec lens linear QuickCheck random semigroups vector vinyl ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics Frames lens QuickCheck + semigroups + ]; homepage = "https://fstaals.net/software/hgeometry"; description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; @@ -87571,6 +88754,8 @@ self: { pname = "hgrib"; version = "0.3.1.0"; sha256 = "d3e0d4b1088934c230c566458e327b535733de602aa96ca68fc9236b65e3d73b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ grib_api ]; libraryToolDepends = [ c2hs ]; @@ -87887,7 +89072,8 @@ self: { }) {}; "highjson" = callPackage - ({ mkDerivation, aeson, base, hspec, hvect, lens, QuickCheck, text + ({ mkDerivation, aeson, base, bytestring, criterion, deepseq, hspec + , hvect, lens, QuickCheck, text }: mkDerivation { pname = "highjson"; @@ -87895,6 +89081,9 @@ self: { sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962"; libraryHaskellDepends = [ aeson base hvect lens text ]; testHaskellDepends = [ aeson base hspec lens QuickCheck text ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq text + ]; homepage = "https://github.com/agrafix/highjson"; description = "Spec based JSON parsing/serialisation"; license = stdenv.lib.licenses.mit; @@ -87965,6 +89154,8 @@ self: { pname = "highlighter"; version = "0.2.2"; sha256 = "3d88a570d7e682cab28652ebc585a790a9e061c5be1d998573e23dd19e0d68f4"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blaze-html bytestring filepath mtl pcre-light text ]; @@ -87980,6 +89171,8 @@ self: { pname = "highlighter2"; version = "0.2.5"; sha256 = "917718f0633c61184c5f768a817002bb8c8138759c846d245e1ea62862ffcdbe"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blaze-html bytestring containers filepath mtl pcre-light text ]; @@ -87997,6 +89190,8 @@ self: { version = "0.6.4"; sha256 = "d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf"; configureFlags = [ "-fpcre-light" ]; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blaze-html bytestring containers mtl parsec pcre-light utf8-string @@ -88094,10 +89289,10 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, descriptive - , Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec - , monad-loops, mtl, path, path-io, text, transformers, unix-compat - , utf8-string, yaml + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , descriptive, Diff, directory, exceptions, ghc-prim + , haskell-src-exts, hspec, monad-loops, mtl, path, path-io, text + , transformers, unix-compat, utf8-string, yaml }: mkDerivation { pname = "hindent"; @@ -88118,6 +89313,10 @@ self: { base bytestring deepseq Diff directory exceptions haskell-src-exts hspec monad-loops mtl utf8-string ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq directory exceptions ghc-prim + haskell-src-exts utf8-string + ]; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -88374,8 +89573,9 @@ self: { "hip" = callPackage ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour - , deepseq, directory, filepath, hspec, JuicyPixels, netpbm - , primitive, process, QuickCheck, repa, temporary, vector + , criterion, deepseq, directory, filepath, hspec, JuicyPixels + , netpbm, primitive, process, QuickCheck, repa, repa-algorithms + , temporary, vector }: mkDerivation { pname = "hip"; @@ -88386,6 +89586,9 @@ self: { filepath JuicyPixels netpbm primitive process repa temporary vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq repa repa-algorithms + ]; homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; @@ -88642,12 +89845,15 @@ self: { }) {}; "histogram-fill" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, primitive, vector }: + ({ mkDerivation, base, criterion, deepseq, ghc-prim, mwc-random + , primitive, vector + }: mkDerivation { pname = "histogram-fill"; version = "0.8.5.0"; sha256 = "fbdd167d6f27c0d88f9aa8647ae95a313101c63a827275ac8d016d6028975133"; libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; homepage = "https://github.com/Shimuuar/histogram-fill/"; description = "Library for histograms creation"; license = stdenv.lib.licenses.bsd3; @@ -88705,6 +89911,8 @@ self: { pname = "hit"; version = "0.6.3"; sha256 = "db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base byteable bytestring containers cryptohash hourglass mtl parsec patience random system-fileio system-filepath @@ -88897,6 +90105,8 @@ self: { pname = "hlatex"; version = "0.3.1"; sha256 = "1ea8a1097244818b694afd3f71aa2e56e8873b3019d3dcc973885be491a28d8e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base-unicode-symbols containers derive directory filepath mtl process template-haskell transformers uniplate utf8-string @@ -88973,12 +90183,12 @@ self: { "hledger" = callPackage ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers - , csv, data-default, directory, file-embed, filepath, hashable - , haskeline, hledger-lib, HUnit, megaparsec, mtl, mtl-compat - , old-time, parsec, pretty-show, process, regex-tdfa, safe - , shakespeare, split, tabular, temporary, terminfo, test-framework - , test-framework-hunit, text, time, transformers - , unordered-containers, utf8-string, wizards + , criterion, csv, data-default, directory, file-embed, filepath + , hashable, haskeline, hledger-lib, html, HUnit, megaparsec, mtl + , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa + , safe, shakespeare, split, tabular, temporary, terminfo + , test-framework, test-framework-hunit, text, time, timeit + , transformers, unordered-containers, utf8-string, wizards }: mkDerivation { pname = "hledger"; @@ -89010,6 +90220,10 @@ self: { test-framework-hunit text time unordered-containers utf8-string wizards ]; + benchmarkHaskellDepends = [ + base base-compat criterion directory file-embed filepath + hledger-lib html pretty-show process tabular temporary time timeit + ]; homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; license = "GPL"; @@ -89414,6 +90628,8 @@ self: { sha256 = "8370a8e6d386a8342d9c4a683b3c085890ee092e95549737ccf26b4fc62fba8d"; revision = "1"; editedCabalFile = "5375f1b11a455cfd90aeedf16499c79fc541857e7c73d4bdb41a704f2a561283"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base stm transformers unix X11 ]; homepage = "https://github.com/hpdeifel/hlwm-haskell"; description = "Bindings to the herbstluftwm window manager"; @@ -89579,6 +90795,8 @@ self: { pname = "hmatrix-nipals"; version = "0.2"; sha256 = "322bdf452889dbaeccca42e28afb3ebd85bf594da754cdee2a1f43121dbfd529"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hmatrix ]; homepage = "http://github.com/alanfalloon/hmatrix-nipals"; description = "NIPALS method for Principal Components Analysis on large data-sets"; @@ -89643,13 +90861,16 @@ self: { }) {}; "hmatrix-svdlibc" = callPackage - ({ mkDerivation, base, hmatrix, hspec, QuickCheck, vector }: + ({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck + , vector + }: mkDerivation { pname = "hmatrix-svdlibc"; version = "0.4.0"; sha256 = "774504e862542f90441701122638c4ce11aa94792d270045eb0f0997e6f874a2"; libraryHaskellDepends = [ base hmatrix vector ]; testHaskellDepends = [ base hmatrix hspec QuickCheck vector ]; + benchmarkHaskellDepends = [ base criterion hmatrix vector ]; homepage = "http://github.com/bgamari/hmatrix-svdlibc"; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; @@ -89684,6 +90905,7 @@ self: { base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random ]; testHaskellDepends = [ base HUnit QuickCheck random ]; + benchmarkHaskellDepends = [ base HUnit QuickCheck random ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; @@ -89947,9 +91169,10 @@ self: { }) {inherit (pkgs) netcdf;}; "hnix" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix - , deepseq, deriving-compat, parsers, semigroups, tasty, tasty-hunit - , tasty-th, text, transformers, trifecta, unordered-containers + ({ mkDerivation, ansi-wl-pprint, base, containers, criterion + , data-fix, deepseq, deriving-compat, parsers, semigroups, tasty + , tasty-hunit, tasty-th, text, transformers, trifecta + , unordered-containers }: mkDerivation { pname = "hnix"; @@ -89967,6 +91190,7 @@ self: { testHaskellDepends = [ base containers data-fix tasty tasty-hunit tasty-th text ]; + benchmarkHaskellDepends = [ base containers criterion text ]; homepage = "http://github.com/jwiegley/hnix"; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; @@ -90045,6 +91269,8 @@ self: { pname = "hoauth2"; version = "0.5.7"; sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types text unordered-containers @@ -90062,6 +91288,8 @@ self: { pname = "hoauth2"; version = "0.5.8"; sha256 = "caacec1259455de9d1cb78c38fe8ca4dabc901e5b9fd8a9e7d17eaca0a820e60"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types text unordered-containers @@ -91006,8 +92234,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.3.0"; - sha256 = "e6663e8654fe93daa5a4628219eea03e2b6f31d7894a9f7c4180f43f92921d8f"; + version = "0.3.1"; + sha256 = "be94bd36afde578e202b39f865a9f342acc97367bfaf942b49cd2bd19aee9b96"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -91023,8 +92251,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.3.1"; - sha256 = "162598c04c1e977b666c491dfb34451c43c08354427d9ed806b81169d6dd9c80"; + version = "0.3.2"; + sha256 = "eaf41f874e0d26720c374430798e77e2f334de7936b313546b2293bb9c3767eb"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -91164,8 +92392,8 @@ self: { }) {}; "hosc" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring - , data-binary-ieee754, network, QuickCheck, test-framework + ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion + , data-binary-ieee754, deepseq, network, QuickCheck, test-framework , test-framework-quickcheck2, time, transformers }: mkDerivation { @@ -91180,6 +92408,7 @@ self: { base bytestring QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; homepage = "http://rd.slavepianos.org/t/hosc"; description = "Haskell Open Sound Control"; license = "GPL"; @@ -91298,8 +92527,8 @@ self: { }) {}; "hourglass" = callPackage - ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit - , tasty-quickcheck, time + ({ mkDerivation, base, bytestring, criterion, deepseq, mtl + , old-locale, tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "hourglass"; @@ -91309,6 +92538,9 @@ self: { testHaskellDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq mtl old-locale time + ]; homepage = "https://github.com/vincenthz/hs-hourglass"; description = "simple performant time related library"; license = stdenv.lib.licenses.bsd3; @@ -91756,8 +92988,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.8.0.6"; - sha256 = "3e46024f61f4dda52e5edafa3bbcab1d2dfe7f5f68a32c6f8480cecfd864cb94"; + version = "0.8.0.7"; + sha256 = "a003f549f3d7b44c87980fc31cdf5083c7cfd8ad651d5e4cd56448d67a8ee630"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91967,6 +93199,8 @@ self: { pname = "hps"; version = "0.15"; sha256 = "30df792e10ce0a2d2886ce5b6b081e95640cc00d02d9f2aa6426e7919eccb54e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hcg-minus ]; homepage = "http://rd.slavepianos.org/?t=hps"; description = "Haskell Postscript"; @@ -92222,8 +93456,8 @@ self: { }) {}; "hs-blake2" = callPackage - ({ mkDerivation, base, bytestring, bytestring-arbitrary, libb2 - , QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion + , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "hs-blake2"; @@ -92236,6 +93470,8 @@ self: { tasty-quickcheck ]; testSystemDepends = [ libb2 ]; + benchmarkHaskellDepends = [ base bytestring criterion cryptohash ]; + benchmarkSystemDepends = [ libb2 ]; homepage = "https://github.com/tsuraan/hs-blake2"; description = "A cryptohash-inspired library for blake2"; license = stdenv.lib.licenses.bsd3; @@ -92754,8 +93990,9 @@ self: { }) {}; "hs2048" = callPackage - ({ mkDerivation, base, doctest, Glob, hlint, hspec, HUnit, process - , QuickCheck, random, regex-compat + ({ mkDerivation, base, criterion, doctest, Glob, hastache, hlint + , hspec, HUnit, process, QuickCheck, random, regex-compat + , statistics }: mkDerivation { pname = "hs2048"; @@ -92769,6 +94006,9 @@ self: { base doctest Glob hlint hspec HUnit process QuickCheck random regex-compat ]; + benchmarkHaskellDepends = [ + base criterion hastache random statistics + ]; homepage = "https://github.com/tfausak/hs2048"; description = "A 2048 clone in Haskell"; license = stdenv.lib.licenses.mit; @@ -93223,6 +94463,8 @@ self: { pname = "hsc3-process"; version = "0.10.0"; sha256 = "ace3a309858541f5ec377403391d71176653601bcac3fa69adfa9576a74ae6c0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hosc hsc3 process time time-compat transformers @@ -93273,6 +94515,8 @@ self: { pname = "hsc3-server"; version = "0.10.0"; sha256 = "57bcb588adc0cabc5114919c32c240be63de704545b4803ac44e447364059c02"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bitset bytestring containers data-default failure hashtables hosc hsc3 hsc3-process lifted-base ListZipper monad-control @@ -93556,10 +94800,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.2.1.0"; - sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794"; - revision = "1"; - editedCabalFile = "2ed64491515bb9af5b43ee11a203925987797d5492a3c143a37ad6eae8a7c8f6"; + version = "0.2.2.0"; + sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93622,6 +94864,8 @@ self: { pname = "hsdns"; version = "1.7"; sha256 = "48960ac9e1f0d1e338170aac35f6fd7e064a3b36314894f4a968113385205cd3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers network ]; librarySystemDepends = [ adns ]; homepage = "http://github.com/peti/hsdns"; @@ -94497,8 +95741,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.4.1"; - sha256 = "c6d29aea545769b116e14ca7ca2c64d7e18649fc792adb98623b119d3a80f6da"; + version = "2.4.2"; + sha256 = "48b7e342c0990ae38373acbb7cac5a2ef9b1bb2cca8bdf41a896f1593e677484"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -94565,8 +95809,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.4.1"; - sha256 = "b2ea5b6a37542fa138060085ee7bf82ab0ab130f2c287a57ae05a4f83ae437da"; + version = "2.4.2"; + sha256 = "393ba143901824579b736fb4313c7e07e57eda45580e657bf24d1b1c32c0a318"; libraryHaskellDepends = [ ansi-terminal array async base call-stack deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -94587,8 +95831,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.4.1"; - sha256 = "e0670831f06a8924779cc81d4eb706b35d3a7176cba6bee5df506de961e8d5f3"; + version = "2.4.2"; + sha256 = "8c9ad7bc21eabcc28526e8fd8e12927c0d659c9b3179e665c30b175fa5011d2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -95884,6 +97128,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; + "htaglib_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , taglib, text, transformers + }: + mkDerivation { + pname = "htaglib"; + version = "1.1.0"; + sha256 = "e2d2c9df136823d4c88f5e6f2c8053a713e326ec2b0de9e0e00410997c99ff00"; + libraryHaskellDepends = [ base bytestring text transformers ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ base directory filepath hspec ]; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) taglib;}; + "htags" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src, mtl }: mkDerivation { @@ -96009,7 +97270,7 @@ self: { }) {}; "html-email-validate" = callPackage - ({ mkDerivation, attoparsec, base, hspec, QuickCheck + ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck , regex-pcre-builtin, text }: mkDerivation { @@ -96020,6 +97281,7 @@ self: { testHaskellDepends = [ attoparsec base hspec QuickCheck regex-pcre-builtin text ]; + benchmarkHaskellDepends = [ base criterion text ]; description = "Validating an email address against HTML standard"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -96068,12 +97330,17 @@ self: { }) {}; "html-parse" = callPackage - ({ mkDerivation, attoparsec, base, deepseq, text }: + ({ mkDerivation, attoparsec, base, criterion, deepseq, tagsoup + , text + }: mkDerivation { pname = "html-parse"; version = "0.2.0.0"; sha256 = "9c9f8401dc86ea3a9612bfc0d430a03b7e9130183f0b8dc1fa100cd0bbb84a92"; libraryHaskellDepends = [ attoparsec base deepseq text ]; + benchmarkHaskellDepends = [ + attoparsec base criterion deepseq tagsoup text + ]; homepage = "http://github.com/bgamari/html-parse"; description = "A high-performance HTML tokenizer"; license = stdenv.lib.licenses.bsd3; @@ -96147,12 +97414,15 @@ self: { }) {}; "html5-entity" = callPackage - ({ mkDerivation, base, containers, text }: + ({ mkDerivation, base, containers, criterion, text }: mkDerivation { pname = "html5-entity"; version = "0.2.0.3"; sha256 = "2e067939e2c7d1a204ee219651f6c31205eed3ff6f43e0852ffc5bd5a1feb52e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers text ]; + benchmarkHaskellDepends = [ base containers criterion ]; homepage = "https://github.com/zudov/html5-entity/"; description = "A library for looking up and validating HTML5 entities"; license = stdenv.lib.licenses.bsd3; @@ -96186,9 +97456,9 @@ self: { }) {}; "htoml" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, file-embed - , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time - , unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , file-embed, old-locale, parsec, tasty, tasty-hspec, tasty-hunit + , text, time, unordered-containers, vector }: mkDerivation { pname = "htoml"; @@ -96202,6 +97472,10 @@ self: { aeson base bytestring containers file-embed parsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; + benchmarkHaskellDepends = [ + aeson base containers criterion parsec text time + unordered-containers vector + ]; homepage = "https://github.com/cies/htoml"; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; @@ -96355,8 +97629,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.5"; - sha256 = "d1fdda6035e0bab95d3294f5175ac8c3629f9cd1d32e1bce5d0aa27226751c85"; + version = "0.5.6.1"; + sha256 = "2c304337b88ea48cf4b1c4e4ac12ec48c5f3a241f3ab44a57965c1d9d06a2bed"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -96375,36 +97649,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_6" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, mime-types, monad-control, network, network-uri - , random, streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.5.6"; - sha256 = "514271d83fff7169a493111105e77ea93d11b562effa840c47117a3db912216a"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types mime-types network network-uri random - streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -96539,19 +97783,21 @@ self: { "http-client-tls" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection - , cryptonite, data-default-class, exceptions, hspec, http-client - , http-types, memory, network, tls, transformers + , containers, criterion, cryptonite, data-default-class, exceptions + , hspec, http-client, http-types, memory, network, network-uri + , text, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.3.1"; - sha256 = "56317378785688a129fdc7abdf5d721fe15e46178f89f457878aa3acd1ac7d12"; + version = "0.3.4"; + sha256 = "37693b0ebcfa6ce796abf39647ff4df17361ab1ab1f999ac10faba67d3042bc1"; libraryHaskellDepends = [ - base bytestring case-insensitive connection cryptonite + base bytestring case-insensitive connection containers cryptonite data-default-class exceptions http-client http-types memory network - tls transformers + network-uri text tls transformers ]; testHaskellDepends = [ base hspec http-client http-types ]; + benchmarkHaskellDepends = [ base criterion http-client ]; doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; @@ -96586,8 +97832,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.3"; - sha256 = "eee51e80fe76b3bf4b4041545f452e126e0593f70a0623a5a35ee47d72fe0dc3"; + version = "2.2.3.1"; + sha256 = "53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -96718,6 +97964,8 @@ self: { pname = "http-enumerator"; version = "0.7.3.3"; sha256 = "463f4a7086ee9226ad882ddeb51d5086b237204ef2e0780e1c544eb2debd8283"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ asn1-data attoparsec attoparsec-enumerator base base64-bytestring blaze-builder blaze-builder-enumerator bytestring case-insensitive @@ -96731,6 +97979,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-grammar" = callPackage + ({ mkDerivation, attoparsec, base, bytestring }: + mkDerivation { + pname = "http-grammar"; + version = "0.1.0.0"; + sha256 = "47d093d24dacfda6880b2f920768323bd292fdebc70ad24d90eb2977b81d07f4"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + homepage = "https://github.com/owensmurray/http-grammar"; + description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules"; + license = stdenv.lib.licenses.asl20; + }) {}; + "http-kinder" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, http-media, http-types, HUnit, QuickCheck, singletons @@ -96775,8 +98035,9 @@ self: { "http-link-header" = callPackage ({ mkDerivation, attoparsec, base, bytestring - , bytestring-conversion, errors, hspec, hspec-attoparsec - , http-api-data, network-uri, QuickCheck, text + , bytestring-conversion, criterion, directory, errors, hspec + , hspec-attoparsec, http-api-data, network-uri, QuickCheck, text + , transformers }: mkDerivation { pname = "http-link-header"; @@ -96789,6 +98050,9 @@ self: { testHaskellDepends = [ base hspec hspec-attoparsec QuickCheck text ]; + benchmarkHaskellDepends = [ + base criterion directory network-uri text transformers + ]; homepage = "https://github.com/myfreeweb/http-link-header"; description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; license = stdenv.lib.licenses.publicDomain; @@ -96841,6 +98105,8 @@ self: { pname = "http-monad"; version = "0.1.1.1"; sha256 = "ad3ea0bc4a95cf66b442d69084f99906e79bcd431ae1c0eb0237fb1ee7276355"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers explicit-exception HTTP lazyio network network-uri parsec transformers utility-ht @@ -97041,6 +98307,8 @@ self: { pname = "http-shed"; version = "0.1"; sha256 = "bb31968733cbe9d369c651b166f1ecbac9d325c371a9b2fd9723f79953224b2b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base network ]; description = "A simple websever with an interact style API"; license = stdenv.lib.licenses.bsd3; @@ -97156,14 +98424,17 @@ self: { "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , bytestring-builder, case-insensitive, containers, directory - , doctest, filepath, Glob, hex, hspec, psqueues, stm, text - , unordered-containers, vector, word8 + , bytestring-builder, case-insensitive, containers, criterion + , directory, doctest, filepath, Glob, hashtables, heaps, hex, hspec + , mwc-random, psqueues, stm, text, unordered-containers, vector + , word8 }: mkDerivation { pname = "http2"; version = "1.6.3"; sha256 = "61620eca0f57875a6a9bd24f9cc04c301b5c3c668bf98f85e9989aad5d069c43"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring bytestring-builder case-insensitive containers psqueues stm @@ -97173,6 +98444,10 @@ self: { case-insensitive containers directory doctest filepath Glob hex hspec psqueues stm text unordered-containers vector word8 ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion + hashtables heaps mwc-random psqueues stm + ]; homepage = "https://github.com/kazu-yamamoto/http2"; description = "HTTP/2 library including frames, priority queues and HPACK"; license = stdenv.lib.licenses.bsd3; @@ -97184,6 +98459,8 @@ self: { pname = "httpd-shed"; version = "0.4.0.3"; sha256 = "b0ff87d81e61f788d3920d952e4469d984742ba49c006df086c159886bf09218"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base network network-uri ]; description = "A simple web-server with an interact style API"; license = stdenv.lib.licenses.bsd3; @@ -97425,13 +98702,14 @@ self: { }) {}; "human-readable-duration" = callPackage - ({ mkDerivation, base, doctest, Glob }: + ({ mkDerivation, base, criterion, doctest, Glob }: mkDerivation { pname = "human-readable-duration"; version = "0.2.0.3"; sha256 = "93f3a91a2994588728ae757dcca5104e18a570b3591773aa7f03c524c97599da"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/yogsototh/human-readable-duration#readme"; description = "Provide duration helper"; license = stdenv.lib.licenses.bsd3; @@ -97496,6 +98774,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_0_4_0_0" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit, random }: + mkDerivation { + pname = "hunit-dejafu"; + version = "0.4.0.0"; + sha256 = "70c53e26261d0075807635c135ead2a8b96a5fec004e9f50ee9043ead136e216"; + libraryHaskellDepends = [ base dejafu exceptions HUnit random ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -97825,8 +99116,8 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-excess, hw-prim - , hw-rankselect-base, QuickCheck, vector + ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess + , hw-prim, hw-rankselect-base, QuickCheck, vector }: mkDerivation { pname = "hw-balancedparens"; @@ -97838,6 +99129,9 @@ self: { testHaskellDepends = [ base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector ]; + benchmarkHaskellDepends = [ + base criterion hw-bits hw-prim vector + ]; homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; @@ -97845,8 +99139,8 @@ self: { }) {}; "hw-bits" = callPackage - ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim - , hw-string-parse, QuickCheck, safe, vector + ({ mkDerivation, base, bytestring, criterion, hspec, hw-int + , hw-prim, hw-string-parse, QuickCheck, safe, vector }: mkDerivation { pname = "hw-bits"; @@ -97858,6 +99152,7 @@ self: { testHaskellDepends = [ base bytestring hspec hw-prim QuickCheck vector ]; + benchmarkHaskellDepends = [ base criterion hw-prim vector ]; homepage = "http://github.com/haskell-works/hw-bits#readme"; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; @@ -97866,7 +99161,7 @@ self: { "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , hw-bits, resourcet, word8 + , hw-bits, mmap, resourcet, vector, word8 }: mkDerivation { pname = "hw-conduit"; @@ -97879,6 +99174,9 @@ self: { ]; executableHaskellDepends = [ base criterion ]; testHaskellDepends = [ base bytestring hspec ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mmap vector + ]; homepage = "http://github.com/haskell-works/hw-conduit#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.mit; @@ -97981,6 +99279,11 @@ self: { hw-rankselect-base mmap parsec QuickCheck resourcet transformers vector ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion hw-balancedparens hw-bits + hw-conduit hw-prim hw-rankselect hw-rankselect-base mmap resourcet + vector + ]; homepage = "http://github.com/haskell-works/hw-json#readme"; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; @@ -97989,11 +99292,11 @@ self: { "hw-json-lens" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, conduit, containers, dlist, hspec, hw-balancedparens - , hw-bits, hw-conduit, hw-diagnostics, hw-json, hw-parser, hw-prim - , hw-rankselect, lens, mmap, mono-traversable, parsec, QuickCheck - , resourcet, scientific, text, transformers, unordered-containers - , vector, word8 + , bytestring, conduit, containers, criterion, dlist, hspec + , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-json + , hw-parser, hw-prim, hw-rankselect, lens, mmap, mono-traversable + , parsec, QuickCheck, resourcet, scientific, text, transformers + , unordered-containers, vector, word8 }: mkDerivation { pname = "hw-json-lens"; @@ -98011,6 +99314,11 @@ self: { lens mmap parsec QuickCheck resourcet scientific transformers unordered-containers vector ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion hw-bits hw-conduit hw-prim + hw-rankselect lens mmap resourcet scientific unordered-containers + vector + ]; homepage = "http://github.com/haskell-works/hw-json-lens#readme"; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; @@ -98024,8 +99332,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "1.1.1"; - sha256 = "be1ae93a00f627052a5f6c2d87bf26b531d59c737d69db6d0717cf0ef1b03402"; + version = "1.1.2"; + sha256 = "d96a9cfb09a10a1c4526a9a910f7212692c36c138bf5594468a5699f6f0ebb78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98158,7 +99466,7 @@ self: { }) {}; "hw-rankselect-base" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-prim + ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim , hw-string-parse, QuickCheck, safe, vector }: mkDerivation { @@ -98171,6 +99479,9 @@ self: { testHaskellDepends = [ base hspec hw-bits hw-prim QuickCheck vector ]; + benchmarkHaskellDepends = [ + base criterion hw-bits hw-prim vector + ]; homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; @@ -98256,6 +99567,10 @@ self: { hw-rankselect-base mmap parsec QuickCheck resourcet transformers vector ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion hw-balancedparens hw-bits + hw-conduit hw-prim hw-rankselect mmap resourcet vector + ]; homepage = "http://github.com/haskell-works/hw-xml#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; @@ -98282,8 +99597,8 @@ self: { }) {}; "hweblib" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, HUnit - , mtl, text, transformers + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, HUnit, mtl, text, transformers }: mkDerivation { pname = "hweblib"; @@ -98295,6 +99610,10 @@ self: { testHaskellDepends = [ attoparsec base bytestring containers HUnit mtl transformers ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring containers criterion HUnit mtl + transformers + ]; homepage = "http://github.com/aycanirican/hweblib"; description = "Haskell Web Library"; license = stdenv.lib.licenses.bsd3; @@ -98363,8 +99682,8 @@ self: { }) {}; "hwsl2" = callPackage - ({ mkDerivation, base, bytestring, quickcheck-properties, tasty - , tasty-quickcheck + ({ mkDerivation, base, bytestring, Cabal, criterion, cryptohash + , parallel, quickcheck-properties, tasty, tasty-quickcheck }: mkDerivation { pname = "hwsl2"; @@ -98374,6 +99693,9 @@ self: { testHaskellDepends = [ base bytestring quickcheck-properties tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring Cabal criterion cryptohash parallel + ]; homepage = "https://github.com/srijs/hwsl2"; description = "Hashing with SL2"; license = stdenv.lib.licenses.mit; @@ -98536,6 +99858,8 @@ self: { pname = "hxt-css"; version = "0.1.0.3"; sha256 = "0244fc145d5923df0522ad80949e9b221b01a028c755ebfc4740339881ef65b7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hxt parsec split ]; homepage = "https://github.com/redneb/hxt-css"; description = "CSS selectors for HXT"; @@ -98628,8 +99952,8 @@ self: { }) {}; "hxt-regex-xmlschema" = callPackage - ({ mkDerivation, base, bytestring, HUnit, hxt-charproperties - , parsec, text + ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit + , hxt-charproperties, parsec, text }: mkDerivation { pname = "hxt-regex-xmlschema"; @@ -98639,6 +99963,9 @@ self: { base bytestring hxt-charproperties parsec text ]; testHaskellDepends = [ base bytestring HUnit parsec text ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq parsec text + ]; homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; description = "A regular expression library for W3C XML Schema regular expressions"; license = stdenv.lib.licenses.mit; @@ -99736,22 +101063,28 @@ self: { }) {}; "identicon" = callPackage - ({ mkDerivation, base, bytestring, hspec, JuicyPixels }: + ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels + , random, tf-random + }: mkDerivation { pname = "identicon"; version = "0.2.0"; sha256 = "c9d22c41893f50ac6c096c11ac037f91153cd3b324c76bcbdd3277b2761cb346"; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ base bytestring hspec JuicyPixels ]; + benchmarkHaskellDepends = [ + base bytestring criterion JuicyPixels random tf-random + ]; homepage = "https://github.com/mrkkrp/identicon"; description = "Flexible generation of identicons"; license = stdenv.lib.licenses.bsd3; }) {}; "identifiers" = callPackage - ({ mkDerivation, base, binary, cereal, containers, deepseq - , hashable, ListLike, QuickCheck, test-framework - , test-framework-quickcheck2, text, unordered-containers + ({ mkDerivation, base, binary, bytestring, cereal, containers + , criterion, deepseq, hashable, ListLike, QuickCheck + , test-framework, test-framework-quickcheck2, text + , unordered-containers }: mkDerivation { pname = "identifiers"; @@ -99764,6 +101097,9 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base binary bytestring cereal criterion deepseq text + ]; description = "Numeric identifiers for values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -100376,13 +101712,17 @@ self: { }) {}; "ilist" = callPackage - ({ mkDerivation, base, hspec, transformers }: + ({ mkDerivation, base, criterion, hspec, lens, transformers, vector + }: mkDerivation { pname = "ilist"; version = "0.2.0.0"; sha256 = "ffbfab4804e01a4b36caa3f75d77535084d6165ed6c92c0df4329b9238e03cef"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec transformers ]; + benchmarkHaskellDepends = [ + base criterion lens transformers vector + ]; homepage = "http://github.com/aelve/ilist"; description = "Optimised list functions for doing index-related things"; license = stdenv.lib.licenses.bsd3; @@ -100445,10 +101785,13 @@ self: { pname = "imagemagick"; version = "0.0.4.2"; sha256 = "1956fd48139c43e73528c358021595c1b867abb6fba8bc0334770f74d4089178"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring filepath resourcet text transformers vector ]; libraryPkgconfigDepends = [ imagemagick ]; + executablePkgconfigDepends = [ imagemagick ]; testHaskellDepends = [ base bytestring directory filepath lifted-base QuickCheck resourcet tasty tasty-hunit text transformers vector @@ -100712,8 +102055,8 @@ self: { ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg , bytestring, containers, criterion, deepseq, directory, download , filepath, hspec, JuicyPixels, monads-tf, mtl, NumInstances - , optparse-applicative, parallel, parsec, silently, snap-core - , snap-server, storable-endian, text, transformers + , optparse-applicative, parallel, parsec, random, silently + , snap-core, snap-server, storable-endian, text, transformers , unordered-containers, vector-space }: mkDerivation { @@ -100735,6 +102078,7 @@ self: { storable-endian text transformers vector-space ]; testHaskellDepends = [ base containers hspec mtl parsec ]; + benchmarkHaskellDepends = [ base criterion parsec random ]; homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable"; description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; license = stdenv.lib.licenses.agpl3; @@ -100878,7 +102222,9 @@ self: { }) {}; "include-file" = callPackage - ({ mkDerivation, base, bytestring, random, template-haskell }: + ({ mkDerivation, base, bytestring, criterion, random + , template-haskell + }: mkDerivation { pname = "include-file"; version = "0.1.0.3"; @@ -100887,13 +102233,15 @@ self: { base bytestring random template-haskell ]; testHaskellDepends = [ base bytestring ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; }) {}; "incremental-computing" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers - , dlist, fingertree, order-maintenance, QuickCheck, transformers + , deepseq, dlist, fingertree, order-maintenance, QuickCheck + , transformers }: mkDerivation { pname = "incremental-computing"; @@ -100905,6 +102253,7 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck containers QuickCheck ]; + benchmarkHaskellDepends = [ base containers deepseq QuickCheck ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing"; description = "Incremental computing"; license = stdenv.lib.licenses.bsd3; @@ -100912,8 +102261,9 @@ self: { }) {}; "incremental-maps" = callPackage - ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers - , dlist, fingertree, order-maintenance, QuickCheck, transformers + ({ mkDerivation, aeson, base, Cabal, cabal-test-quickcheck + , containers, criterion, deepseq, deepseq-generics, dlist + , fingertree, order-maintenance, QuickCheck, transformers }: mkDerivation { pname = "incremental-maps"; @@ -100925,14 +102275,18 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck containers QuickCheck ]; + benchmarkHaskellDepends = [ + aeson base containers criterion deepseq deepseq-generics dlist + QuickCheck + ]; description = "Package for doing incremental computations on maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-parser" = callPackage - ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck - , tasty, tasty-quickcheck + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text }: mkDerivation { pname = "incremental-parser"; @@ -100942,6 +102296,9 @@ self: { testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; @@ -101046,6 +102403,8 @@ self: { pname = "indentparser"; version = "0.1"; sha256 = "5c1dd6eeeb8fb5e136528df6ffb7c0041e708b63f0bcd4e55fa297d960fd2b90"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mtl parsec ]; homepage = "http://www.cse.iitk.ac.in/users/ppk/code/HASKELL/indentparser"; description = "A parser for indentation based structures"; @@ -101128,6 +102487,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indextype" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "indextype"; + version = "0.1.0.0"; + sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498"; + revision = "1"; + editedCabalFile = "382507ce3407fd6b5c60eee31675c52dc3bdc192dc4132f7c6e7047021fa0ef2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "A series of type families and constraints for \"indexable\" types"; + license = stdenv.lib.licenses.mit; + }) {}; + "indian-language-font-converter" = callPackage ({ mkDerivation, base, gtk, HDBC, HDBC-sqlite3 }: mkDerivation { @@ -101140,13 +102513,16 @@ self: { }) {}; "indices" = callPackage - ({ mkDerivation, base, QuickCheck, tagged, template-haskell }: + ({ mkDerivation, base, criterion, deepseq, QuickCheck, tagged + , template-haskell + }: mkDerivation { pname = "indices"; version = "1.7.1"; sha256 = "8505d262f5ae056e83be32084d93bb1472194c4c4d2b8e442fb3c5845f02c6eb"; libraryHaskellDepends = [ base tagged template-haskell ]; testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Multi-dimensional statically bounded indices"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -101318,6 +102694,8 @@ self: { pname = "influxdb"; version = "0.10.0"; sha256 = "063754458bbceb4a89e70c26a979f47e2c632a0ccaf93b53360870d44c5268bb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers data-default-class dlist exceptions http-client mtl network-uri retry scientific @@ -101443,19 +102821,23 @@ self: { "inline-c" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring - , containers, cryptohash, directory, filepath, hashable, hspec, mtl - , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix - , template-haskell, transformers, unordered-containers, vector + , containers, cryptohash, directory, filepath, gsl, gslcblas + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, template-haskell, transformers, unordered-containers + , vector }: mkDerivation { pname = "inline-c"; version = "0.5.6.1"; sha256 = "2daf717e6fc0046ccb6563557825fe26fcdc327c55b9771aa7b4c51473e6eb4e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring containers cryptohash directory filepath hashable mtl parsec parsers QuickCheck template-haskell transformers unordered-containers vector ]; + executableSystemDepends = [ gsl gslcblas ]; testHaskellDepends = [ ansi-wl-pprint base containers hashable hspec parsers QuickCheck raw-strings-qq regex-posix template-haskell transformers @@ -101463,7 +102845,7 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - }) {}; + }) {inherit (pkgs) gsl; gslcblas = null;}; "inline-c-cpp" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: @@ -101518,14 +102900,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "inline-java_0_6_2" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , directory, distributed-closure, filepath, ghc-heap-view, hspec + , inline-c, jni, jvm, language-java, process, singletons, syb + , template-haskell, temporary, text, thread-local-storage, vector + }: + mkDerivation { + pname = "inline-java"; + version = "0.6.2"; + sha256 = "9c162f26c77d1030f0f5054394265aab7fded1c83df67b3ea8fe7e4bb68aa8c5"; + libraryHaskellDepends = [ + base binary bytestring Cabal containers directory + distributed-closure filepath ghc-heap-view inline-c jni jvm + language-java process singletons syb template-haskell temporary + text thread-local-storage vector + ]; + testHaskellDepends = [ + base bytestring hspec jni jvm singletons text + ]; + homepage = "http://github.com/tweag/inline-java#readme"; + description = "Java interop via inline Java code in Haskell modules"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, c2hs, containers - , data-default-class, deepseq, directory, exceptions, filepath - , ieee754, mtl, pretty, primitive, process, quickcheck-assertions - , R, reflection, setenv, silently, singletons, strict, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, th-lift - , th-orphans, transformers, unix, vector + , criterion, data-default-class, deepseq, directory, exceptions + , filepath, ieee754, mtl, pretty, primitive, process + , quickcheck-assertions, R, reflection, setenv, silently + , singletons, strict, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-lift, th-orphans, transformers, unix, vector }: mkDerivation { pname = "inline-r"; @@ -101545,6 +102952,10 @@ self: { tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck template-haskell temporary text unix vector ]; + benchmarkHaskellDepends = [ + base criterion filepath primitive process singletons + template-haskell vector + ]; homepage = "https://tweag.github.io/HaskellR"; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; @@ -102128,6 +103539,8 @@ self: { pname = "interpolation"; version = "0.1"; sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ array base containers QuickCheck utility-ht @@ -102338,18 +103751,17 @@ self: { }) {}; "invertible" = callPackage - ({ mkDerivation, arrows, base, haskell-src-meta, HList, invariant - , lens, partial-isomorphisms, Piso, QuickCheck, semigroupoids - , template-haskell, transformers, TypeCompose + ({ mkDerivation, base, haskell-src-meta, invariant, lens + , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell + , transformers, TypeCompose }: mkDerivation { pname = "invertible"; - version = "0.2.0"; - sha256 = "3da08f518924925a547e954821eb96f15b4ecf47d541fa5770d38180963db19e"; + version = "0.2.0.2"; + sha256 = "eee1b66f20190b5cc87122e22c664422df4188b38f81e896e8381bf2f58385a8"; libraryHaskellDepends = [ - arrows base haskell-src-meta HList invariant lens - partial-isomorphisms Piso semigroupoids template-haskell - transformers TypeCompose + base haskell-src-meta invariant lens partial-isomorphisms + semigroupoids template-haskell transformers TypeCompose ]; testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; @@ -102651,16 +104063,14 @@ self: { }) {}; "ip" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, doctest - , hashable, HUnit, primitive, QuickCheck, test-framework + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, HUnit, primitive, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text, vector }: mkDerivation { pname = "ip"; - version = "0.8.7"; - sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690"; - revision = "2"; - editedCabalFile = "121a83393fc17cfc59aee069015fcfd0a6f6d33e14314cb6688fed05396aafb6"; + version = "0.9"; + sha256 = "19f99c1b673f9ca924a78888fb22ae2d534b0165653c3bdd3f8332ac7ca26a0e"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -102668,6 +104078,9 @@ self: { attoparsec base bytestring doctest HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; homepage = "https://github.com/andrewthad/haskell-ip#readme"; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; @@ -102776,6 +104189,8 @@ self: { pname = "ipopt-hs"; version = "0.5.1.0"; sha256 = "aaf193c06daed43998d4d37f7916d8c1bb73b61e01815755eff61bd2c472344a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ad ansi-wl-pprint base containers lens mtl template-haskell uu-parsinglib vector vector-space @@ -102872,6 +104287,8 @@ self: { pname = "ipython-kernel"; version = "0.8.4.0"; sha256 = "ac4c822836d5b2cecf7ac4c61fe32ed876b09d18bcbe44760a6096bcd7338264"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal containers directory filepath mtl process SHA temporary text transformers unordered-containers uuid @@ -103346,14 +104763,14 @@ self: { }) {}; "isobmff-builder" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default, hspec, mtl - , pretty-types, QuickCheck, singletons, tagged, template-haskell - , text, time, type-list, type-spec, vector + ({ mkDerivation, base, binary, bytestring, criterion, data-default + , hspec, mtl, pretty-types, QuickCheck, singletons, tagged + , template-haskell, text, time, type-list, type-spec, vector }: mkDerivation { pname = "isobmff-builder"; - version = "0.11.2.0"; - sha256 = "062397e266687379d99ebe4acb7dd21b6289df1fdad079c3fef7d9ec45b1d220"; + version = "0.11.3.0"; + sha256 = "578e440f473427c7e413075de294830118a49e8043c8be75a6db9c158c5c7f42"; libraryHaskellDepends = [ base bytestring data-default mtl pretty-types singletons tagged template-haskell text time type-list type-spec vector @@ -103362,6 +104779,9 @@ self: { base binary bytestring hspec mtl pretty-types QuickCheck tagged text type-spec ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion tagged type-spec + ]; homepage = "https://github.com/sheyll/isobmff-builder#readme"; description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; license = stdenv.lib.licenses.bsd3; @@ -103392,12 +104812,14 @@ self: { }: mkDerivation { pname = "isotope"; - version = "0.1.0.0"; - sha256 = "8b63da859be3cbf3eaabcdf123563feeb2479b2edbb98acee1632b8322b5bc78"; + version = "0.3.3.0"; + sha256 = "e08fac7483c11f37786f5f98f6f7d1e58a456d1470c3f0f35bc9326e88c1fa2e"; libraryHaskellDepends = [ base containers megaparsec template-haskell th-lift ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; + testHaskellDepends = [ + base containers hspec megaparsec QuickCheck + ]; homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md"; description = "Isotopic masses and relative abundances"; license = stdenv.lib.licenses.gpl3; @@ -103516,10 +104938,10 @@ self: { }) {}; "iteratee" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, HUnit - , ListLike, monad-control, mtl, parallel, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers, transformers-base, unix + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, HUnit, ListLike, monad-control, mtl, parallel + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-base, unix }: mkDerivation { pname = "iteratee"; @@ -103536,6 +104958,10 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 transformers transformers-base unix ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq exceptions ListLike monad-control + mtl transformers transformers-base unix + ]; homepage = "http://www.tiresiaspress.us/haskell/iteratee"; description = "Iteratee-based I/O"; license = stdenv.lib.licenses.bsd3; @@ -103563,6 +104989,8 @@ self: { pname = "iteratee-mtl"; version = "0.5.0.0"; sha256 = "008a7dfc38986daf8b164472dd739b8185b5564246858450d093b04753056e28"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers ListLike MonadCatchIO-mtl mtl unix ]; @@ -104010,6 +105438,8 @@ self: { pname = "jack"; version = "0.7.1.1"; sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring enumset event-list explicit-exception midi non-negative transformers @@ -104093,13 +105523,14 @@ self: { }) {}; "jalaali" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, time }: mkDerivation { pname = "jalaali"; version = "0.2.0"; sha256 = "a01e8ade25f87e0c20c946b77be3a446e7ffa2870b601b001931ae837ef6b908"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base deepseq time ]; homepage = "https://github.com/jalaali/jalaali-hs"; description = "Convert Jalaali and Gregorian calendar systems to each other"; license = stdenv.lib.licenses.mit; @@ -104510,6 +105941,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) jdk;}; + "jni_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, choice, containers, cpphs + , inline-c, jdk, singletons, thread-local-storage + }: + mkDerivation { + pname = "jni"; + version = "0.3.0"; + sha256 = "1d92d232180f5ebcb4e6017febc5f7b5320ccc49bcbc3787c62eb94195a60e08"; + libraryHaskellDepends = [ + base bytestring choice containers inline-c singletons + thread-local-storage + ]; + librarySystemDepends = [ jdk ]; + libraryToolDepends = [ cpphs ]; + homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; + description = "Complete JNI raw bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) jdk;}; + "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, fast-logger, HDBC @@ -104628,8 +106079,8 @@ self: { "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , containers, cryptonite, doctest, either, hspec, HUnit, memory - , mtl, QuickCheck, text, time, unordered-containers, vector + , containers, criterion, cryptonite, doctest, either, hspec, HUnit + , memory, mtl, QuickCheck, text, time, unordered-containers, vector }: mkDerivation { pname = "jose-jwt"; @@ -104643,6 +106094,7 @@ self: { aeson base bytestring cryptonite doctest either hspec HUnit memory mtl QuickCheck text unordered-containers vector ]; + benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; @@ -105041,6 +106493,7 @@ self: { libraryHaskellDepends = [ base base-prelude bytestring scientific semigroups text ]; + benchmarkHaskellDepends = [ base-prelude bytestring text ]; homepage = "https://github.com/nikita-volkov/json-bytes-builder"; description = "Direct-to-bytes JSON Builder"; license = stdenv.lib.licenses.mit; @@ -105280,6 +106733,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "5349f5c0b0fa8f6c5433152d6effc10846cfb3480e78c5aa99adb7540bcff49c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring json-rpc-server mtl text unordered-containers vector vector-algorithms @@ -105324,6 +106779,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "169e9997734bd1d7d07a13b5ae0223d5363c43de93b0d5fbb845a598f9eaccf5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring deepseq mtl text unordered-containers vector ]; @@ -105709,8 +107166,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.15"; - sha256 = "4ff1279e9f4d54c605a22792f411d4b84324337b454449a0cd4c7c009abb2269"; + version = "0.2.16"; + sha256 = "5eac14b5102b5be904142843977560cddf4829182637e059cd09e7a384b7052f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105797,6 +107254,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jvm_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, distributed-closure + , hspec, jni, singletons, text, vector + }: + mkDerivation { + pname = "jvm"; + version = "0.2.0"; + sha256 = "f766db5293100de25605f883170d4869fcca7b99e1ae2b2d418cdb92eca7ccce"; + libraryHaskellDepends = [ + base bytestring distributed-closure jni singletons text vector + ]; + testHaskellDepends = [ base bytestring hspec text ]; + benchmarkHaskellDepends = [ base criterion jni ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; + description = "Call JVM methods from Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jvm-parser" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-binary-ieee754, fgl, fingertree, pretty, zlib @@ -105833,6 +107309,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jvm-streaming_0_2" = callPackage + ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni + , jvm, singletons, streaming + }: + mkDerivation { + pname = "jvm-streaming"; + version = "0.2"; + sha256 = "2251efe0192d36845ac852357a6af923950f7e9cb007900c40cc6a1d116c30bb"; + libraryHaskellDepends = [ + base distributed-closure inline-java jni jvm singletons streaming + ]; + testHaskellDepends = [ base hspec inline-java jvm streaming ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; + description = "Expose Java iterators as streams from the streaming package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jwt" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite , data-default, doctest, http-types, HUnit, lens, lens-aeson @@ -105905,20 +107399,20 @@ self: { }) {}; "kafka-device" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cereal, milena - , mtl + ({ mkDerivation, aeson, base, binary, bytestring, cereal, linear + , milena, mtl }: mkDerivation { pname = "kafka-device"; - version = "0.1.5.0"; - sha256 = "e43b2e3ed49285745bf3dde7b870f61b87dc4f5ef8fdc31bda56c5ee22c18004"; + version = "0.2.1.2"; + sha256 = "281d1155594a4a4f44c71042e41c5151f10370d3a96a6159ae9a42c60898463b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring cereal milena mtl + aeson base binary bytestring cereal linear milena mtl ]; executableHaskellDepends = [ - aeson base binary bytestring cereal milena mtl + aeson base binary bytestring cereal linear milena mtl ]; homepage = "https://bitbucket.org/functionally/kafka-device"; description = "UI device events via a Kafka message broker"; @@ -105927,17 +107421,15 @@ self: { }) {}; "kafka-device-glut" = callPackage - ({ mkDerivation, base, GLUT, kafka-device, milena, OpenGL }: + ({ mkDerivation, base, GLUT, kafka-device, OpenGL }: mkDerivation { pname = "kafka-device-glut"; - version = "0.1.3.0"; - sha256 = "c06c42b23f1fcec14fad72e690b2360942e56a6b5d3f7d7496c379dd22887f8f"; + version = "0.2.1.2"; + sha256 = "69a4fbd1015b765ab5e0ef7d81a9bd6db578545b7f69cfd96681c8052b87c146"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base GLUT kafka-device milena OpenGL ]; - executableHaskellDepends = [ - base GLUT kafka-device milena OpenGL - ]; + libraryHaskellDepends = [ base GLUT kafka-device OpenGL ]; + executableHaskellDepends = [ base GLUT kafka-device OpenGL ]; homepage = "https://bitbucket.org/functionally/kafka-device-glut"; description = "GLUT events via a Kafka message broker"; license = stdenv.lib.licenses.mit; @@ -105946,19 +107438,19 @@ self: { "kafka-device-joystick" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal - , kafka-device, milena + , kafka-device, yaml }: mkDerivation { pname = "kafka-device-joystick"; - version = "0.1.5.0"; - sha256 = "ec7cdb06a7ddc8aa54238cf3b762721ce81ff22021daa16f559abf75350798cd"; + version = "0.2.1.2"; + sha256 = "e07acdef7bc09038d20b5b6ab4a228fcd41877e00fde257d41014a4197c4f49e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring cereal kafka-device milena + aeson base binary bytestring cereal kafka-device ]; executableHaskellDepends = [ - aeson base binary bytestring cereal kafka-device milena + aeson base binary bytestring cereal kafka-device yaml ]; homepage = "https://bitbucket.org/functionally/kafka-device-joystick"; description = "Linux joystick events via a Kafka message broker"; @@ -105967,20 +107459,18 @@ self: { }) {}; "kafka-device-leap" = callPackage - ({ mkDerivation, aeson, base, hleap, kafka-device, milena - , websockets - }: + ({ mkDerivation, aeson, base, hleap, kafka-device, websockets }: mkDerivation { pname = "kafka-device-leap"; - version = "0.1.3.0"; - sha256 = "d9440f6991d230caed95c81940569c77d7911616c2d598a8cb5e770e41cada3a"; + version = "0.2.1.2"; + sha256 = "c16b2c2ea6d79354bef02ace9f86c44e2627bb5de8506935715618a2b81f9693"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base hleap kafka-device milena websockets + aeson base hleap kafka-device websockets ]; executableHaskellDepends = [ - aeson base hleap kafka-device milena websockets + aeson base hleap kafka-device websockets ]; homepage = "https://bitbucket.org/functionally/kafka-device-leap"; description = "Leap Motion events via a Kafka message broker"; @@ -105990,19 +107480,19 @@ self: { "kafka-device-spacenav" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal - , kafka-device, milena + , kafka-device, yaml }: mkDerivation { pname = "kafka-device-spacenav"; - version = "0.1.5.0"; - sha256 = "c501b38ef88ac3d8e870f6ce698a299508cbabb2088c472c8163bcca5d53cf7d"; + version = "0.2.1.2"; + sha256 = "39f0acf5ad9b6d4f4b53724080c7467aeadb6d93f76691143ec1599a1d713737"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring cereal kafka-device milena + aeson base binary bytestring cereal kafka-device ]; executableHaskellDepends = [ - aeson base binary bytestring cereal kafka-device milena + aeson base binary bytestring cereal kafka-device yaml ]; homepage = "https://bitbucket.org/functionally/kafka-device-spacenav"; description = "Linux SpaceNavigator events via a Kafka message broker"; @@ -106011,15 +107501,15 @@ self: { }) {}; "kafka-device-vrpn" = callPackage - ({ mkDerivation, base, kafka-device, milena, vrpn }: + ({ mkDerivation, base, kafka-device, vrpn }: mkDerivation { pname = "kafka-device-vrpn"; - version = "0.1.5.0"; - sha256 = "27df692620b7fbd293520108c236406cad95aed665c4807afc15d8efc9c006bb"; + version = "0.2.1.2"; + sha256 = "9adcd43ec1851ac26083c629b07744d12150dd6dbb13f2a468d904dbb6f3b17e"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base kafka-device milena vrpn ]; - executableHaskellDepends = [ base kafka-device milena vrpn ]; + libraryHaskellDepends = [ base kafka-device vrpn ]; + executableHaskellDepends = [ base kafka-device vrpn ]; homepage = "https://bitbucket.org/functionally/kafka-device-vrpn"; description = "VRPN events via a Kafka message broker"; license = stdenv.lib.licenses.mit; @@ -106146,6 +107636,8 @@ self: { pname = "kansas-lava"; version = "0.2.4.4"; sha256 = "ed44a01f95c72580c3e198ea43f42a582ec44bbdc8897629fe37f874208f6c5d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cmdargs containers data-default data-reify directory dotgen filepath netlist netlist-to-vhdl process random @@ -106165,6 +107657,8 @@ self: { pname = "kansas-lava-cores"; version = "0.1.2.2"; sha256 = "15502f0da60b224fc6b5a6fed21c2507c34ddbdbc51377736c3bc254186ad01c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring data-default directory filepath kansas-lava network sized-types @@ -106241,11 +107735,12 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, auto-update, base, bytestring, containers - , directory, either, exceptions, hostname, microlens, microlens-th - , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa - , resourcet, semigroups, string-conv, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text, time + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , exceptions, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , semigroups, string-conv, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, time , time-locale-compat, transformers, transformers-base , transformers-compat, unix, unordered-containers }: @@ -106265,6 +107760,10 @@ self: { regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck template-haskell text time time-locale-compat unordered-containers ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq text time + transformers unix + ]; homepage = "https://github.com/Soostone/katip"; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; @@ -106273,10 +107772,11 @@ self: { "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, containers - , enclosed-exceptions, exceptions, http-client, http-types, katip - , lens, lens-aeson, quickcheck-instances, retry, scientific, stm - , stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector + , criterion, deepseq, enclosed-exceptions, exceptions, http-client + , http-types, katip, lens, lens-aeson, quickcheck-instances, retry + , rng-utils, scientific, stm, stm-chans, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uuid, vector }: mkDerivation { pname = "katip-elasticsearch"; @@ -106292,6 +107792,10 @@ self: { lens-aeson quickcheck-instances scientific stm tasty tasty-hunit tasty-quickcheck text time transformers unordered-containers vector ]; + benchmarkHaskellDepends = [ + aeson base bloodhound criterion deepseq rng-utils text + unordered-containers uuid + ]; description = "ElasticSearch scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -106371,9 +107875,9 @@ self: { }) {}; "kazura-queue" = callPackage - ({ mkDerivation, async, atomic-primops, base, containers, deepseq - , doctest, exceptions, free, hspec, hspec-expectations, HUnit, mtl - , primitive, QuickCheck, transformers + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , deepseq, doctest, exceptions, free, hspec, hspec-expectations + , HUnit, mtl, primitive, QuickCheck, stm, transformers }: mkDerivation { pname = "kazura-queue"; @@ -106386,6 +107890,7 @@ self: { async base containers deepseq doctest exceptions free hspec hspec-expectations HUnit mtl QuickCheck transformers ]; + benchmarkHaskellDepends = [ async base containers criterion stm ]; homepage = "http://github.com/asakamirai/kazura-queue"; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; @@ -106461,7 +107966,8 @@ self: { }) {}; "kdt" = callPackage - ({ mkDerivation, base, deepseq, deepseq-generics, heap, QuickCheck + ({ mkDerivation, base, criterion, deepseq, deepseq-generics, heap + , mersenne-random-pure64, MonadRandom, QuickCheck }: mkDerivation { pname = "kdt"; @@ -106469,6 +107975,10 @@ self: { sha256 = "bc0f8f9ac0cb01466273171f47b627abe170d1130bd59657fb9198b4f9479f9a"; libraryHaskellDepends = [ base deepseq deepseq-generics heap ]; testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics heap mersenne-random-pure64 + MonadRandom QuickCheck + ]; homepage = "https://github.com/giogadi/kdt"; description = "Fast and flexible k-d trees for various types of point queries"; license = stdenv.lib.licenses.mit; @@ -106933,6 +108443,8 @@ self: { pname = "keyring"; version = "0.1.0.5"; sha256 = "9565c1b08e1b5b4a11d4f3df30fe053893c6228dc79f3766602837074a2901f8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base udbus ]; homepage = "https://github.com/lunaryorn/haskell-keyring"; description = "Keyring access"; @@ -107217,8 +108729,9 @@ self: { }) {}; "kmeans-par" = callPackage - ({ mkDerivation, base, hspec, metric, normaldistribution, parallel - , QuickCheck, semigroups, vector + ({ mkDerivation, base, criterion, deepseq, hspec, metric + , normaldistribution, parallel, QuickCheck, random, semigroups + , vector }: mkDerivation { pname = "kmeans-par"; @@ -107229,13 +108742,17 @@ self: { base hspec metric normaldistribution parallel QuickCheck semigroups vector ]; + benchmarkHaskellDepends = [ + base criterion deepseq metric normaldistribution random vector + ]; description = "Sequential and parallel implementations of Lloyd's algorithm"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kmeans-vector" = callPackage - ({ mkDerivation, base, mtl, probable, vector }: + ({ mkDerivation, base, criterion, mtl, probable, QuickCheck, vector + }: mkDerivation { pname = "kmeans-vector"; version = "0.3.2"; @@ -107244,6 +108761,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base mtl vector ]; executableHaskellDepends = [ base probable vector ]; + benchmarkHaskellDepends = [ base criterion QuickCheck vector ]; homepage = "http://github.com/alpmestan/kmeans-vector"; description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = stdenv.lib.licenses.bsd3; @@ -107467,7 +108985,7 @@ self: { }) {}; "krpc" = callPackage - ({ mkDerivation, base, bencoding, bytestring, containers + ({ mkDerivation, base, bencoding, bytestring, containers, criterion , data-default-class, hspec, lifted-base, monad-control , monad-logger, mtl, network, QuickCheck, quickcheck-instances , text, transformers @@ -107484,6 +109002,9 @@ self: { base bencoding bytestring hspec monad-logger mtl network QuickCheck quickcheck-instances ]; + benchmarkHaskellDepends = [ + base bytestring criterion monad-logger mtl + ]; homepage = "https://github.com/cobit/krpc"; description = "KRPC protocol implementation"; license = stdenv.lib.licenses.bsd3; @@ -107743,6 +109264,8 @@ self: { pname = "laika"; version = "0.1.3.1"; sha256 = "a1873cd1fb75cc1ff45cca4565cf950ce25fa63bb4d15231349131f07fd63e2f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers @@ -108009,26 +109532,26 @@ self: { "lambdabot-haskell-plugins" = callPackage ({ mkDerivation, array, arrows, base, bytestring, containers - , data-memocombinators, directory, filepath, haskell-src-exts - , hoogle, HTTP, IOSpec, lambdabot-core, lambdabot-reference-plugins - , lambdabot-trusted, lifted-base, logict, MonadRandom, mtl, mueval - , network, numbers, oeis, parsec, pretty, process, QuickCheck - , regex-tdfa, show, split, syb, transformers, utf8-string - , vector-space + , data-memocombinators, directory, filepath + , haskell-src-exts-simple, hoogle, HTTP, IOSpec, lambdabot-core + , lambdabot-reference-plugins, lambdabot-trusted, lifted-base + , logict, MonadRandom, mtl, mueval, network, numbers, oeis, parsec + , pretty, process, QuickCheck, regex-tdfa, show, split, syb + , transformers, utf8-string, vector-space }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1"; - sha256 = "7fe68b97aec6f62e5694bda236b73e30a94fbf45a6a9a6b5c0f1b12398cfaef7"; + version = "5.1.0.1"; + sha256 = "fccf7635ec1074196695b424261fb243a2b6b71e25110131fbad13278cc6b3da"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators - directory filepath haskell-src-exts hoogle HTTP IOSpec + directory filepath haskell-src-exts-simple hoogle HTTP IOSpec lambdabot-core lambdabot-reference-plugins lambdabot-trusted lifted-base logict MonadRandom mtl mueval network numbers oeis parsec pretty process QuickCheck regex-tdfa show split syb transformers utf8-string vector-space ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; }) {}; @@ -108357,6 +109880,8 @@ self: { pname = "lambdacube-gl"; version = "0.5.2.3"; sha256 = "be33bde75e5753c134cba7dd2e98e8f31870bd0bfb3787659a3cf357c677dd2b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms @@ -108481,14 +110006,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lame" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, directory + , exceptions, filepath, hspec, htaglib, mp3lame, temporary, text + , transformers, wave + }: + mkDerivation { + pname = "lame"; + version = "0.1.0"; + sha256 = "af72ca85baee296af9577c307f263e9590841063903b7feaaae164fd50692e4c"; + libraryHaskellDepends = [ + base bytestring data-default-class directory exceptions filepath + text transformers wave + ]; + librarySystemDepends = [ mp3lame ]; + testHaskellDepends = [ + base data-default-class directory filepath hspec htaglib temporary + text + ]; + homepage = "https://github.com/mrkkrp/lame"; + description = "Fairly complete high-level binding to LAME encoder"; + license = stdenv.lib.licenses.bsd3; + }) {mp3lame = null;}; + "lame-tester" = callPackage ({ mkDerivation, base, bifunctors, containers, semigroups, tasty , tasty-hunit, validation }: mkDerivation { pname = "lame-tester"; - version = "1.2"; - sha256 = "de04042967c5d7879ce46ba7d77cd315e71f2f151432121139cbc1a3108147f1"; + version = "1.2.1"; + sha256 = "f13129313c8c0fe5757e5ff62ba9a326f19724568dd9e311c341df21633512a6"; libraryHaskellDepends = [ base bifunctors containers semigroups validation ]; @@ -108505,6 +110053,8 @@ self: { pname = "language-asn1"; version = "0.5"; sha256 = "e3fef756ed6c53c0e9d5058291071ca804f47a418ad0cada816bb440c3c45191"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base parsec syb ]; homepage = "http://patch-tag.com/r/adept/language-asn1"; description = "Parsing of ASN1 definitions"; @@ -108573,6 +110123,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_6" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , directory, filepath, happy, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.6"; + sha256 = "5699cd7d386ae5a583d703bbc1c83b46faa618f3e53ff7fe9a97f6c7acb36be6"; + libraryHaskellDepends = [ + array base bytestring containers directory filepath pretty process + syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + homepage = "http://visq.github.io/language-c/"; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -108651,6 +110221,8 @@ self: { pname = "language-conf"; version = "0.2.2.0"; sha256 = "f7413ee42c06fb62b47965e2aa1a03355e609177c5d2590d9d129ec0c2a8a39a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base deepseq directory filepath megaparsec pretty scientific semigroups text unordered-containers vector @@ -108699,6 +110271,8 @@ self: { pname = "language-dockerfile"; version = "0.3.5.0"; sha256 = "9667fd70217ebf229369fbaf906bf74926a8ef1651fd965862c47082d09342e5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring free mtl parsec pretty ShellCheck split template-haskell th-lift th-lift-instances transformers @@ -108872,9 +110446,9 @@ self: { }) {}; "language-hcl" = callPackage - ({ mkDerivation, base, deepseq, directory, filepath, hspec - , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific - , semigroups, text, transformers, unordered-containers + ({ mkDerivation, base, criterion, deepseq, directory, filepath + , hspec, hspec-megaparsec, megaparsec, pretty, QuickCheck + , scientific, semigroups, text, transformers, unordered-containers }: mkDerivation { pname = "language-hcl"; @@ -108888,6 +110462,9 @@ self: { base directory filepath hspec hspec-megaparsec megaparsec pretty QuickCheck semigroups text transformers ]; + benchmarkHaskellDepends = [ + base criterion directory filepath text + ]; homepage = "https://github.com/beijaflor-io/haskell-language-hcl#readme"; description = "HCL parsers and pretty-printers for the Haskell programming language"; license = stdenv.lib.licenses.mit; @@ -108979,9 +110556,9 @@ self: { }) {}; "language-lua" = callPackage - ({ mkDerivation, alex, array, base, bytestring, deepseq, directory - , filepath, happy, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , text + ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq + , directory, filepath, happy, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "language-lua"; @@ -108993,6 +110570,9 @@ self: { base bytestring deepseq directory filepath QuickCheck tasty tasty-hunit tasty-quickcheck text ]; + benchmarkHaskellDepends = [ + base criterion directory filepath text + ]; homepage = "http://github.com/glguy/language-lua"; description = "Lua parser and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -109026,6 +110606,8 @@ self: { pname = "language-lua2"; version = "0.1.0.5"; sha256 = "4f24d7b015dbe1c7e9d1ead835ce426223531b8b6f408ee97b3d18904424393d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers Earley lexer-applicative microlens regex-applicative semigroups srcloc transformers @@ -109177,6 +110759,50 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; + "language-puppet_1_3_6" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, either, exceptions, filecache, formatting + , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec + , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec + , memory, mtl, operational, optparse-applicative, parallel-io + , parsec, pcre-utils, process, random, regex-pcre-builtin + , scientific, semigroups, servant, servant-client, split, stm + , strict-base-types, temporary, text, time, transformers, unix + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.3.6"; + sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory either exceptions + filecache formatting hashable hruby hslogger hspec http-api-data + http-client lens lens-aeson megaparsec memory mtl operational + parsec pcre-utils process random regex-pcre-builtin scientific + semigroups servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers Glob hslogger http-client lens + megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin + servant-client strict-base-types text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens + megaparsec mtl scientific strict-base-types temporary text + transformers unix unordered-containers vector + ]; + homepage = "http://lpuppet.banquise.net/"; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -109376,10 +111002,11 @@ self: { }) {}; "large-hashable" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytes, bytestring - , containers, hashable, HTF, QuickCheck, scientific, strict - , template-haskell, text, time, transformers, unordered-containers - , utf8-light, vector, void + ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes + , bytestring, cereal, containers, cryptohash, deepseq, hashable + , HTF, QuickCheck, safecopy, scientific, strict, template-haskell + , text, time, transformers, unordered-containers, utf8-light + , vector, void }: mkDerivation { pname = "large-hashable"; @@ -109394,6 +111021,10 @@ self: { aeson base bytes bytestring containers hashable HTF QuickCheck scientific strict text time unordered-containers vector ]; + benchmarkHaskellDepends = [ + base base16-bytestring byteable bytes bytestring cereal cryptohash + deepseq safecopy text transformers + ]; homepage = "https://github.com/factisresearch/large-hashable"; description = "Efficiently hash (large) Haskell values"; license = stdenv.lib.licenses.bsd3; @@ -109742,6 +111373,8 @@ self: { pname = "lazyio"; version = "0.1.0.4"; sha256 = "8b54f0bccdc1c836393ce667ea0f1ad069d52c04762e61fad633d4d44916cf6c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base transformers unsafe ]; homepage = "http://www.haskell.org/haskellwiki/Lazy_IO"; description = "Run IO actions lazily while respecting their order"; @@ -109749,13 +111382,18 @@ self: { }) {}; "lazyset" = callPackage - ({ mkDerivation, base, containers, data-ordlist, HUnit }: + ({ mkDerivation, base, containers, data-ordlist, HUnit, time + , timeit + }: mkDerivation { pname = "lazyset"; version = "0.1.0.0"; sha256 = "9e62ccd181117484c63920b8dfb8d385d23119e11595ab2aa045b272c55f4bad"; libraryHaskellDepends = [ base containers data-ordlist ]; testHaskellDepends = [ base containers data-ordlist HUnit ]; + benchmarkHaskellDepends = [ + base containers data-ordlist time timeit + ]; homepage = "https://github.com/happyherp/lazyset"; description = "Set and Map from lazy/infinite lists"; license = stdenv.lib.licenses.mit; @@ -110296,7 +111934,7 @@ self: { "lens" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , comonad, containers, contravariant, deepseq, directory + , comonad, containers, contravariant, criterion, deepseq, directory , distributive, doctest, exceptions, filepath, free , generic-deriving, ghc-prim, hashable, hlint, HUnit , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck @@ -110325,6 +111963,10 @@ self: { test-framework-quickcheck2 test-framework-th text transformers unordered-containers vector ]; + benchmarkHaskellDepends = [ + base bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd3; @@ -110464,6 +112106,8 @@ self: { pname = "lens-regex"; version = "0.1.0"; sha256 = "4954b3ae395661e916c536bfe837c42a1cd8223ea81ffd86b1fdd9b6abfc5142"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base lens regex-base template-haskell ]; @@ -110677,6 +112321,8 @@ self: { pname = "leveldb-haskell"; version = "0.6.4"; sha256 = "25a8f9c2cdd5a32423389173a6323bd804689f69aee1082c57887ea74ead1b04"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring data-default exceptions filepath resourcet transformers @@ -110700,6 +112346,8 @@ self: { pname = "leveldb-haskell-fork"; version = "0.3.4.4"; sha256 = "589935f658b432546ba3e82f1473c55365a2a3fd01e3751faa93f3c2a79f2c08"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring data-default filepath resourcet transformers ]; @@ -110733,6 +112381,8 @@ self: { pname = "levmar-chart"; version = "0.2"; sha256 = "5271f6dadec35b22d6fd00900992c819d2e7a7daa7e53016c9f19879a3684973"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base Chart colour data-accessor levmar ]; description = "Plots the results of the Levenberg-Marquardt algorithm in a chart"; license = stdenv.lib.licenses.bsd3; @@ -110839,7 +112489,7 @@ self: { version = "0.10"; sha256 = "23b3cd7479108864b5a167b3fd1b1f58bf49b1773f590c68c766dcd4a999a0f4"; isLibrary = false; - isExecutable = false; + isExecutable = true; homepage = "http://lhc.seize.it/"; description = "LHC Haskell Compiler"; license = stdenv.lib.licenses.publicDomain; @@ -111108,8 +112758,8 @@ self: { }: mkDerivation { pname = "libjenkins"; - version = "0.8.3"; - sha256 = "939379ae30f65d20d524d5735d6b6ec86b91ce295c64e089b1097161da1067cc"; + version = "0.8.4"; + sha256 = "e7602fc1312661a8305e3ddb84b365cf520c74b9afbd4c5b741e05ab8fb71123"; libraryHaskellDepends = [ async attoparsec base bytestring conduit containers free http-client http-conduit http-types monad-control mtl network @@ -111209,6 +112859,8 @@ self: { pname = "libltdl"; version = "0.1.1"; sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mainland/libltdl"; description = "FFI interface to libltdl"; @@ -111420,6 +113072,8 @@ self: { pname = "libssh2"; version = "0.2.0.3"; sha256 = "7caa9f23ae3ff54a819ff56bbecc7953fe39aa958c77feebd52849f2bf86cd75"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring network syb time ]; librarySystemDepends = [ ssh2 ]; libraryPkgconfigDepends = [ libssh2 ]; @@ -111689,9 +113343,9 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, HUnit, lifted-base - , monad-control, mtl, tasty, tasty-hunit, tasty-th - , transformers-base + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit + , tasty-th, transformers-base }: mkDerivation { pname = "lifted-async"; @@ -111704,15 +113358,16 @@ self: { async base HUnit lifted-base monad-control mtl tasty tasty-hunit tasty-th ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; homepage = "https://github.com/maoe/lifted-async"; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; }) {}; "lifted-base" = callPackage - ({ mkDerivation, base, HUnit, monad-control, test-framework - , test-framework-hunit, transformers, transformers-base - , transformers-compat + ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel + , test-framework, test-framework-hunit, transformers + , transformers-base, transformers-compat }: mkDerivation { pname = "lifted-base"; @@ -111723,6 +113378,9 @@ self: { base HUnit monad-control test-framework test-framework-hunit transformers transformers-base transformers-compat ]; + benchmarkHaskellDepends = [ + base criterion monad-control monad-peel transformers + ]; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; @@ -112296,8 +113954,8 @@ self: { }) {}; "linkedhashmap" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, mtl, tasty - , tasty-hunit, unordered-containers + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , mtl, tasty, tasty-hunit, unordered-containers }: mkDerivation { pname = "linkedhashmap"; @@ -112310,6 +113968,9 @@ self: { base containers deepseq hashable mtl tasty tasty-hunit unordered-containers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable unordered-containers + ]; homepage = "https://github.com/abasko/linkedhashmap"; description = "Persistent LinkedHashMap data structure"; license = stdenv.lib.licenses.bsd3; @@ -112422,6 +114083,8 @@ self: { pname = "linux-file-extents"; version = "0.2.0.0"; sha256 = "6c7cd9e700f666f774736d31a0e6aa7bfe9bd1e075c11eed701ba95095fd9bd0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base unix ]; homepage = "https://github.com/redneb/linux-file-extents"; description = "Retrieve file fragmentation information under Linux"; @@ -112634,7 +114297,7 @@ self: { }) {}; "liquid" = callPackage - ({ mkDerivation, aeson, attoparsec, base, hashable, lens + ({ mkDerivation, aeson, attoparsec, base, criterion, hashable, lens , lens-aeson, mtl, QuickCheck, scientific, semigroups, tasty , tasty-hunit, tasty-quickcheck, tasty-th, text , unordered-containers, validation, vector @@ -112652,6 +114315,7 @@ self: { semigroups tasty tasty-hunit tasty-quickcheck tasty-th text unordered-containers validation vector ]; + benchmarkHaskellDepends = [ aeson attoparsec base criterion text ]; homepage = "https://github.com/projectorhq/haskell-liquid"; description = "Liquid template language library"; license = stdenv.lib.licenses.bsd3; @@ -112831,6 +114495,8 @@ self: { pname = "list-prompt"; version = "0.1.1.0"; sha256 = "c7323c7a802940deba1a7be46265fd8c01f548174d5f08923a607e1730ca4dee"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-terminal base data-default stm terminal-size vty ]; @@ -113296,6 +114962,8 @@ self: { pname = "llvm-extra"; version = "0.7.0.1"; sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers cpuid llvm-tf non-empty tfp transformers unsafe utility-ht @@ -113312,6 +114980,8 @@ self: { pname = "llvm-ffi"; version = "3.8.1"; sha256 = "d636af82033d1fbfa5c05ed66f823afe9081db387f85eae862f97ca6db4e24c9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base enumset ]; libraryPkgconfigDepends = [ llvm ]; homepage = "http://haskell.org/haskellwiki/LLVM"; @@ -113451,8 +115121,8 @@ self: { ({ mkDerivation, base, containers, monadLib, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.5"; - sha256 = "d38228d980ad1fc0b833cf5daa0e78ce981c102a6ad7cad16bed2761f98cbb19"; + version = "0.6.0.0"; + sha256 = "f9b50885551a48624a0577c6dabaef1fc77245367d6d9afdb84d548ada328e66"; libraryHaskellDepends = [ base containers monadLib pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -113465,8 +115135,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.3.0.0"; - sha256 = "7873abf8b3acbc679642f2f1c2d639db91c084a2a97546037f049735536dfb81"; + version = "0.3.0.1"; + sha256 = "def47c50959ae7b270987bcf53af87e07a290275bfd34f01e3d3c50b8edf1178"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113492,6 +115162,8 @@ self: { pname = "llvm-tf"; version = "3.1.0.1"; sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers enumset fixed-length llvm-ffi non-empty storable-record tfp transformers utility-ht @@ -113683,12 +115355,13 @@ self: { }) {}; "located-base" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion }: mkDerivation { pname = "located-base"; version = "0.1.1.0"; sha256 = "83a96081c87ec9820b6bad7200404f7e1fbed365fe8c57641d8645d95732d59f"; libraryHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/gridaphobe/located-base"; description = "Location-aware variants of partial functions"; license = stdenv.lib.licenses.bsd3; @@ -113982,8 +115655,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "0.4.4"; - sha256 = "9a2cfcf95d0c88ae6471106f67314e81e2bd370fe092a4f21d9459f1f235dbea"; + version = "0.5.1"; + sha256 = "8645928457c46ca217c2a9ebc75819176643552876c832ad3691a66e762798ea"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114107,7 +115780,8 @@ self: { }) {}; "logging-effect" = callPackage - ({ mkDerivation, async, base, exceptions, free, monad-control, mtl + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , semigroups, stm, stm-delay, text, time, transformers , transformers-base, wl-pprint-text }: @@ -114119,11 +115793,39 @@ self: { async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_0" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.0"; + sha256 = "be6f0121d16e9947d4147c264123b8d622102eb43f0d16e815f117505d6d8544"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade" = callPackage ({ mkDerivation, base, hspec, template-haskell, transformers }: mkDerivation { @@ -114342,6 +116044,8 @@ self: { pname = "lol"; version = "0.6.0.0"; sha256 = "973a5ecd6397fd01e34bb7a40e80a3b0b564ca00aeafb73dc66fb0ec988c950d"; + revision = "1"; + editedCabalFile = "bc9524337ed4a7608bda8a983259e6e381621d8a0914531833a5d1a761ba7971"; libraryHaskellDepends = [ arithmoi base bytestring constraints containers crypto-api data-default deepseq directory monadcryptorandom MonadRandom mtl @@ -114356,31 +116060,35 @@ self: { }) {}; "lol-apps" = callPackage - ({ mkDerivation, arithmoi, base, constraints, deepseq, DRBG, lol - , MonadRandom, mtl, numeric-prelude, QuickCheck, random, repa - , singletons, test-framework, test-framework-quickcheck2, vector + ({ mkDerivation, base, containers, deepseq, DRBG, filepath, lol + , lol-benches, lol-cpp, lol-repa, lol-tests, MonadRandom, mtl + , numeric-prelude, protocol-buffers, protocol-buffers-descriptor + , singletons, split, test-framework, time }: mkDerivation { pname = "lol-apps"; - version = "0.1.1.0"; - sha256 = "75b0d6d53161d25e77286ab0cbf43487112f6b6d944ff77d11ace6e7ef83af7e"; - revision = "2"; - editedCabalFile = "5d9f33a4442eff096507ba9917c86de5cd01ee1fe55f4837c69301ccaa7f4c69"; + version = "0.2.0.2"; + sha256 = "d082ac8f4112884878a5f8f0ce8d994b1c5dc8d62bba8f55a437b03f1f2e1c88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq lol MonadRandom numeric-prelude + base containers deepseq lol MonadRandom mtl numeric-prelude + protocol-buffers protocol-buffers-descriptor singletons split ]; executableHaskellDepends = [ - arithmoi base lol MonadRandom numeric-prelude + base deepseq DRBG filepath lol lol-cpp MonadRandom mtl + numeric-prelude singletons time ]; testHaskellDepends = [ - arithmoi base constraints deepseq DRBG lol MonadRandom mtl - QuickCheck random repa singletons test-framework - test-framework-quickcheck2 vector + base lol lol-cpp lol-repa lol-tests MonadRandom numeric-prelude + test-framework + ]; + benchmarkHaskellDepends = [ + base DRBG lol lol-benches lol-cpp lol-repa MonadRandom mtl + numeric-prelude ]; homepage = "https://github.com/cpeikert/Lol"; - description = "Lattice-based cryptographic applications using Lol"; + description = "Lattice-based cryptographic applications using ."; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -114388,18 +116096,17 @@ self: { "lol-benches" = callPackage ({ mkDerivation, ansi-terminal, base, containers, criterion , crypto-api, deepseq, DRBG, lol, MonadRandom, split, statistics - , transformers, vector }: mkDerivation { pname = "lol-benches"; - version = "0.0.0.3"; - sha256 = "4ec18d88b5153220c89ec9f39bf9a0d2e6c1fdfff69f980cdabc42423ee092b5"; + version = "0.0.0.5"; + sha256 = "6d708ff14c3dbe0ea7742d9498fe43ad087eb43652bd20cc92bd4f5fc0671858"; libraryHaskellDepends = [ ansi-terminal base containers criterion crypto-api deepseq DRBG lol - MonadRandom split statistics transformers vector + MonadRandom split statistics ]; homepage = "https://github.com/cpeikert/Lol"; - description = "A library for benchmarking ."; + description = "A library for benchmarking ."; license = stdenv.lib.licenses.gpl2; }) {}; @@ -114426,52 +116133,41 @@ self: { }) {}; "lol-cpp" = callPackage - ({ mkDerivation, arithmoi, base, bytestring, constraints - , containers, crypto-api, data-default, deepseq, lol, lol-tests - , monadcryptorandom, MonadRandom, mtl, numeric-prelude - , protocol-buffers, protocol-buffers-descriptor, random, reflection - , repa, singletons, tagged-transformer, template-haskell - , th-desugar, transformers, vector, vector-th-unbox + ({ mkDerivation, base, constraints, deepseq, DRBG, lol, lol-benches + , lol-tests, MonadRandom, mtl, numeric-prelude, reflection, vector }: mkDerivation { pname = "lol-cpp"; - version = "0.0.0.1"; - sha256 = "86d374f5628c89a35d969c6e6cc59da9c2ca85758bf7375b25f7c0e2ddcf0b57"; + version = "0.0.0.3"; + sha256 = "42fe0cc6f99aabd9ab47666fa41cb8407688d0e4e18a7e9cf67f1db43e1b9325"; libraryHaskellDepends = [ - arithmoi base bytestring constraints containers crypto-api - data-default deepseq lol monadcryptorandom MonadRandom mtl - numeric-prelude protocol-buffers protocol-buffers-descriptor random - reflection repa singletons tagged-transformer template-haskell - th-desugar transformers vector vector-th-unbox + base constraints deepseq lol MonadRandom mtl numeric-prelude + reflection vector ]; testHaskellDepends = [ base lol-tests ]; + benchmarkHaskellDepends = [ base DRBG lol lol-benches ]; homepage = "https://github.com/cpeikert/Lol"; - description = "A fast C++ backend for ."; + description = "A fast C++ backend for ."; license = stdenv.lib.licenses.gpl2; }) {}; "lol-repa" = callPackage - ({ mkDerivation, arithmoi, base, bytestring, constraints - , containers, crypto-api, data-default, deepseq, lol, lol-tests - , monadcryptorandom, MonadRandom, mtl, numeric-prelude - , protocol-buffers, protocol-buffers-descriptor, random, reflection - , repa, singletons, tagged-transformer, template-haskell - , th-desugar, transformers, vector, vector-th-unbox + ({ mkDerivation, base, constraints, data-default, deepseq, DRBG + , lol, lol-benches, lol-tests, MonadRandom, mtl, numeric-prelude + , reflection, repa, singletons, vector, vector-th-unbox }: mkDerivation { pname = "lol-repa"; - version = "0.0.0.1"; - sha256 = "c175e5881ee98795a0e24adde1a7c1955102b5723048d540389f773fff239b98"; + version = "0.0.0.2"; + sha256 = "9545c89813d53d928ba6da0ef24118f6a80c01525d05963b6e8b1399bd3e91a4"; libraryHaskellDepends = [ - arithmoi base bytestring constraints containers crypto-api - data-default deepseq lol monadcryptorandom MonadRandom mtl - numeric-prelude protocol-buffers protocol-buffers-descriptor random - reflection repa singletons tagged-transformer template-haskell - th-desugar transformers vector vector-th-unbox + base constraints data-default deepseq lol MonadRandom mtl + numeric-prelude reflection repa singletons vector vector-th-unbox ]; testHaskellDepends = [ base lol-tests ]; + benchmarkHaskellDepends = [ base DRBG lol lol-benches ]; homepage = "https://github.com/cpeikert/Lol"; - description = "A repa backend for ."; + description = "A repa backend for ."; license = stdenv.lib.licenses.gpl2; }) {}; @@ -114483,6 +116179,8 @@ self: { pname = "lol-tests"; version = "0.0.0.1"; sha256 = "656cbe1a7bcea84cffd271a61d0f2b731e14705309636d872afff363628a37ed"; + revision = "1"; + editedCabalFile = "39058c9844930c138aed3e9135879c07de330ae36259e5799c0cdf96fc9ca9d2"; libraryHaskellDepends = [ base lol MonadRandom QuickCheck test-framework test-framework-quickcheck2 @@ -114553,13 +116251,17 @@ self: { }) {}; "loop" = callPackage - ({ mkDerivation, base, hspec, mtl }: + ({ mkDerivation, base, criterion, foldl, hspec, mtl, random, vector + }: mkDerivation { pname = "loop"; version = "0.3.0"; sha256 = "92962010bdab28cc0092dd3fe42819d6f215c717dd10d9349626d92a0d0b3ecf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec mtl ]; + benchmarkHaskellDepends = [ + base criterion foldl mtl random vector + ]; homepage = "https://github.com/nh2/loop"; description = "Fast loops (for when GHC can't optimize forM_)"; license = stdenv.lib.licenses.mit; @@ -114591,8 +116293,8 @@ self: { }) {}; "loops" = callPackage - ({ mkDerivation, base, primitive, tasty, tasty-quickcheck - , transformers, vector + ({ mkDerivation, base, criterion, primitive, tasty + , tasty-quickcheck, transformers, vector }: mkDerivation { pname = "loops"; @@ -114602,6 +116304,7 @@ self: { editedCabalFile = "ef9ed99ec28140d39775a0b9c44333496d3ee754995219460d76cb137a9534ce"; libraryHaskellDepends = [ base primitive transformers vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Fast imperative-style loops"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114777,6 +116480,8 @@ self: { pname = "lp-diagrams-svg"; version = "1.1"; sha256 = "6cc63a8bf914fbc67e42c54c0c4327e81b650d56d9aee5b189946473453463b2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers FontyFruity gasp JuicyPixels lens linear lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector @@ -115062,8 +116767,8 @@ self: { "lucid" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text - , transformers, unordered-containers + , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph + , mtl, parsec, text, transformers, unordered-containers }: mkDerivation { pname = "lucid"; @@ -115076,6 +116781,9 @@ self: { testHaskellDepends = [ base bifunctors hspec HUnit mtl parsec text ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text + ]; homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; @@ -115351,7 +117059,8 @@ self: { }) {}; "lz4" = callPackage - ({ mkDerivation, base, bytestring, cereal, hspec, HUnit, QuickCheck + ({ mkDerivation, base, bytestring, cereal, criterion, deepseq + , hspec, HUnit, QuickCheck, quicklz, snappy }: mkDerivation { pname = "lz4"; @@ -115359,6 +117068,9 @@ self: { sha256 = "98cc62bea1a359201f9e39a7db2457272f996ede25d97a2dbee3a07aa80693f1"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq quicklz snappy + ]; homepage = "http://github.com/mwotton/lz4hs"; description = "LZ4 compression for ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -115412,8 +117124,7 @@ self: { pname = "lzma-clib"; version = "5.2.2"; sha256 = "0aed9cb8ef3a2b0e71c429b00161ee3fb342cce2603ccb934f507fb236a09fd5"; - isLibrary = false; - isExecutable = false; + doHaddock = false; description = "liblzma C library and headers for use by LZMA bindings"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -115565,6 +117276,8 @@ self: { pname = "maccatcher"; version = "2.1.5"; sha256 = "cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary parsec process ]; description = "Obtain the host MAC address on *NIX and Windows"; license = stdenv.lib.licenses.bsd3; @@ -115591,10 +117304,11 @@ self: { }) {}; "machines" = callPackage - ({ mkDerivation, adjunctions, base, comonad, containers, directory - , distributive, doctest, filepath, free, mtl, pointed, profunctors - , semigroupoids, semigroups, transformers, transformers-compat - , void + ({ mkDerivation, adjunctions, base, comonad, conduit + , conduit-combinators, containers, criterion, directory + , distributive, doctest, filepath, free, mtl, pipes, pointed + , profunctors, semigroupoids, semigroups, transformers + , transformers-compat, void }: mkDerivation { pname = "machines"; @@ -115606,6 +117320,9 @@ self: { transformers-compat void ]; testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ + base conduit conduit-combinators criterion mtl pipes + ]; homepage = "http://github.com/ekmett/machines/"; description = "Networked stream transducers"; license = stdenv.lib.licenses.bsd3; @@ -115773,8 +117490,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "1.0.0.0"; - sha256 = "d8fd8f0055eab476c13c23361cec3a780319d90e45c2b45fccd1208b0ff24120"; + version = "1.0.0.1"; + sha256 = "edeea8b9d3cabfaf5392fbe7ad307754e20fe8ef90294b5a846c9a7f8edb5af8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116953,35 +118670,35 @@ self: { }) {}; "marvin" = callPackage - ({ mkDerivation, aeson, base, bytestring, configurator, deepseq - , directory, filepath, hashable, haskeline, http-client - , http-client-tls, http-types, lens, lifted-async, lifted-base - , marvin-interpolate, monad-control, monad-logger, monad-loops, mtl - , mustache, network-uri, optparse-applicative, random, stm, text - , text-icu, time, transformers, transformers-base - , unordered-containers, vector, wai, warp, warp-tls, websockets - , wreq, wuss + ({ mkDerivation, aeson, base, bytestring, conduit, configurator + , deepseq, directory, filepath, hashable, haskeline, http-client + , http-client-tls, http-types, irc-conduit, lens, lifted-async + , lifted-base, marvin-interpolate, monad-control, monad-logger + , monad-loops, mtl, mustache, network-uri, optparse-applicative + , random, stm, text, text-icu, time, transformers + , transformers-base, unordered-containers, vector, wai, warp + , warp-tls, websockets, wreq, wuss }: mkDerivation { pname = "marvin"; - version = "0.1.5"; - sha256 = "42cebd7af1b7d20575a08bbd1510226761aa2f494f64b0e7110d350f211b504a"; + version = "0.2.0"; + sha256 = "7928adc11b0fe646db3bb20333c6dcea09664a7b6a341de9d5ed3bfb639e6301"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring configurator deepseq hashable haskeline - http-client http-client-tls http-types lens lifted-async - lifted-base marvin-interpolate monad-control monad-logger - monad-loops mtl network-uri optparse-applicative random stm text - text-icu time transformers transformers-base unordered-containers - vector wai warp warp-tls websockets wreq wuss + aeson base bytestring conduit configurator deepseq hashable + haskeline http-client http-client-tls http-types irc-conduit lens + lifted-async lifted-base marvin-interpolate monad-control + monad-logger monad-loops mtl network-uri optparse-applicative + random stm text text-icu time transformers transformers-base + unordered-containers vector wai warp warp-tls websockets wreq wuss ]; executableHaskellDepends = [ aeson base bytestring configurator directory filepath mustache optparse-applicative text ]; homepage = "https://marvin.readthedocs.io"; - description = "A modular chat bot"; + description = "A framework for modular, portable chat bots"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -117230,8 +118947,8 @@ self: { }) {eng = null; mat = null; mx = null;}; "matrices" = callPackage - ({ mkDerivation, base, deepseq, primitive, tasty, tasty-hunit - , tasty-quickcheck, vector + ({ mkDerivation, base, criterion, deepseq, primitive, tasty + , tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "matrices"; @@ -117241,13 +118958,14 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ base criterion vector ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; }) {}; "matrix" = callPackage - ({ mkDerivation, base, deepseq, loop, primitive, QuickCheck, tasty - , tasty-quickcheck, vector + ({ mkDerivation, base, criterion, deepseq, loop, primitive + , QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "matrix"; @@ -117255,6 +118973,7 @@ self: { sha256 = "7a3d41c0f66212360057b29ae9f81779c8da9f71b040ad7676699af7e7ca35b5"; libraryHaskellDepends = [ base deepseq loop primitive vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; description = "A native implementation of matrix operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -117733,6 +119452,74 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mediabus" = callPackage + ({ mkDerivation, array, async, base, binary, bytestring, cereal + , conduit, conduit-combinators, conduit-extra, containers + , data-default, deepseq, hspec, lens, lifted-async, monad-control + , mtl, network, parallel, primitive, process, QuickCheck, random + , resourcet, singletons, spool, stm, streaming-commons, tagged + , template-haskell, text, time, transformers, type-spec, vector + }: + mkDerivation { + pname = "mediabus"; + version = "0.2.0.2"; + sha256 = "3dd4d11c4253eebe2ff21368222661341b64e8176171fb4be77b9ee45402f7d1"; + libraryHaskellDepends = [ + array async base bytestring cereal conduit conduit-combinators + conduit-extra containers data-default deepseq lens lifted-async + monad-control mtl network parallel primitive process QuickCheck + random resourcet spool stm streaming-commons tagged text time + transformers vector + ]; + testHaskellDepends = [ + array async base binary bytestring conduit conduit-combinators + conduit-extra containers data-default deepseq hspec lens + monad-control mtl QuickCheck singletons spool stm tagged + template-haskell text time transformers type-spec vector + ]; + homepage = "https://github.com/lindenbaum/mediabus"; + description = "Multimedia streaming on top of Conduit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mediabus-rtp" = callPackage + ({ mkDerivation, array, async, base, binary, bytestring, cereal + , conduit, conduit-combinators, conduit-extra, containers + , data-default, deepseq, hspec, lens, lifted-async, mediabus + , monad-control, mtl, network, parallel, primitive, process + , QuickCheck, random, resourcet, singletons, spool, stm + , streaming-commons, tagged, template-haskell, text, time + , transformers, type-spec, vector + }: + mkDerivation { + pname = "mediabus-rtp"; + version = "0.2.0.0"; + sha256 = "f802521f6f504e1ea56a2c694a216a8b92087f21aa4d493d3c6bf11d27063d27"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring cereal conduit conduit-combinators + conduit-extra containers data-default deepseq lens lifted-async + mediabus monad-control mtl network parallel primitive process + QuickCheck random resourcet spool stm streaming-commons tagged text + time transformers vector + ]; + executableHaskellDepends = [ + async base conduit conduit-combinators conduit-extra data-default + lens lifted-async mediabus monad-control mtl parallel QuickCheck + random stm streaming-commons tagged time vector + ]; + testHaskellDepends = [ + array async base binary bytestring conduit conduit-combinators + conduit-extra containers data-default deepseq hspec lens mediabus + monad-control mtl QuickCheck singletons spool stm tagged + template-haskell text time transformers type-spec vector + ]; + homepage = "https://github.com/lindenbaum/mediabus-rtp"; + description = "Receive and Send RTP Packets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "median-stream" = callPackage ({ mkDerivation, base, heap, QuickCheck }: mkDerivation { @@ -117850,9 +119637,9 @@ self: { }) {}; "megaparsec" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , hspec, hspec-expectations, mtl, QuickCheck, scientific, text - , transformers + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, hspec, hspec-expectations, mtl, QuickCheck + , scientific, text, transformers, weigh }: mkDerivation { pname = "megaparsec"; @@ -117866,6 +119653,7 @@ self: { base bytestring containers exceptions hspec hspec-expectations mtl QuickCheck scientific text transformers ]; + benchmarkHaskellDepends = [ base criterion deepseq weigh ]; homepage = "https://github.com/mrkkrp/megaparsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; @@ -117972,7 +119760,7 @@ self: { }) {}; "memcache" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring + ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion , data-default-class, hashable, network, resource-pool, time , vector }: @@ -117987,6 +119775,7 @@ self: { testHaskellDepends = [ base binary blaze-builder bytestring network ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/dterei/memcache-hs"; description = "A memcached client library"; license = stdenv.lib.licenses.bsd3; @@ -118001,6 +119790,8 @@ self: { pname = "memcache-conduit"; version = "0.0.3"; sha256 = "f28e89dcbf1329dec98d67ce055a3eef12bc8c4ef9afeaf3c8adf10db5f632f8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring conduit conduit-extra memcache-haskell mtl network resourcet split @@ -118018,6 +119809,8 @@ self: { pname = "memcache-haskell"; version = "0.0.10.1"; sha256 = "4c1b7d9c5d12a4ae24ea73ace9489232831bb15b1d8e0d2bb53e926f53b16e48"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring hashable network split transformers ]; @@ -118848,19 +120641,22 @@ self: { }) {}; "midi-simple" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, generic-random - , hspec, hspec-attoparsec, QuickCheck, tasty, tasty-hspec - , tasty-quickcheck + ({ mkDerivation, attoparsec, base, bytestring, criterion + , generic-random, hspec, hspec-attoparsec, QuickCheck, tasty + , tasty-hspec, tasty-quickcheck }: mkDerivation { pname = "midi-simple"; version = "0.1.0.0"; sha256 = "f680eed206f3623e01817794b9f7dd9a7c8fb6aa935648a3a5cb24119621849a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ attoparsec base bytestring generic-random hspec hspec-attoparsec QuickCheck tasty tasty-hspec tasty-quickcheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/tsahyt/midi-simple#readme"; description = "A simple and fast library for working with MIDI messages"; license = stdenv.lib.licenses.lgpl3; @@ -118969,8 +120765,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.3.5"; - sha256 = "89e4e32bab7820b01e2b6e45cf70e406af1639aaf8534f769225efd89cc3730a"; + version = "3.4.1"; + sha256 = "0f24c72662be4a0e3d75956fff53899216e29ac7eb29dae771c7e4eb77bdd8d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119443,12 +121239,13 @@ self: { }) {}; "minisat-solver" = callPackage - ({ mkDerivation, base, containers, transformers }: + ({ mkDerivation, base, containers, easyrender, transformers }: mkDerivation { pname = "minisat-solver"; version = "0.1"; sha256 = "c12098dee034afb98b31ce7ac346398b93a3537c11e30e7573d25160120fd37d"; libraryHaskellDepends = [ base containers transformers ]; + benchmarkHaskellDepends = [ base containers easyrender ]; homepage = "http://www.mathstat.dal.ca/~selinger/minisat-solver/"; description = "High-level Haskell bindings for the MiniSat SAT solver"; license = stdenv.lib.licenses.mit; @@ -119715,6 +121512,8 @@ self: { pname = "mmap"; version = "0.5.9"; sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring ]; description = "Memory mapped files for POSIX and Windows"; license = stdenv.lib.licenses.bsd3; @@ -120049,8 +121848,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "1.0.0.41"; - sha256 = "85905960363cb617541b0f9ec3a93e73a9b9cd761acdf37174864da865c5cb95"; + version = "1.0.0.42"; + sha256 = "892870056d66fecae4db37a780a0dcc6c9cb6cae281c2883a20378efc83b019d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -120504,7 +122303,7 @@ self: { }) {}; "monad-logger-prefix" = callPackage - ({ mkDerivation, base, doctest, exceptions, Glob, hspec + ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec , monad-control, monad-logger, mtl, QuickCheck, resourcet, text , transformers, transformers-base }: @@ -120517,6 +122316,7 @@ self: { transformers transformers-base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion monad-logger ]; homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; @@ -120585,7 +122385,7 @@ self: { }) {}; "monad-memo" = callPackage - ({ mkDerivation, array, base, containers, mtl, primitive + ({ mkDerivation, array, base, containers, criterion, mtl, primitive , QuickCheck, random, test-framework, test-framework-quickcheck2 , transformers, vector }: @@ -120600,6 +122400,9 @@ self: { array base containers mtl primitive QuickCheck random test-framework test-framework-quickcheck2 transformers vector ]; + benchmarkHaskellDepends = [ + array base containers criterion mtl primitive transformers vector + ]; homepage = "https://github.com/EduardSergeev/monad-memo"; description = "Memoization monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -121375,7 +123178,7 @@ self: { "mongoDB" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, containers, cryptohash + , binary, bson, bytestring, containers, criterion, cryptohash , data-default-class, hashtables, hspec, lifted-base, monad-control , mtl, network, nonce, old-locale, parsec, random, random-shuffle , text, time, tls, transformers-base @@ -121391,6 +123194,12 @@ self: { random-shuffle text tls transformers-base ]; testHaskellDepends = [ base hspec mtl old-locale text time ]; + benchmarkHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring containers criterion cryptohash hashtables lifted-base + monad-control mtl network nonce parsec random random-shuffle text + transformers-base + ]; homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; @@ -121458,10 +123267,8 @@ self: { }: mkDerivation { pname = "monky"; - version = "2.1.0.0"; - sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0"; - revision = "1"; - editedCabalFile = "8dac5d11177a4374041712a519d50cb6b1fd41fffe201e77eff44f103257c446"; + version = "2.1.3.0"; + sha256 = "a80fee91a2ed4462d2f1688b59cdb13cb0aa0728205ce22592b0b0ad3b72736a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121490,14 +123297,15 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , hspec, HUnit, QuickCheck, semigroups, split, text, transformers - , unordered-containers, vector, vector-algorithms + ({ mkDerivation, base, bytestring, containers, criterion, foldl + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms }: mkDerivation { pname = "mono-traversable"; - version = "1.0.1.2"; - sha256 = "1875b0281b2956530c33d20cfdbc1d0e1d46d09d1f9623cff19c31b7a4d296ea"; + version = "1.0.1.3"; + sha256 = "2861eca0d69c759b02cb7e9669b7a3f8a6b0ede2d96984cba295b69bc9c70a72"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -121506,6 +123314,7 @@ self: { base bytestring containers foldl hspec HUnit QuickCheck semigroups text transformers unordered-containers vector ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; @@ -121529,6 +123338,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable-wrapper" = callPackage + ({ mkDerivation, base, mono-traversable }: + mkDerivation { + pname = "mono-traversable-wrapper"; + version = "0.1.0.1"; + sha256 = "4d441c3ca20933060c7c60dc83070ecb0059406c3c376680d76e2320390664cb"; + libraryHaskellDepends = [ base mono-traversable ]; + homepage = "https://github.com/oisdk/mono-traversable-wrapper"; + description = "Wrapper providing Foldable instance for MonoFoldables"; + license = stdenv.lib.licenses.mit; + }) {}; + "monoid-absorbing" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -121542,12 +123363,14 @@ self: { }) {}; "monoid-extras" = callPackage - ({ mkDerivation, base, groups, semigroupoids, semigroups }: + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: mkDerivation { pname = "monoid-extras"; version = "0.4.2"; sha256 = "13ff4e055c9656a3e599567cbc4a46ef8617c05534de46909a4239696e34281f"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121882,16 +123705,16 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, deepseq - , Earley, http-client, http-client-tls, microlens, microlens-mtl - , mtl, optparse-applicative, pipes, QuickCheck, system-fileio - , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text - , text-format, transformers + ({ mkDerivation, alex, array, base, binary, code-page, containers + , criterion, deepseq, Earley, http-client, http-client-tls + , microlens, microlens-mtl, mtl, optparse-applicative, pipes + , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit + , tasty-quickcheck, text, text-format, transformers }: mkDerivation { pname = "morte"; - version = "1.6.5"; - sha256 = "49d292a44d25fe4372856da87380165e1da317c6fafc8bb0d047bbce867787c9"; + version = "1.6.6"; + sha256 = "c933dfa0cec4ddb0c5f552ccb70f3ac0f443b70d6bebc5a858d69c5ba8a4ce25"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121900,11 +123723,14 @@ self: { system-filepath text text-format transformers ]; libraryToolDepends = [ alex ]; - executableHaskellDepends = [ base optparse-applicative text ]; + executableHaskellDepends = [ + base code-page optparse-applicative text text-format + ]; testHaskellDepends = [ base mtl QuickCheck system-filepath tasty tasty-hunit tasty-quickcheck text transformers ]; + benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122551,6 +124377,30 @@ self: { license = "GPL"; }) {}; + "mud" = callPackage + ({ mkDerivation, base, directory, filepath, free, hspec, mtl + , optparse-applicative, parsec, process, QuickCheck, time, unix + }: + mkDerivation { + pname = "mud"; + version = "0.1.0.0"; + sha256 = "4043d1226482acf5bd9fd6797b95f24494a3f1b8612bbe4a469dfa0819023f47"; + revision = "1"; + editedCabalFile = "6d62d56fc07cd9b413ccbdddbcc517969acf89b1906b2254f0d0fb7c3b85203d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath free mtl optparse-applicative parsec + process time unix + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ + base directory free hspec mtl QuickCheck time unix + ]; + description = "Multi-version deployer for web applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mudbath" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptohash, directory , github-types, http-conduit, http-types, process, random @@ -122701,6 +124551,8 @@ self: { pname = "multiarg"; version = "0.30.0.10"; sha256 = "c9fa623a8e06d62addc2b7ad5102ceac3a6f0db6a67afbc8e693d0d0aec417a1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th @@ -122983,6 +124835,8 @@ self: { sha256 = "609650cbbfd102c775b44be3fd7bb4f6732127e64b21dd45ea1af057c5ffb8a6"; revision = "1"; editedCabalFile = "a5bd571eb919e74f8ba5313ffca801dce8c1fe1dd2c6699eadab39b0e37ae13b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base monad-control mtl tagged transformers transformers-base ]; @@ -123501,7 +125355,7 @@ self: { }) {}; "mutable-containers" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec + ({ mkDerivation, base, containers, criterion, ghc-prim, hspec , mono-traversable, primitive, QuickCheck, vector }: mkDerivation { @@ -123514,6 +125368,7 @@ self: { testHaskellDepends = [ base containers hspec primitive QuickCheck vector ]; + benchmarkHaskellDepends = [ base containers criterion ]; homepage = "https://github.com/snoyberg/mono-traversable"; description = "Abstactions and concrete implementations of mutable containers"; license = stdenv.lib.licenses.mit; @@ -123887,8 +125742,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.4.0.0"; - sha256 = "0f5ce026b8d45016dc90a543b394a72dae25aa115bfa5e7ae0095a516bb9f04d"; + version = "0.4.0.1"; + sha256 = "1b559d28555c88c6ab016b82d6cdd78357e9479d45bfd6cc1b3a88643c4cbf2d"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring mysql old-locale pcre-light text time @@ -124259,8 +126114,9 @@ self: { }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage - ({ mkDerivation, base, binary, bytestring, nanomsg, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th + ({ mkDerivation, base, binary, bytestring, criterion, nanomsg + , QuickCheck, test-framework, test-framework-quickcheck2 + , test-framework-th, zeromq4-haskell }: mkDerivation { pname = "nanomsg-haskell"; @@ -124272,6 +126128,9 @@ self: { base binary bytestring QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; + benchmarkHaskellDepends = [ + base bytestring criterion zeromq4-haskell + ]; homepage = "https://github.com/ivarnymoen/nanomsg-haskell"; description = "Bindings to the nanomsg library"; license = stdenv.lib.licenses.mit; @@ -124312,6 +126171,8 @@ self: { sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d"; revision = "1"; editedCabalFile = "ab822c8c3baab11820f06e9c34ba59c97789625020fabf476338cc17b2e74853"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; librarySystemDepends = [ freeglut GLEW mesa ]; libraryToolDepends = [ c2hs ]; @@ -124859,6 +126720,8 @@ self: { pname = "nested-routes"; version = "7.2.2"; sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring composition-extra errors exceptions hashable hashtables mtl poly-arity pred-set pred-trie regex-compat @@ -124974,6 +126837,11 @@ self: { process QuickCheck random syb test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base bimap binary binary-strict bytestring + containers fgl HList hslogger mtl multiset network parsec process + random syb + ]; homepage = "http://frenetic-lang.org"; description = "The NetCore compiler and runtime system for OpenFlow networks"; license = stdenv.lib.licenses.bsd3; @@ -125034,8 +126902,8 @@ self: { }: mkDerivation { pname = "netlink"; - version = "1.0.0.4"; - sha256 = "94061ae1809a11d564ae3a45972c3a49dfbb01054a937cc4d5a2805963260a6d"; + version = "1.1.0.0"; + sha256 = "48f59a7822b2e3dab8baed1d1cd3a3dca1e7744a82f9078c71ec1ce3f6ddf083"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125071,8 +126939,8 @@ self: { "netpbm" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , hspec, HUnit, storable-record, unordered-containers, vector - , vector-th-unbox + , criterion, hspec, HUnit, storable-record, unordered-containers + , vector, vector-th-unbox }: mkDerivation { pname = "netpbm"; @@ -125085,6 +126953,7 @@ self: { unordered-containers vector vector-th-unbox ]; testHaskellDepends = [ base bytestring hspec HUnit vector ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/nh2/haskell-netpbm"; description = "Loading PBM, PGM, PPM image files"; license = stdenv.lib.licenses.mit; @@ -125255,6 +127124,8 @@ self: { pname = "netwire-input-glfw"; version = "0.0.6"; sha256 = "dd095cf915005ca6d72fa75a1ea7d890e2cdde2b8f16f45a994e413e97d9dd06"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers GLFW-b mtl netwire-input stm ]; @@ -125328,6 +127199,8 @@ self: { pname = "network-address"; version = "0.2.0"; sha256 = "614517e9712b1320ca86a1e77535e6cfb426850ca3e62e49f0eb776543e8e65f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base Cabal ]; testHaskellDepends = [ base Cabal QuickCheck test-framework test-framework-quickcheck2 @@ -125872,6 +127745,8 @@ self: { pname = "network-service"; version = "0.1.0.0"; sha256 = "e41ea01bb2705fde2a862f487ee5e90deeb74ec2ec9282adcc48ba2322b840cb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base64-bytestring bytestring network ]; @@ -126002,6 +127877,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport_0_5_1" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , transformers + }: + mkDerivation { + pname = "network-transport"; + version = "0.5.1"; + sha256 = "29f6e730f7f29990a657dd3750d08eb500557e51a0dd9b60798bbce0f48c8b46"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable transformers + ]; + homepage = "http://haskell-distributed.github.com"; + description = "Network abstraction layer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-amqp" = callPackage ({ mkDerivation, amqp, async, base, bytestring, cereal, containers , exceptions, lens-family, lens-family-th, network-transport @@ -126099,14 +127991,16 @@ self: { "network-transport-zeromq" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers - , data-accessor, exceptions, network-transport - , network-transport-tests, random, semigroups, stm, stm-chans - , tasty, tasty-hunit, transformers, zeromq4-haskell + , criterion, data-accessor, distributed-process, exceptions + , network-transport, network-transport-tests, random, semigroups + , stm, stm-chans, tasty, tasty-hunit, transformers, zeromq4-haskell }: mkDerivation { pname = "network-transport-zeromq"; version = "0.2.1.1"; sha256 = "93b56e1a2b337c24cc899874d23eed335ff640c5c1e143b69584c4d71f0cca35"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base binary bytestring containers data-accessor exceptions network-transport random semigroups stm stm-chans transformers @@ -126116,6 +128010,9 @@ self: { base network-transport network-transport-tests tasty tasty-hunit zeromq4-haskell ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion distributed-process + ]; homepage = "https://github.com/tweag/network-transport-zeromq"; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; @@ -126185,6 +128082,8 @@ self: { pname = "network-websocket"; version = "0.3"; sha256 = "75cd59bd534b39db084c73843c6d29c33e8d3557c440ba19ad24b4252acd7814"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base haskell98 network webserver ]; homepage = "http://github.com/michaelmelanson/network-websocket"; description = "WebSocket library"; @@ -126211,9 +128110,9 @@ self: { }) {}; "neural" = callPackage - ({ mkDerivation, ad, array, attoparsec, base, bytestring, deepseq - , directory, doctest, filepath, ghc-typelits-natnormalise, Glob - , hspec, JuicyPixels, kan-extensions, lens, monad-par + ({ mkDerivation, ad, array, attoparsec, base, bytestring, criterion + , deepseq, directory, doctest, filepath, ghc-typelits-natnormalise + , Glob, hspec, JuicyPixels, kan-extensions, lens, monad-par , monad-par-extras, MonadRandom, mtl, parallel, pipes , pipes-bytestring, pipes-safe, pipes-zlib, profunctors, reflection , STMonadTrans, text, transformers, typelits-witnesses, vector @@ -126235,6 +128134,7 @@ self: { array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text ]; testHaskellDepends = [ base doctest Glob hspec MonadRandom ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/brunjlar/neural"; description = "Neural Networks in native Haskell"; license = stdenv.lib.licenses.mit; @@ -126461,6 +128361,25 @@ self: { pname = "nfc"; version = "0.0.1"; sha256 = "524f46e2ccaacf26cd6058fbd7b1e9a27aa62a3338154d9209aa3b49d011d731"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ nfc ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/centromere/nfc#readme"; + description = "libnfc bindings"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {nfc = null;}; + + "nfc_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, nfc }: + mkDerivation { + pname = "nfc"; + version = "0.1.0"; + sha256 = "63b8f1d434c9e20c1df08ab532c4e098871b0788f9d1b8a5ed84bce1abb01167"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ nfc ]; libraryToolDepends = [ c2hs ]; @@ -127022,6 +128941,8 @@ self: { pname = "nonlinear-optimization-ad"; version = "0.2.2"; sha256 = "b263aa4b690d8e62917c2090f0549f341858795514b35015a5b27344df03481d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ad base nonlinear-optimization primitive reflection vector ]; @@ -127059,8 +128980,9 @@ self: { }) {}; "normalization-insensitive" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit - , test-framework, test-framework-hunit, text, unicode-transforms + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , HUnit, test-framework, test-framework-hunit, text + , unicode-transforms }: mkDerivation { pname = "normalization-insensitive"; @@ -127073,6 +128995,7 @@ self: { base bytestring hashable HUnit test-framework test-framework-hunit text ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; homepage = "https://github.com/ppelleti/normalization-insensitive"; description = "Normalization insensitive string comparison"; license = stdenv.lib.licenses.bsd3; @@ -127266,8 +129189,8 @@ self: { }: mkDerivation { pname = "nsis"; - version = "0.3"; - sha256 = "03af564c2edb8f0e0d291403d3b452c496ef3e2ab33d247b73eddfdec08df570"; + version = "0.3.1"; + sha256 = "d747e231d8f22c810e76a1269af4bd778638da7deca3ad3480415fedb5f05c92"; libraryHaskellDepends = [ base transformers uniplate ]; testHaskellDepends = [ base directory process transformers uniplate @@ -127426,7 +129349,7 @@ self: { }) {}; "number-length" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework + ({ mkDerivation, base, criterion, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { @@ -127438,6 +129361,7 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/trskop/number-length"; description = "Number of digits in a number in decimal and hexadecimal representation"; license = stdenv.lib.licenses.bsd3; @@ -127486,8 +129410,8 @@ self: { }) {}; "numerals" = callPackage - ({ mkDerivation, base, containers, fingertree, HUnit, integer-gmp - , QuickCheck, test-framework, test-framework-hunit + ({ mkDerivation, base, containers, criterion, fingertree, HUnit + , integer-gmp, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text }: mkDerivation { @@ -127501,6 +129425,7 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/roelvandijk/numerals"; description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; @@ -127563,6 +129488,8 @@ self: { sha256 = "5327a9ffcc5997a062d2a9ea405130741114a0c6fe440a8e5b6d6c35fe56d8c4"; revision = "1"; editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers deepseq non-negative parsec QuickCheck random storable-record utility-ht @@ -127983,6 +129910,8 @@ self: { pname = "oberon0"; version = "0.0.2"; sha256 = "1b96e40cacb6a00856d55d7059fbefe5aa018a15bf9002189db2868cef7d1e71"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array AspectAG base containers ghc-prim HList mtl murder template-haskell transformers uu-parsinglib uulib @@ -128293,6 +130222,8 @@ self: { pname = "oidc-client"; version = "0.3.0.0"; sha256 = "fcc89cd54d2493bfabbb4e5d76dd77c0f6dc3005207566cc5cf89272979daf4c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring exceptions http-client http-client-tls jose-jwt network network-uri text time tls @@ -128661,6 +130592,8 @@ self: { pname = "opaleye"; version = "0.5.3.0"; sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73"; + revision = "1"; + editedCabalFile = "0188a5df6e42350cafb8771ed56b190451291bc04767a451c0aba76582bbed28"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -128728,8 +130661,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.3.4"; - sha256 = "84925620c5d596657a3d2467e0fbe297fad2876362da7f063d6b6034910d6e60"; + version = "0.3.5"; + sha256 = "9360dd3721ea49d3b738bff65ab518bcf4365d10282ffb3eea05242022ec48fd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128820,8 +130753,8 @@ self: { }) {}; "open-typerep" = callPackage - ({ mkDerivation, base, constraints, mtl, syntactic, tagged - , template-haskell + ({ mkDerivation, base, constraints, criterion, mtl, syntactic + , tagged, template-haskell }: mkDerivation { pname = "open-typerep"; @@ -128831,6 +130764,7 @@ self: { base constraints mtl syntactic tagged template-haskell ]; testHaskellDepends = [ base syntactic ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; @@ -129016,6 +130950,8 @@ self: { pname = "openid"; version = "0.2.0.2"; sha256 = "5a33c21ca3e2b652bcea93bd32a96dbeabd336260d7617337331693a3e140d66"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers HsOpenSSL HTTP monadLib network time xml ]; @@ -129602,8 +131538,8 @@ self: { }) {}; "optimal-blocks" = callPackage - ({ mkDerivation, base, bytestring, bytestring-arbitrary, cryptohash - , deepseq, hex, QuickCheck, vector + ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion + , cryptohash, deepseq, hex, QuickCheck, vector }: mkDerivation { pname = "optimal-blocks"; @@ -129618,6 +131554,9 @@ self: { testHaskellDepends = [ base bytestring bytestring-arbitrary deepseq QuickCheck vector ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq vector + ]; homepage = "https://github.com/tsuraan/optimal-blocks"; description = "Optimal Block boundary determination for rsync-like behaviours"; license = stdenv.lib.licenses.bsd3; @@ -129925,13 +131864,18 @@ self: { }) {}; "order-statistic-tree" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }: + ({ mkDerivation, base, containers, criterion, deepseq, random + , tasty, tasty-hunit, tasty-quickcheck + }: mkDerivation { pname = "order-statistic-tree"; version = "0.1.1.0"; sha256 = "0069ae9ad6ed98ca367026e9c1d6be4c553e6ec451aff0f658532e0ed6a692bd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq random + ]; description = "Order statistic trees based on weight-balanced trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -130340,13 +132284,14 @@ self: { }) {}; "overture" = callPackage - ({ mkDerivation, base, doctest }: + ({ mkDerivation, base, criterion, doctest }: mkDerivation { pname = "overture"; version = "0.0.5"; sha256 = "fcdbff55a72636cfb27694ea6731cd6233fa57af937de08ee34afa80a78a6957"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion ]; description = "An alternative to some of the Prelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -130439,9 +132384,9 @@ self: { }) {}; "packed-dawg" = callPackage - ({ mkDerivation, base, binary, deepseq, HUnit, mtl, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, unordered-containers - , vector, vector-binary-instances + ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , unordered-containers, vector, vector-binary-instances }: mkDerivation { pname = "packed-dawg"; @@ -130456,6 +132401,10 @@ self: { tasty-quickcheck unordered-containers vector vector-binary-instances ]; + benchmarkHaskellDepends = [ + base binary criterion deepseq mtl unordered-containers vector + vector-binary-instances + ]; description = "Generation and traversal of highly compressed directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -130735,15 +132684,15 @@ self: { "pandoc" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , cmark, containers, data-default, deepseq, Diff, directory - , doctemplates, executable-path, extensible-exceptions, filemanip - , filepath, ghc-prim, haddock-library, hslua, HTTP, http-client - , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network - , network-uri, old-time, pandoc-types, parsec, process, QuickCheck - , random, scientific, SHA, skylighting, syb, tagsoup, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , texmath, text, time, unix, unordered-containers, vector, xml - , yaml, zip-archive, zlib + , cmark, containers, criterion, data-default, deepseq, Diff + , directory, doctemplates, executable-path, extensible-exceptions + , filemanip, filepath, ghc-prim, haddock-library, hslua, HTTP + , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl + , network, network-uri, old-time, pandoc-types, parsec, process + , QuickCheck, random, scientific, SHA, skylighting, syb, tagsoup + , temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, texmath, text, time, unix + , unordered-containers, vector, xml, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; @@ -130773,6 +132722,7 @@ self: { skylighting syb test-framework test-framework-hunit test-framework-quickcheck2 text zip-archive ]; + benchmarkHaskellDepends = [ base criterion syb ]; doCheck = false; homepage = "http://pandoc.org"; description = "Conversion between markup formats"; @@ -130838,16 +132788,14 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.4.2"; - sha256 = "fe1121698b9b9804f8ccc43cbbb2e77e40948caa543b42e129bf4ce872a7cd3f"; - revision = "1"; - editedCabalFile = "32a7466f513eaacbe70d359813e5f9fbb6f3492f23019e6588d48bd58ed994c2"; + version = "0.2.5.0"; + sha256 = "d4d93bbe448e2cf187a0b7bcc605d0445e28021e4e31bfef890b93bee2b28491"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-accessor data-accessor-template - data-accessor-transformers data-default mtl pandoc pandoc-types - roman-numerals syb template-haskell utility-ht + data-accessor-transformers data-default directory filepath mtl + pandoc pandoc-types roman-numerals syb template-haskell utility-ht ]; executableHaskellDepends = [ base pandoc pandoc-types ]; testHaskellDepends = [ @@ -130902,8 +132850,8 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "0.1.0"; - sha256 = "f6a14ba6e4d00a27aef573336d6da703a39d1788a5fe9a5d18f080c3486c935c"; + version = "0.2.0"; + sha256 = "0241672e57d3bc0a5fa6ae953cf98d6d702b36076d58eaa64490b5089f377b72"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131618,6 +133566,8 @@ self: { sha256 = "3a14c02b9b8b7c72577eb90a8dd72de75d99192def87d7aa79545ee4d6e80645"; revision = "1"; editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers extensible-exceptions random ]; @@ -132560,8 +134510,8 @@ self: { ({ mkDerivation, array, base, HUnit, split, tasty, tasty-hunit }: mkDerivation { pname = "pathfindingcore"; - version = "1.2"; - sha256 = "88990d5daa4beff64a134e11bfbeb81b4f67367ea0345c3c6c3697ead3e14b74"; + version = "1.2.1"; + sha256 = "d24f4f8af78e7588daf7fad74b9675facc4b367fc25df5e94dbc93407480dfe0"; libraryHaskellDepends = [ array base split ]; testHaskellDepends = [ array base HUnit tasty tasty-hunit ]; homepage = "http://github.com/TheBizzle"; @@ -132578,6 +134528,8 @@ self: { pname = "pathtype"; version = "0.8"; sha256 = "14e3b9d03c222a061ffeb40ecc0940d980e25fddd70339d04ec86dbae6f27897"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base deepseq directory old-time QuickCheck tagged time transformers utility-ht @@ -133233,6 +135185,8 @@ self: { pname = "peggy"; version = "0.3.2"; sha256 = "de689373195748a273ba224adf5eae6dd91ffeee68e4c60ce6230596d521a8ce"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hashtables haskell-src-meta ListLike monad-control mtl template-haskell @@ -133352,6 +135306,8 @@ self: { pname = "penny-lib"; version = "0.22.0.0"; sha256 = "272c53dc6cecc0353d4a6a53a9d8e6e57babdf485b5f9e1995f3a8b87b38c63b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ action-permutations base binary bytestring cereal containers explicit-exception matchers multiarg ofx old-locale parsec prednote @@ -133419,8 +135375,9 @@ self: { }) {}; "perfecthash" = callPackage - ({ mkDerivation, array, base, bytestring, cmph, containers, hspec - , QuickCheck, time + ({ mkDerivation, array, base, bytestring, cmph, containers + , criterion, deepseq, hspec, QuickCheck, random, time + , unordered-containers }: mkDerivation { pname = "perfecthash"; @@ -133432,6 +135389,10 @@ self: { testHaskellDepends = [ base bytestring cmph containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ + array base bytestring containers criterion deepseq random + unordered-containers + ]; description = "A perfect hashing library for mapping bytestrings to values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133795,6 +135756,8 @@ self: { pname = "persistent-odbc"; version = "0.2.0.1"; sha256 = "b751d48392f61d7b2f3b0cda149dedd04eb1a24912c2075c8640de7313956c67"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring conduit containers convertible HDBC HDBC-odbc monad-control monad-logger persistent persistent-template resourcet @@ -133940,8 +135903,10 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.6"; - sha256 = "628670f06cc533adb057649a253e9332aa2b3f69278af8fd32905e9bb00e0ffa"; + version = "2.6.0.1"; + sha256 = "84df1475478f8c4aa7790152c89ffca43a08a32cd933e4062cb219a023e4768c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring conduit containers monad-control monad-logger old-locale persistent resource-pool resourcet text time @@ -133984,8 +135949,8 @@ self: { }) {}; "persistent-vector" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck + , test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "persistent-vector"; @@ -133995,6 +135960,7 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base containers criterion deepseq ]; homepage = "https://github.com/travitch/persistent-vector"; description = "A persistent sequence based on array mapped tries"; license = stdenv.lib.licenses.bsd3; @@ -134320,12 +136286,13 @@ self: { }) {}; "phantom-state" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, criterion, transformers, vector }: mkDerivation { pname = "phantom-state"; version = "0.2.1.2"; sha256 = "f978ef98e810e9a9e53f1479340ba7a28f80a64aba431322959cbf8c620c3811"; libraryHaskellDepends = [ base transformers ]; + benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Phantom State Transformer. Like State Monad, but without values."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134721,6 +136688,8 @@ self: { sha256 = "130f67f8d018b4f988d434d37fa46d908d4d144ccbd005cfd2773a720ba25e4b"; revision = "1"; editedCabalFile = "e89ef8a03720c391eefc8a47c6f947a1b7f4a37762393f45923854e696fcb59b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers mtl parsec picosat pretty ]; @@ -134734,9 +136703,11 @@ self: { }) {}; "picoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , monoid-subclasses, QuickCheck, quickcheck-instances - , quickcheck-unicode, scientific, tasty, tasty-quickcheck, text + ({ mkDerivation, array, attoparsec, base, bytestring + , case-insensitive, containers, criterion, deepseq, directory + , filepath, ghc-prim, hashable, http-types, monoid-subclasses + , parsec, QuickCheck, quickcheck-instances, quickcheck-unicode + , scientific, tasty, tasty-quickcheck, text, unordered-containers , vector }: mkDerivation { @@ -134752,6 +136723,11 @@ self: { quickcheck-instances quickcheck-unicode scientific tasty tasty-quickcheck text vector ]; + benchmarkHaskellDepends = [ + array attoparsec base bytestring case-insensitive criterion deepseq + directory filepath ghc-prim hashable http-types monoid-subclasses + parsec scientific text unordered-containers vector + ]; homepage = "https://bitbucket.org/blamario/picoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; @@ -134885,6 +136861,8 @@ self: { pname = "pinchot"; version = "0.24.0.0"; sha256 = "b9769cdecb718c834d6fb04b62c08482f98cbb2a48c8a810ce83db96eff997e5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers Earley lens pretty-show semigroups template-haskell transformers @@ -134923,8 +136901,9 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck - , test-framework, test-framework-quickcheck2, transformers + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, test-framework + , test-framework-quickcheck2, transformers }: mkDerivation { pname = "pipes"; @@ -134937,6 +136916,9 @@ self: { base mtl QuickCheck test-framework test-framework-quickcheck2 transformers ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -135095,6 +137077,7 @@ self: { base bytestring bzlib directory hspec MonadRandom pipes pipes-bytestring pipes-safe QuickCheck random ]; + benchmarkHaskellDepends = [ base ]; homepage = "https://github.com/chemist/pipes-bzip"; description = "Streaming compression/decompression via pipes"; license = stdenv.lib.licenses.bsd3; @@ -135107,6 +137090,8 @@ self: { pname = "pipes-cacophony"; version = "0.4.1"; sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cacophony memory pipes ]; testHaskellDepends = [ base hlint ]; homepage = "https://github.com/centromere/pipes-cacophony"; @@ -135198,6 +137183,8 @@ self: { pname = "pipes-cliff"; version = "0.12.0.0"; sha256 = "4fc4ce908899d20ed1ea8964cfe38bc547476d6901934cbb82e35e4ada5417c5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base bytestring pipes pipes-safe process stm unix ]; @@ -135297,14 +137284,17 @@ self: { }) {}; "pipes-extra" = callPackage - ({ mkDerivation, base, bytestring, HUnit, mtl, pipes-core - , test-framework, test-framework-hunit, test-framework-th-prime - , transformers + ({ mkDerivation, base, bytestring, conduit, criterion, enumerator + , HUnit, mtl, pipes-core, pipes-zlib, test-framework + , test-framework-hunit, test-framework-th-prime, transformers, zlib + , zlib-conduit, zlib-enum }: mkDerivation { pname = "pipes-extra"; version = "0.2.0"; sha256 = "d9ede8b4a837bdecf8fb4e87a1c0d31b5ded403d0e8d900a0e2ae9e493962b7b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring pipes-core transformers ]; @@ -135312,6 +137302,10 @@ self: { base bytestring HUnit mtl pipes-core test-framework test-framework-hunit test-framework-th-prime ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion enumerator pipes-core pipes-zlib + transformers zlib zlib-conduit zlib-enum + ]; homepage = "https://github.com/pcapriotti/pipes-extra"; description = "Various basic utilities for Pipes"; license = stdenv.lib.licenses.bsd3; @@ -135540,6 +137534,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-misc_0_3_0_0" = callPackage + ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl + , pipes, pipes-category, pipes-concurrency, semigroups, stm + , transformers + }: + mkDerivation { + pname = "pipes-misc"; + version = "0.3.0.0"; + sha256 = "1d204e4b329c0d44eca63ccaeaae74e2ea4e95a2934d81de9de0e09906f061f9"; + libraryHaskellDepends = [ + base clock Decimal lens mmorph mtl pipes pipes-category + pipes-concurrency semigroups stm transformers + ]; + testHaskellDepends = [ + base hspec lens mmorph pipes pipes-concurrency stm transformers + ]; + homepage = "https://github.com/louispan/pipes-misc#readme"; + description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-mongodb" = callPackage ({ mkDerivation, base, monad-control, mongoDB, pipes, text }: mkDerivation { @@ -135884,6 +137900,8 @@ self: { pname = "pipes-zeromq4"; version = "0.2.0.0"; sha256 = "24f3ae9640eb6e2180edb8e0fc12bc420c7fa83aa32605900de1d961d93e92fe"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring pipes pipes-safe semigroups zeromq4-haskell ]; @@ -136221,6 +138239,8 @@ self: { pname = "playlists-http"; version = "0.1.1.0"; sha256 = "2f5eaeba301115124529aeb72c8608838911209ab9a5830f705214c32dbb26cb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring either exceptions http-client mtl playlists text @@ -136437,10 +138457,8 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.5.5.0"; - sha256 = "57012217c22dce398b3574f45af22404be38de96145e5862d1453c599816f6a2"; - revision = "1"; - editedCabalFile = "84dab5882c330bdc39bcecdbc9d8834c4c964241cd4a1ce87d4987947add924a"; + version = "1.5.6.0"; + sha256 = "18d17e53eb9068f7da3fe26b45af8d76a7e76645f7ec59f81552e3486c8a80d0"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random @@ -137186,16 +139204,16 @@ self: { "pontarius-xmpp" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary - , bytestring, Cabal, conduit, configurator, containers, crypto-api - , crypto-random, cryptohash, cryptohash-cryptoapi, data-default - , derive, directory, dns, doctest, exceptions, filepath, hslogger - , hspec, hspec-expectations, HUnit, iproute, lens, lens-family - , lifted-base, mtl, network, profunctors, pureMD5, QuickCheck - , quickcheck-instances, random, ranges, resourcet, smallcheck - , split, stm, stringprep, tasty, tasty-hspec, tasty-hunit - , tasty-quickcheck, tasty-th, template-haskell, text, tls - , transformers, unbounded-delays, void, x509-system, xml-conduit - , xml-picklers, xml-types + , bytestring, Cabal, conduit, configurator, containers, criterion + , crypto-api, crypto-random, cryptohash, cryptohash-cryptoapi + , data-default, derive, directory, dns, doctest, exceptions + , filepath, hslogger, hspec, hspec-expectations, HUnit, iproute + , lens, lens-family, lifted-base, mtl, network, profunctors + , pureMD5, QuickCheck, quickcheck-instances, random, ranges + , resourcet, smallcheck, split, stm, stringprep, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text + , tls, transformers, unbounded-delays, void, x509-system + , xml-conduit, xml-picklers, xml-types }: mkDerivation { pname = "pontarius-xmpp"; @@ -137218,6 +139236,7 @@ self: { tasty-quickcheck tasty-th text tls transformers xml-picklers xml-types ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/pontarius/pontarius-xmpp/"; description = "An XMPP client library"; license = stdenv.lib.licenses.bsd3; @@ -137297,6 +139316,8 @@ self: { pname = "pooled-io"; version = "0.0.2.1"; sha256 = "7d405a8876d55a9c077a304dd378854bc9e6e20f643c357c82bd3f38297ff9d0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base concurrent-split containers deepseq transformers unsafe utility-ht @@ -137520,7 +139541,8 @@ self: { }) {}; "posix-paths" = callPackage - ({ mkDerivation, base, bytestring, doctest, HUnit, QuickCheck, unix + ({ mkDerivation, base, bytestring, criterion, directory, doctest + , filepath, HUnit, process, QuickCheck, unix }: mkDerivation { pname = "posix-paths"; @@ -137530,6 +139552,9 @@ self: { testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory filepath process unix + ]; description = "POSIX filepath/directory functionality"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137635,10 +139660,10 @@ self: { "postgresql-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text - , foldl, json-ast, loch-th, placeholders, postgresql-libpq - , QuickCheck, quickcheck-instances, rerebase, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time - , transformers, uuid, vector + , criterion, foldl, json-ast, loch-th, placeholders + , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase + , scientific, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text, time, transformers, uuid, vector }: mkDerivation { pname = "postgresql-binary"; @@ -137654,6 +139679,7 @@ self: { quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + benchmarkHaskellDepends = [ criterion rerebase ]; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; @@ -137849,21 +139875,20 @@ self: { }) {}; "postgresql-simple-bind" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, case-conversion - , data-default, exceptions, heredoc, hspec, postgresql-simple - , template-haskell, text, time + ({ mkDerivation, attoparsec, base, bytestring, data-default + , exceptions, heredoc, hspec, postgresql-simple, template-haskell + , text, time }: mkDerivation { pname = "postgresql-simple-bind"; - version = "0.3.0.0"; - sha256 = "d80ea7b091a66eac0e3da8fc22804a39ccbb1ca6e4cfa0f2b3b2ffd569e0999a"; + version = "0.4.0"; + sha256 = "a313032f8a8a0c6b97094d396afcd81a04a2d017699a08b5e2cbc2b8309cf284"; libraryHaskellDepends = [ attoparsec base bytestring data-default exceptions heredoc postgresql-simple template-haskell text time ]; testHaskellDepends = [ - attoparsec base bytestring case-conversion data-default hspec - postgresql-simple text + base bytestring hspec postgresql-simple text ]; description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; @@ -138084,6 +140109,8 @@ self: { pname = "postie"; version = "0.5.0.0"; sha256 = "93e32bd30b22c7f6474958abc3f65bf467c1fea403aa130996dab396233f0fc7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring cprng-aes data-default-class mtl network pipes pipes-parse stringsearch tls transformers uuid @@ -138101,6 +140128,8 @@ self: { pname = "postmark"; version = "0.1.1"; sha256 = "5c3d4c458d6b2683a2ec36380c216b05c297ba053cac4ede801531dba35f01ca"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers http-client-tls http-types network-api-support text @@ -138111,6 +140140,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postmark-streams" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, http-streams, io-streams, text, time + }: + mkDerivation { + pname = "postmark-streams"; + version = "0.1.0.0"; + sha256 = "5bc30a4c0688b85a93c91c12b17df0e68449dc45d9da5ba7a75db5e9e3b4fc4e"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring + http-streams io-streams text time + ]; + description = "Send email via Postmark using io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postmaster" = callPackage ({ mkDerivation, adns, base, bytestring, containers, directory , hopenssl, hsdns, hsemail, hsyslog, mtl, network, old-time @@ -138219,9 +140264,9 @@ self: { }) {}; "powerqueue-levelmem" = callPackage - ({ mkDerivation, async, base, bytestring, cereal, dlist, filepath - , focus, hspec, leveldb, leveldb-haskell, list-t, powerqueue - , snappy, stm, stm-containers, temporary, unagi-chan + ({ mkDerivation, async, base, bytestring, cereal, criterion, dlist + , filepath, focus, hspec, leveldb, leveldb-haskell, list-t + , powerqueue, snappy, stm, stm-containers, temporary, unagi-chan }: mkDerivation { pname = "powerqueue-levelmem"; @@ -138235,6 +140280,10 @@ self: { async base cereal hspec powerqueue temporary ]; testSystemDepends = [ leveldb snappy ]; + benchmarkHaskellDepends = [ + base cereal criterion powerqueue temporary + ]; + benchmarkSystemDepends = [ leveldb snappy ]; homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A high performance in memory and LevelDB backend for powerqueue"; license = stdenv.lib.licenses.bsd3; @@ -138428,9 +140477,10 @@ self: { "pred-trie" = callPackage ({ mkDerivation, attoparsec, base, composition-extra, containers - , deepseq, errors, hashable, hashtables, mtl, poly-arity, pred-set - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, tries, unordered-containers + , criterion, deepseq, errors, hashable, hashtables, mtl, poly-arity + , pred-set, QuickCheck, quickcheck-instances, semigroups, sets + , tasty, tasty-hunit, tasty-quickcheck, text, tries + , unordered-containers }: mkDerivation { pname = "pred-trie"; @@ -138446,6 +140496,11 @@ self: { poly-arity QuickCheck quickcheck-instances semigroups tasty tasty-hunit tasty-quickcheck text tries unordered-containers ]; + benchmarkHaskellDepends = [ + attoparsec base composition-extra criterion deepseq hashable mtl + poly-arity QuickCheck semigroups sets text tries + unordered-containers + ]; description = "Predicative tries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -138547,6 +140602,8 @@ self: { pname = "prefork"; version = "0.0.9"; sha256 = "883b866c1c9b3adf2aa1b368db8ac1619666bd0506d3c3f5486e79c49eef2a7f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers data-default process stm system-argv0 system-filepath unix @@ -138656,6 +140713,8 @@ self: { pname = "prelude-plus"; version = "0.0.0.6"; sha256 = "5b4ec409806660b7f06e51e9df2e06caf88219a78785202424fd050750012b8d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base utf8-string ]; description = "Prelude for rest of us"; license = stdenv.lib.licenses.bsd3; @@ -138933,17 +140992,20 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, doctest, Glob - , mtl, parsec, text, transformers + ({ mkDerivation, ansi-terminal, base, containers, criterion + , doctest, Glob, mtl, parsec, text, transformers }: mkDerivation { pname = "pretty-simple"; version = "2.0.0.0"; sha256 = "e64bfc73a962bba3f773e8e271d63e3e25924e1a6febbea7d3935d37ae856fbe"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-terminal base containers mtl parsec text transformers ]; testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/cdepillabout/pretty-simple"; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; @@ -139008,13 +141070,16 @@ self: { }) {}; "prim-spoon" = callPackage - ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, spoon }: + ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck + , spoon + }: mkDerivation { pname = "prim-spoon"; version = "0.1.0"; sha256 = "3349b21d56c9c635c89b679d805e155cf658a26a675f553cbb261d61b776a27c"; libraryHaskellDepends = [ base ghc-prim spoon ]; testHaskellDepends = [ base HUnit QuickCheck spoon ]; + benchmarkHaskellDepends = [ base criterion ghc-prim spoon ]; homepage = "https://github.com/michaeljklein/prim-spoon"; description = "Catch errors thrown from pure computations using primops"; license = stdenv.lib.licenses.bsd3; @@ -139089,12 +141154,15 @@ self: { }) {}; "primitive-simd" = callPackage - ({ mkDerivation, base, ghc-prim, primitive, vector }: + ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive + , random, vector + }: mkDerivation { pname = "primitive-simd"; version = "0.1.0.0"; sha256 = "d131c7a6aedc55c113e71fbc22cd79e2105186fb5e359236de04abe46433b58d"; libraryHaskellDepends = [ base ghc-prim primitive vector ]; + benchmarkHaskellDepends = [ base criterion deepseq random vector ]; description = "SIMD data types and functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -139309,8 +141377,8 @@ self: { }) {}; "probable" = callPackage - ({ mkDerivation, base, mtl, mwc-random, primitive, statistics - , transformers, vector + ({ mkDerivation, base, criterion, mtl, mwc-random, mwc-random-monad + , primitive, statistics, transformers, vector }: mkDerivation { pname = "probable"; @@ -139319,6 +141387,9 @@ self: { libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; + benchmarkHaskellDepends = [ + base criterion mwc-random mwc-random-monad vector + ]; homepage = "http://github.com/alpmestan/probable"; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; @@ -139356,14 +141427,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_5_0_0" = callPackage + "process_1_6_0_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.5.0.0"; - sha256 = "a87b228f52272ef20dd15260e40b3b4550205bac7d42ef0f0c0ad31d1f475c77"; + version = "1.6.0.0"; + sha256 = "3534c9a7e48a0d4417c230f4c6abbc3991e7919ea5a68c7de22729f7fcd8da0b"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -139655,6 +141726,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "product-profunctors_0_8_0_3" = callPackage + ({ mkDerivation, base, contravariant, profunctors, tagged + , template-haskell + }: + mkDerivation { + pname = "product-profunctors"; + version = "0.8.0.3"; + sha256 = "4fa4b1c6ba4f84305ef11e001695a7027f37d4a88bf34996ed3724233ac40cc9"; + libraryHaskellDepends = [ + base contravariant profunctors tagged template-haskell + ]; + testHaskellDepends = [ base profunctors ]; + homepage = "https://github.com/tomjaguarpaw/product-profunctors"; + description = "product-profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prof2dot" = callPackage ({ mkDerivation, base, containers, filepath, haskell98, parsec }: mkDerivation { @@ -139769,6 +141858,8 @@ self: { pname = "progressbar"; version = "0.0.1"; sha256 = "da0e18e771284738de24858b87c96b135c591df5158b1a212b9edcc6fad5ce27"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base io-reactive ]; description = "Progressbar API"; license = stdenv.lib.licenses.bsd3; @@ -139965,8 +142056,8 @@ self: { "prometheus-client" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, containers - , doctest, hspec, mtl, QuickCheck, random-shuffle, stm, time - , transformers, utf8-string + , criterion, doctest, hspec, mtl, QuickCheck, random + , random-shuffle, stm, time, transformers, utf8-string }: mkDerivation { pname = "prometheus-client"; @@ -139980,6 +142071,9 @@ self: { atomic-primops base bytestring containers doctest hspec mtl QuickCheck random-shuffle stm time transformers utf8-string ]; + benchmarkHaskellDepends = [ + base bytestring criterion random utf8-string + ]; homepage = "https://github.com/fimad/prometheus-haskell"; description = "Haskell client library for http://prometheus.io."; license = stdenv.lib.licenses.asl20; @@ -140063,8 +142157,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.3.0"; - sha256 = "dba271f7078786ba229c5dfe72caf4f03b92044506fab82e1a0ed24c555d9172"; + version = "3.3.1"; + sha256 = "32f2d2f709a94805fc89b4368d87cba556e0e80984dceb8b0df242a93a69f635"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140166,6 +142260,8 @@ self: { pname = "proteaaudio"; version = "0.6.5"; sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; libraryToolDepends = [ c2hs ]; @@ -140643,9 +142739,10 @@ self: { }) {}; "psqueues" = callPackage - ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit - , QuickCheck, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, array, base, containers, criterion, deepseq + , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue + , QuickCheck, random, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2, unordered-containers }: mkDerivation { pname = "psqueues"; @@ -140656,6 +142753,10 @@ self: { array base deepseq ghc-prim hashable HUnit QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq fingertree-psqueue ghc-prim + hashable mtl PSQueue random unordered-containers + ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140697,13 +142798,16 @@ self: { }) {}; "publicsuffix" = callPackage - ({ mkDerivation, base, filepath, hspec, template-haskell }: + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: mkDerivation { pname = "publicsuffix"; version = "0.20170109"; sha256 = "1b8c8b6c4eb93604598f5f6b7b671cc72b2f0d50a4dfe174e97a72d9919c1844"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; description = "The publicsuffix list exposed as proper Haskell types"; license = stdenv.lib.licenses.mit; @@ -140947,6 +143051,8 @@ self: { pname = "pulseaudio"; version = "0.0.2.0"; sha256 = "72cbacaf7c94bdaa27c9e0d299a00fe3f31e0cc0f9c2d6e7de9690b3154c078e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers stm unix ]; librarySystemDepends = [ libpulseaudio ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; @@ -141085,7 +143191,7 @@ self: { "pure-zlib" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , bytestring-builder, containers, filepath, fingertree, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "pure-zlib"; @@ -141102,6 +143208,7 @@ self: { base base-compat bytestring filepath HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base base-compat bytestring time ]; homepage = "http://github.com/GaloisInc/pure-zlib"; description = "A Haskell-only implementation of zlib / DEFLATE"; license = stdenv.lib.licenses.bsd3; @@ -141304,6 +143411,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pushbullet-types" = callPackage + ({ mkDerivation, aeson, base, http-api-data, microlens + , microlens-th, scientific, text, time, unordered-containers + }: + mkDerivation { + pname = "pushbullet-types"; + version = "0.1.0.0"; + sha256 = "0b9ecf81378eb74d27102c2253b4ecef75032b25f40242fcb99c7fbbe99df4b4"; + libraryHaskellDepends = [ + aeson base http-api-data microlens microlens-th scientific text + time unordered-containers + ]; + description = "Datatypes used by the Pushbullet APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "pusher-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, MissingH , mtl, SHA, time @@ -141759,8 +143882,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "1.0.0.1"; - sha256 = "ab437b12f05962d92a54a9dbaec62bb1df4cf688434b42ea3d3c958ee2a8278e"; + version = "1.0.0.2"; + sha256 = "b9c758375936269cfc16bd28b82adcbab3e8ed79e48e88fc2e23a8e89ec0d504"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory haskell-qrencode jose-jwt JuicyPixels lens MissingH optparse-applicative process @@ -142097,6 +144220,8 @@ self: { pname = "questioner"; version = "0.1.1.0"; sha256 = "83ab4047671f59832eaa377e3fb3fce547439550f57479dd09e0ad4975250617"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-terminal base readline terminal-size ]; @@ -142895,22 +145020,24 @@ self: { }) {}; "raaz" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hspec, HUnit, mtl - , QuickCheck, transformers, vector + ({ mkDerivation, base, blaze-builder, bytestring, criterion + , deepseq, hspec, HUnit, mtl, pretty, QuickCheck, transformers + , vector }: mkDerivation { pname = "raaz"; - version = "0.0.2"; - sha256 = "89009f7ef7f7f995781f124ef99322eec0f2b820ca926eb529f41680c52b2f7a"; + version = "0.1.0"; + sha256 = "40f9ec9f735fbf45310d717ee39937740a09e8509f16d4950a5f3446a50e8650"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base bytestring deepseq mtl transformers vector - ]; + libraryHaskellDepends = [ base bytestring deepseq mtl vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck transformers vector ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion pretty + ]; homepage = "http://github.com/raaz-crypto/raaz"; description = "The raaz cryptographic library"; license = stdenv.lib.licenses.bsd3; @@ -143015,8 +145142,8 @@ self: { }) {}; "rados-haskell" = callPackage - ({ mkDerivation, async, base, bytestring, containers, hspec, HUnit - , mtl, rados, uuid + ({ mkDerivation, async, base, bytestring, containers, criterion + , hspec, HUnit, mtl, rados, transformers, uuid }: mkDerivation { pname = "rados-haskell"; @@ -143030,6 +145157,9 @@ self: { async base bytestring hspec HUnit mtl uuid ]; testSystemDepends = [ rados ]; + benchmarkHaskellDepends = [ + async base bytestring criterion mtl transformers + ]; homepage = "github"; description = "librados haskell bindings"; license = stdenv.lib.licenses.bsd3; @@ -143239,13 +145369,15 @@ self: { }) {}; "ramus" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }: + ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io + }: mkDerivation { pname = "ramus"; version = "0.1.2"; sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-io ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/NickSeagull/ramus#readme"; description = "Elm signal system for Haskell"; license = stdenv.lib.licenses.mit; @@ -143681,16 +145813,17 @@ self: { "rasa" = callPackage ({ mkDerivation, async, base, bifunctors, containers, data-default , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse - , QuickCheck, quickcheck-instances, text, text-lens, transformers - , yi-rope + , profunctors, QuickCheck, quickcheck-instances, text, text-lens + , transformers, yi-rope }: mkDerivation { pname = "rasa"; - version = "0.1.9"; - sha256 = "8dd969c39222963cf97033e13a141fbc9b1f075b8c7af6428ef72bef9439cf3c"; + version = "0.1.10"; + sha256 = "970bd5b3dfac3a8050e2daea281d15b3b1dc499824cad392225d1e4d483527e8"; libraryHaskellDepends = [ - async base bifunctors containers data-default free lens mtl pipes - pipes-concurrency pipes-parse text text-lens transformers yi-rope + async base bifunctors containers data-default free hspec lens mtl + pipes pipes-concurrency pipes-parse profunctors text text-lens + transformers yi-rope ]; testHaskellDepends = [ base hspec lens QuickCheck quickcheck-instances text yi-rope @@ -143701,20 +145834,19 @@ self: { }) {}; "rasa-example-config" = callPackage - ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-cursors - , rasa-ext-files, rasa-ext-logger, rasa-ext-slate - , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views, rasa-ext-vim + ({ mkDerivation, base, data-default, lens, mtl, rasa + , rasa-ext-cursors, rasa-ext-files, rasa-ext-logger, rasa-ext-slate + , rasa-ext-views, rasa-ext-vim, yi-rope }: mkDerivation { pname = "rasa-example-config"; - version = "0.1.3"; - sha256 = "471525573811177d6d5aaaeff5353ce154f1f44ccf1f29a865439d94b5ceca93"; + version = "0.1.4"; + sha256 = "160d148c51615b71900053186cefa5f12e5530aaae6328424d62bbaca6e7e6cd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-logger - rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-views - rasa-ext-vim + base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files + rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Example user config for Rasa"; @@ -143754,16 +145886,15 @@ self: { }) {}; "rasa-ext-cursors" = callPackage - ({ mkDerivation, base, data-default, lens, mtl, rasa - , rasa-ext-style, text, text-lens, yi-rope + ({ mkDerivation, base, data-default, lens, mtl, rasa, text + , text-lens, yi-rope }: mkDerivation { pname = "rasa-ext-cursors"; - version = "0.1.5"; - sha256 = "81c949b85bf60cb814cedf0fd58d1082cc161ee820caacd86d8754e8dd9f2d93"; + version = "0.1.6"; + sha256 = "c1407b36255825f4708ccffb9b04cdb1cd93da417cc2c337033b10306626390e"; libraryHaskellDepends = [ - base data-default lens mtl rasa rasa-ext-style text text-lens - yi-rope + base data-default lens mtl rasa text text-lens yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext adding cursor(s)"; @@ -143771,16 +145902,16 @@ self: { }) {}; "rasa-ext-files" = callPackage - ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd - , rasa-ext-status-bar, rasa-ext-views, text, yi-rope + ({ mkDerivation, base, data-default, lens, mtl, rasa, rasa-ext-cmd + , rasa-ext-views, text, yi-rope }: mkDerivation { pname = "rasa-ext-files"; - version = "0.1.3"; - sha256 = "094f8127c8266a0f988661ada65d0ff08979025cb1939edff8199cdcfd0da06f"; + version = "0.1.4"; + sha256 = "d824e1eec8ce6b92453e957c10859351c23306463b08bdcdfc5d635471147957"; libraryHaskellDepends = [ - base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar - rasa-ext-views text yi-rope + base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text + yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for filesystem actions"; @@ -143802,16 +145933,15 @@ self: { "rasa-ext-slate" = callPackage ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-logger - , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views - , recursion-schemes, text, vty, yi-rope + , rasa-ext-views, recursion-schemes, text, vty, yi-rope }: mkDerivation { pname = "rasa-ext-slate"; - version = "0.1.6"; - sha256 = "0e11bf0c2e01faf5279dc8b4e2c19f4318d74bc29eb3652966b590b906c2cca8"; + version = "0.1.7"; + sha256 = "6773e509862723cc02776cd05db0dea70a179433a57ab635f37124964738d312"; libraryHaskellDepends = [ - base lens mtl rasa rasa-ext-logger rasa-ext-status-bar - rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope + base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes + text vty yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa extension for rendering to terminal with vty"; @@ -143845,14 +145975,15 @@ self: { "rasa-ext-views" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, mtl, rasa - , recursion-schemes + , recursion-schemes, yi-rope }: mkDerivation { pname = "rasa-ext-views"; - version = "0.1.3"; - sha256 = "28413cc5643edb08b4095deaf973525a77496ce6d17df22915fa17daf2495691"; + version = "0.1.4"; + sha256 = "5542a37a779efe0e97ecbadbed2409414c99705a9298d0dfc5915f56682e11c0"; libraryHaskellDepends = [ base bifunctors data-default lens mtl rasa recursion-schemes + yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext managing rendering views"; @@ -143862,16 +145993,16 @@ self: { "rasa-ext-vim" = callPackage ({ mkDerivation, base, data-default, hspec, lens, mtl, rasa - , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar - , rasa-ext-views, text, text-lens, yi-rope + , rasa-ext-cursors, rasa-ext-files, rasa-ext-views, text, text-lens + , yi-rope }: mkDerivation { pname = "rasa-ext-vim"; - version = "0.1.5"; - sha256 = "bb90b7cf5c3e1a7cf212690e8ae1b58cb58a7ead5defa6e21bd6d0fd5136b9e6"; + version = "0.1.6"; + sha256 = "e97e6d096eee5f02ed022407276653ed33657f82ef708ad8095a3caf1fddb22a"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files - rasa-ext-status-bar rasa-ext-views text text-lens yi-rope + rasa-ext-views text text-lens yi-rope ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/ChrisPenner/rasa/"; @@ -144123,8 +146254,8 @@ self: { }) {}; "rawr" = callPackage - ({ mkDerivation, base, deepseq, doctest, ghc-datasize, ghc-prim - , lens, tasty, tasty-hunit, template-haskell + ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize + , ghc-prim, lens, tasty, tasty-hunit, template-haskell }: mkDerivation { pname = "rawr"; @@ -144134,6 +146265,7 @@ self: { testHaskellDepends = [ base deepseq doctest ghc-datasize lens tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/pkmx/rawr"; description = "Anonymous extensible records"; license = stdenv.lib.licenses.bsd3; @@ -144153,13 +146285,18 @@ self: { }) {}; "raz" = callPackage - ({ mkDerivation, base, deepseq, MonadRandom }: + ({ mkDerivation, base, containers, criterion, deepseq, MonadRandom + , random, transformers + }: mkDerivation { pname = "raz"; version = "0.1.0.0"; sha256 = "ee0c0fcff08e7f2faf28218b61cd5cb0b04031d13c73b71f2f735694eb96c215"; libraryHaskellDepends = [ base deepseq MonadRandom ]; testHaskellDepends = [ base MonadRandom ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq MonadRandom random transformers + ]; homepage = "https://github.com/Lysxia/raz.haskell"; description = "Random Access Zippers"; license = stdenv.lib.licenses.mit; @@ -144258,8 +146395,8 @@ self: { }) {}; "rdf" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, deepseq, dlist, fgl - , text, transformers + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , dlist, fgl, text, transformers }: mkDerivation { pname = "rdf"; @@ -144268,16 +146405,20 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring deepseq dlist fgl text transformers ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; homepage = "https://github.com/traviswhitaker/rdf"; description = "Representation and Incremental Processing of RDF Data"; license = stdenv.lib.licenses.mit; }) {}; "rdf4h" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, hashable, hgal, HTTP, HUnit, hxt, network, network-uri - , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck - , text, text-binary, unordered-containers, utf8-string + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, directory, hashable, hgal, HTTP, HUnit, hxt, network + , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit + , tasty-quickcheck, text, text-binary, unordered-containers + , utf8-string }: mkDerivation { pname = "rdf4h"; @@ -144297,6 +146438,7 @@ self: { base bytestring containers directory HUnit network network-uri QuickCheck safe tasty tasty-hunit tasty-quickcheck text ]; + benchmarkHaskellDepends = [ base criterion text ]; homepage = "https://github.com/robstewart57/rdf4h"; description = "A library for RDF processing in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -144371,6 +146513,8 @@ self: { pname = "react-flux"; version = "1.2.3"; sha256 = "65c868e8b6522b1042d4d53aa9eb0e5cd4fe34a0e6bbae8f56279440bfbfb1c7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring deepseq mtl template-haskell text time unordered-containers @@ -144526,8 +146670,8 @@ self: { }: mkDerivation { pname = "reactive-banana-gi-gtk"; - version = "0.1.0.0"; - sha256 = "adb56a19f5021b446929620bdb6a3977194d1e47698f192173f7e7e169821f30"; + version = "0.2.0.0"; + sha256 = "8ae81b3609e83f24765f31c0c50ccca88da9cd70a2a8566bff4727673becf615"; libraryHaskellDepends = [ base gi-gtk haskell-gi-base reactive-banana text transformers ]; @@ -144574,6 +146718,8 @@ self: { pname = "reactive-banana-threepenny"; version = "0.7.1.3"; sha256 = "2a51bbecf637916ac67cd8803fd08072927bb38024c10e857a5677960f5e60b9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Examples for the reactive-banana library, using threepenny-gui"; @@ -144588,6 +146734,8 @@ self: { version = "1.1.1.0"; sha256 = "790e671d7eadfeacd7a21e4e415e7e79b1e885ef3b01aa1c6848ca8b0dabfefb"; configureFlags = [ "-f-buildexamples" ]; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base cabal-macosx reactive-banana wx wxcore ]; @@ -144768,6 +146916,8 @@ self: { pname = "read-editor"; version = "0.1.0.2"; sha256 = "ed8aeca86823fbaf11a0a543fd106c9c3abe65216ea974ed56050cbebf777085"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base directory process ]; homepage = "https://github.com/yamadapc/haskell-read-editor"; description = "Opens a temporary file on the system's EDITOR and returns the resulting edits"; @@ -144812,6 +146962,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "readcsv" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "readcsv"; + version = "0.1"; + sha256 = "dc30c00dd05156749ff38d42eed15c73a493fc0b66b630eab256c4e359456c88"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/george-steel/readcsv"; + description = "Lightweight CSV parser/emitter based on ReadP"; + license = stdenv.lib.licenses.mit; + }) {}; + "readline" = callPackage ({ mkDerivation, base, ncurses, process, readline }: mkDerivation { @@ -145038,8 +147200,8 @@ self: { }) {}; "record-preprocessor" = callPackage - ({ mkDerivation, base, base-prelude, conversion, conversion-text - , record-syntax, text + ({ mkDerivation, base, base-prelude, basic-lens, conversion + , conversion-text, record, record-syntax, text }: mkDerivation { pname = "record-preprocessor"; @@ -145050,6 +147212,7 @@ self: { executableHaskellDepends = [ base base-prelude conversion conversion-text record-syntax text ]; + benchmarkHaskellDepends = [ base-prelude basic-lens record ]; doHaddock = false; homepage = "https://github.com/nikita-volkov/record-preprocessor"; description = "Compiler preprocessor introducing a syntactic extension for anonymous records"; @@ -145073,6 +147236,9 @@ self: { testHaskellDepends = [ base base-prelude directory doctest filepath hspec record ]; + benchmarkHaskellDepends = [ + base-prelude conversion conversion-text record text + ]; homepage = "https://github.com/nikita-volkov/record-syntax"; description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records"; license = stdenv.lib.licenses.mit; @@ -145236,8 +147402,8 @@ self: { "redis-io" = callPackage ({ mkDerivation, async, attoparsec, auto-update, base, bytestring - , bytestring-conversion, containers, exceptions, iproute - , monad-control, mtl, network, operational, redis-resp + , bytestring-conversion, containers, criterion, exceptions, hedis + , iproute, monad-control, mtl, network, operational, redis-resp , resource-pool, semigroups, stm, tasty, tasty-hunit, time, tinylog , transformers, transformers-base }: @@ -145255,6 +147421,9 @@ self: { async base bytestring bytestring-conversion containers redis-resp tasty tasty-hunit tinylog transformers ]; + benchmarkHaskellDepends = [ + base bytestring criterion hedis redis-resp tinylog transformers + ]; homepage = "https://gitlab.com/twittner/redis-io/"; description = "Yet another redis client"; license = stdenv.lib.licenses.mpl20; @@ -145367,14 +147536,16 @@ self: { }) {}; "reedsolomon" = callPackage - ({ mkDerivation, base, bytestring, exceptions, gitrev, loop, mtl - , primitive, profunctors, QuickCheck, random, tasty, tasty-ant-xml - , tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, base, bytestring, criterion, exceptions, gitrev + , loop, mtl, primitive, profunctors, QuickCheck, random, tasty + , tasty-ant-xml, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "reedsolomon"; version = "0.0.4.3"; sha256 = "b74acd24ee1524e684860a20a8bf44eea5524ff8fd22c6efd0baf20bb5a0a42b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring exceptions gitrev loop mtl primitive profunctors vector @@ -145384,6 +147555,9 @@ self: { QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base criterion exceptions loop mtl primitive vector + ]; homepage = "http://github.com/NicolasT/reedsolomon"; description = "Reed-Solomon Erasure Coding in Haskell"; license = stdenv.lib.licenses.mit; @@ -145602,10 +147776,11 @@ self: { }) {}; "reflex" = callPackage - ({ mkDerivation, base, containers, dependent-map, dependent-sum - , exception-transformers, haskell-src-exts, haskell-src-meta - , MemoTrie, mtl, primitive, ref-tf, semigroups, syb - , template-haskell, these, transformers, transformers-compat + ({ mkDerivation, base, containers, criterion, deepseq + , dependent-map, dependent-sum, exception-transformers + , haskell-src-exts, haskell-src-meta, MemoTrie, mtl, primitive + , ref-tf, semigroups, split, stm, syb, template-haskell, these + , transformers, transformers-compat }: mkDerivation { pname = "reflex"; @@ -145621,6 +147796,10 @@ self: { testHaskellDepends = [ base containers dependent-map MemoTrie mtl ref-tf ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dependent-map dependent-sum mtl + primitive ref-tf split stm transformers + ]; homepage = "https://github.com/reflex-frp/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; @@ -145897,6 +148076,8 @@ self: { pname = "refresht"; version = "0.1.1.0"; sha256 = "07350b47c06d2a1466419b33fa6983dd289fa33713c046b57f2ec92303bc633f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; homepage = "https://github.com/konn/refresht#readme"; description = "Environment Monad with automatic resource refreshment"; @@ -145925,8 +148106,8 @@ self: { }: mkDerivation { pname = "regex"; - version = "0.2.0.1"; - sha256 = "43ee04802ef3a4d6884cd97c73a261277d89eaa80abc31f148bd0b8f9c6f4a31"; + version = "0.3.0.0"; + sha256 = "f0f8c9722a601edfc2fb7963956f331f3dd1e1655fafb07758aad6defea579de"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable heredoc regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text @@ -146084,8 +148265,8 @@ self: { }: mkDerivation { pname = "regex-examples"; - version = "0.2.0.1"; - sha256 = "73b95d1ca92342fff14b2a5f634b8b1a703d22e6a32140a6f0faea2c68ca55a1"; + version = "0.3.0.0"; + sha256 = "c274ffacf3eeecb9e9530d07fd44dd0539c8225923ae0cb82b5d48ad6333903b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146712,13 +148893,16 @@ self: { }) {}; "reinterpret-cast" = callPackage - ({ mkDerivation, array, base, data-binary-ieee754, hspec, loop }: + ({ mkDerivation, array, base, criterion, data-binary-ieee754, hspec + , loop + }: mkDerivation { pname = "reinterpret-cast"; version = "0.1.0"; sha256 = "5654622c904b42c62f2473c64624715dbd458ea00209ed9ab39396eabc1353e4"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base data-binary-ieee754 hspec loop ]; + benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ]; homepage = "https://github.com/nh2/reinterpret-cast"; description = "Memory reinterpretation casts for Float/Double and Word32/Word64"; license = stdenv.lib.licenses.mit; @@ -146857,6 +149041,8 @@ self: { pname = "relational-record-examples"; version = "0.3.1.1"; sha256 = "56d726b946e454390b4efbda9e7effe11343c88aeb6390f9516b51445e96a242"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base HDBC HDBC-session HDBC-sqlite3 persistable-record relational-query relational-query-HDBC relational-schemas @@ -147328,8 +149514,9 @@ self: { }) {}; "repa-fftw" = callPackage - ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, carray, criterion, deepseq, fft, random + , repa, repa-algorithms, storable-complex, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "repa-fftw"; @@ -147339,6 +149526,9 @@ self: { testHaskellDepends = [ base repa tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq random repa repa-algorithms + ]; description = "Perform fft with repa via FFTW"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147447,6 +149637,8 @@ self: { pname = "repa-sndfile"; version = "3.2.3.3"; sha256 = "68bee7a0b5fb4afefc77235987b2bff74b8e60c0d0b46aa3ba8a057d226cf95d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hsndfile repa ]; testHaskellDepends = [ base directory filepath hsndfile hsndfile-vector repa vector @@ -147707,7 +149899,7 @@ self: { "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , http-client, req, resourcet, temporary, transformers + , http-client, req, resourcet, temporary, transformers, weigh }: mkDerivation { pname = "req-conduit"; @@ -147722,6 +149914,9 @@ self: { base bytestring conduit conduit-extra hspec req resourcet temporary transformers ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-extra req resourcet temporary weigh + ]; homepage = "https://github.com/mrkkrp/req-conduit"; description = "Conduit helpers for the req HTTP client library"; license = stdenv.lib.licenses.bsd3; @@ -147773,8 +149968,9 @@ self: { }) {}; "reroute" = callPackage - ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data - , hvect, mtl, text, unordered-containers, vector + ({ mkDerivation, base, criterion, deepseq, graph-core, hashable + , hspec, http-api-data, hvect, mtl, random, regex-compat, text + , unordered-containers, vector }: mkDerivation { pname = "reroute"; @@ -147787,6 +149983,10 @@ self: { testHaskellDepends = [ base hspec hvect mtl text unordered-containers vector ]; + benchmarkHaskellDepends = [ + base criterion deepseq graph-core hashable http-api-data hvect mtl + random regex-compat text unordered-containers vector + ]; homepage = "http://github.com/agrafix/Spock"; description = "abstract implementation of typed and untyped web routing"; license = stdenv.lib.licenses.mit; @@ -148294,20 +150494,24 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , containers, data-default, doctest, mtl, network, scientific, text - , time, unordered-containers, utf8-string, vector + ({ mkDerivation, aeson, async, base, base64-bytestring, binary + , bytestring, containers, criterion, data-default, doctest, mtl + , network, scientific, text, time, unordered-containers + , utf8-string, vector }: mkDerivation { pname = "rethinkdb"; version = "2.2.0.8"; sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring containers data-default mtl network scientific text time unordered-containers utf8-string vector ]; testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ aeson async base criterion text ]; homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; @@ -148315,9 +150519,9 @@ self: { "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , hashable, hspec, hspec-smallcheck, mtl, network, old-locale - , scientific, smallcheck, stm, template-haskell, text, time - , unordered-containers, vector + , criterion, hashable, hspec, hspec-smallcheck, mtl, network + , old-locale, scientific, smallcheck, stm, template-haskell, text + , time, unordered-containers, vector }: mkDerivation { pname = "rethinkdb-client-driver"; @@ -148334,6 +150538,9 @@ self: { base hspec hspec-smallcheck smallcheck text time unordered-containers vector ]; + benchmarkHaskellDepends = [ + base criterion text time unordered-containers vector + ]; homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; @@ -148574,6 +150781,8 @@ self: { pname = "rfc5051"; version = "0.1.0.3"; sha256 = "e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; description = "Simple unicode collation as per RFC5051"; license = stdenv.lib.licenses.bsd3; @@ -148600,7 +150809,7 @@ self: { "riak" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder - , bytestring, containers, data-default-class, deepseq + , bytestring, containers, criterion, data-default-class, deepseq , enclosed-exceptions, exceptions, hashable, HUnit , mersenne-random-pure64, monad-control, mtl, network , protocol-buffers, pureMD5, QuickCheck, random, resource-pool @@ -148623,6 +150832,7 @@ self: { base bytestring containers data-default-class HUnit mtl QuickCheck riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck text ]; + benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; homepage = "http://github.com/markhibberd/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; @@ -148993,26 +151203,23 @@ self: { "rlwe-challenges" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers , directory, DRBG, filepath, http-client, http-conduit, lol - , MonadRandom, mtl, nist-beacon, options, parsec, protocol-buffers - , protocol-buffers-descriptor, reflection, tagged, time - , transformers + , lol-cpp, MonadRandom, mtl, nist-beacon, options, parsec + , protocol-buffers, protocol-buffers-descriptor, reflection, tagged + , time }: mkDerivation { pname = "rlwe-challenges"; - version = "0.0.0.1"; - sha256 = "6a4c81357d92850790834fd570cd32c50bf07f0d80cf5f1c402c044588dc76f5"; - revision = "7"; - editedCabalFile = "71843308056de4beca80a87b7585129e14f2da528abc559f328af1b1c039d0f1"; + version = "0.1.0.1"; + sha256 = "f6e944ae436badc1bb3da258e54ef097eb1bd1fc05a656b89fb973a389f9f9e3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base lol MonadRandom protocol-buffers protocol-buffers-descriptor - ]; - executableHaskellDepends = [ ansi-terminal base bytestring containers directory DRBG filepath - http-client http-conduit lol MonadRandom mtl nist-beacon options - parsec protocol-buffers reflection tagged time transformers + http-client http-conduit lol lol-cpp MonadRandom mtl nist-beacon + parsec protocol-buffers protocol-buffers-descriptor reflection + tagged time ]; + executableHaskellDepends = [ ansi-terminal base options time ]; homepage = "https://github.com/cpeikert/Lol"; description = "Ring-LWE/LWR challenges using Lol"; license = stdenv.lib.licenses.gpl2; @@ -149038,9 +151245,9 @@ self: { "rncryptor" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring - , bytestring-arbitrary, cryptonite, fastpbkdf2, io-streams, memory - , mtl, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck - , text + , bytestring-arbitrary, criterion, cryptonite, fastpbkdf2 + , io-streams, memory, mtl, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "rncryptor"; @@ -149059,6 +151266,7 @@ self: { base base16-bytestring bytestring bytestring-arbitrary cryptonite io-streams QuickCheck tasty tasty-hunit tasty-quickcheck text ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; }) {}; @@ -149339,8 +151547,8 @@ self: { }: mkDerivation { pname = "rosa"; - version = "0.3.0.0"; - sha256 = "3779cc49176bc37088ce1d08fe35c45c6292e8645ddd3c64e97e9cfe2f13634c"; + version = "0.3.1.0"; + sha256 = "b363a0669623bd0edc46bf755ecdb34dc59121c302735515fd56a808567e7e42"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149352,9 +151560,9 @@ self: { }) {}; "rose-trees" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, mtl - , QuickCheck, quickcheck-instances, semigroupoids, semigroups, sets - , tasty, tasty-quickcheck, unordered-containers, witherable + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups + , sets, tasty, tasty-quickcheck, unordered-containers, witherable }: mkDerivation { pname = "rose-trees"; @@ -149370,6 +151578,11 @@ self: { semigroupoids semigroups sets tasty tasty-quickcheck unordered-containers witherable ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; description = "A collection of rose tree structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149628,6 +151841,8 @@ self: { pname = "roundtrip-xml"; version = "0.3.0.5"; sha256 = "35599e1f8ed46f1583dbcfd53caab4c3956dd7ad9c18d5705c41aaa8742286be"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blaze-builder blaze-builder-enumerator bytestring containers enumerator mtl pretty reference roundtrip roundtrip-string safe @@ -149749,6 +151964,8 @@ self: { pname = "rpm"; version = "0.0.1"; sha256 = "9f2c95adfa873b55e56516ebb2a3c320914931d300b50ad1659d704669706af3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base directory filepath HaXml process ]; description = "Cozy little project to question unruly rpm packages"; license = stdenv.lib.licenses.bsd3; @@ -149852,6 +152069,8 @@ self: { pname = "rss-conduit"; version = "0.3.0.0"; sha256 = "370a507c6df71af1bdce4c27381ebaa2c87664c5ae6e853e9f43c927e3345f5c"; + revision = "1"; + editedCabalFile = "3f56fc5d8b09d690e1d7bd4059cd31361cea9f1300b0ce909def41066376f7a5"; libraryHaskellDepends = [ base conduit conduit-combinators containers lens-simple mono-traversable safe safe-exceptions text time timerep @@ -149928,8 +152147,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.1.7"; - sha256 = "1d9628bceacfbfad0d5d6add0e302ea6aae6aa4ae4fd179f23aa83fdada17f75"; + version = "0.1.9"; + sha256 = "f5187739a6c450ed71299c1bb2b077751c45df297d18be8af80e0c8941b6f850"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150292,6 +152511,8 @@ self: { pname = "s-cargot"; version = "0.1.1.1"; sha256 = "5ac3d9e1a58763943249b3d7ac174ff3f17dec7a7508f984b8c1efc2a1c51c60"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base parsec QuickCheck text ]; homepage = "https://github.com/aisamanra/s-cargot"; @@ -150811,6 +153032,8 @@ self: { pname = "sample-frame"; version = "0.0.3"; sha256 = "5baf301a4f7b2d52e6b9b9c06b10afd3938de0be6d09736d0188616cd9027247"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base QuickCheck storable-record ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Handling of samples in an (audio) signal"; @@ -150830,8 +153053,8 @@ self: { }) {}; "sampling" = callPackage - ({ mkDerivation, base, containers, foldl, mwc-random, primitive - , vector + ({ mkDerivation, base, containers, criterion, foldl, mwc-random + , primitive, vector }: mkDerivation { pname = "sampling"; @@ -150841,6 +153064,7 @@ self: { base containers foldl mwc-random primitive vector ]; testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/jtobin/sampling"; description = "Sample values from collections"; license = stdenv.lib.licenses.mit; @@ -150852,9 +153076,13 @@ self: { pname = "samtools"; version = "0.2.4.3"; sha256 = "da91b82c0ce87b1f1f2775f7b1dd05352ceb918e79a926fc32ede324a9582086"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring seqloc vector ]; librarySystemDepends = [ zlib ]; libraryToolDepends = [ c2hs ]; + executableSystemDepends = [ zlib ]; + executableToolDepends = [ c2hs ]; homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Binding to the C samtools library"; license = stdenv.lib.licenses.mit; @@ -150904,6 +153132,8 @@ self: { pname = "samtools-iteratee"; version = "0.2.2.1"; sha256 = "d4807605be6092c876ca779b2e74beb1ea4c8f8d0338fdcc28ba804a07b82c8d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring iteratee samtools transformers ]; @@ -150913,8 +153143,9 @@ self: { }) {}; "sandi" = callPackage - ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit - , stringsearch, tasty, tasty-hunit, tasty-quickcheck, tasty-th + ({ mkDerivation, base, bytestring, conduit, criterion, exceptions + , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck + , tasty-th }: mkDerivation { pname = "sandi"; @@ -150926,6 +153157,7 @@ self: { testHaskellDepends = [ base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "http://hackage.haskell.org/package/sandi"; description = "Data encoding library"; license = stdenv.lib.licenses.bsd3; @@ -151158,8 +153390,8 @@ self: { }) {}; "say" = callPackage - ({ mkDerivation, base, bytestring, hspec, temporary, text - , transformers + ({ mkDerivation, base, bytestring, criterion, hspec, temporary + , text, transformers }: mkDerivation { pname = "say"; @@ -151167,6 +153399,9 @@ self: { sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40"; libraryHaskellDepends = [ base bytestring text transformers ]; testHaskellDepends = [ base bytestring hspec temporary text ]; + benchmarkHaskellDepends = [ + base bytestring criterion temporary text + ]; homepage = "https://github.com/fpco/say#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; @@ -151175,10 +153410,10 @@ self: { "sbp" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-combinators, conduit-extra, data-binary-ieee754, lens - , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, unordered-containers - , yaml + , conduit-combinators, conduit-extra, criterion + , data-binary-ieee754, lens, monad-loops, QuickCheck, resourcet + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , unordered-containers, yaml }: mkDerivation { pname = "sbp"; @@ -151199,6 +153434,10 @@ self: { aeson base base64-bytestring basic-prelude bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + aeson base base64-bytestring basic-prelude binary bytestring + criterion + ]; homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; @@ -151392,8 +153631,9 @@ self: { }) {}; "scalpel-core" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default, fail - , HUnit, regex-base, regex-tdfa, tagsoup, text, vector + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, fail, HUnit, regex-base, regex-tdfa, tagsoup, text + , vector }: mkDerivation { pname = "scalpel-core"; @@ -151404,6 +153644,7 @@ self: { tagsoup text vector ]; testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; + benchmarkHaskellDepends = [ base criterion tagsoup text ]; homepage = "https://github.com/fimad/scalpel"; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; @@ -151437,13 +153678,18 @@ self: { }) {}; "scanner" = callPackage - ({ mkDerivation, base, bytestring, hspec }: + ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion + , hspec, text + }: mkDerivation { pname = "scanner"; version = "0.2"; sha256 = "3a020d68a0372a5211c72e55eeb299738ea608d17184bc68f74d31ebe667a5e9"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring cereal criterion text + ]; homepage = "https://github.com/Yuras/scanner"; description = "Fast non-backtracking incremental combinator parsing for bytestrings"; license = stdenv.lib.licenses.bsd3; @@ -151615,8 +153861,8 @@ self: { "scholdoc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html - , blaze-markup, bytestring, containers, data-default, Diff - , directory, executable-path, extensible-exceptions, filepath + , blaze-markup, bytestring, containers, criterion, data-default + , Diff, directory, executable-path, extensible-exceptions, filepath , highlighting-kate, hslua, HTTP, http-client, http-client-tls , http-types, HUnit, JuicyPixels, mtl, network, network-uri , old-locale, old-time, parsec, process, QuickCheck, random @@ -151651,6 +153897,7 @@ self: { HUnit process QuickCheck scholdoc-types syb test-framework test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format"; license = "GPL"; @@ -151700,6 +153947,8 @@ self: { pname = "scholdoc-texmath"; version = "0.1.0.1"; sha256 = "2939f906890eb13f488013f787f09ef1e35ee12b29cf06e729638fe15a29cb17"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers mtl parsec scholdoc-types syb xml ]; @@ -151781,10 +154030,10 @@ self: { }) {}; "scientific" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck - , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, text, vector + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms + , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, vector }: mkDerivation { pname = "scientific"; @@ -151798,6 +154047,7 @@ self: { base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml tasty-hunit tasty-quickcheck tasty-smallcheck text ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/basvandijk/scientific"; description = "Numbers represented using scientific notation"; license = stdenv.lib.licenses.bsd3; @@ -152411,6 +154661,8 @@ self: { pname = "sdl2"; version = "2.2.0"; sha256 = "5a3a83fad8936539a4ff1a4a845f2a30b859d2d62e1cda7ab1f39cb59378c484"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring exceptions linear StateVar text transformers vector ]; @@ -152426,6 +154678,8 @@ self: { pname = "sdl2-cairo"; version = "0.1.0.2"; sha256 = "e536adc0c2439267d3496cb5d33899c83d2e6d8debf2d56c69abd3c947704a86"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ]; description = "Render with Cairo on SDL textures. Includes optional convenience drawing API."; license = stdenv.lib.licenses.mit; @@ -152454,6 +154708,8 @@ self: { pname = "sdl2-compositor"; version = "1.2.0.5"; sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base lens linear lrucache QuickCheck sdl2 StateVar stm text transformers @@ -152557,11 +154813,12 @@ self: { "sdr" = callPackage ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart - , Chart-cairo, colour, containers, Decimal, dynamic-graph, either - , fftwRaw, GLFW-b, mwc-random, OpenGL, optparse-applicative, pango - , pipes, pipes-bytestring, pipes-concurrency, primitive - , pulse-simple, QuickCheck, rtlsdr, storable-complex - , test-framework, test-framework-quickcheck2, time, tuple, vector + , Chart-cairo, colour, containers, criterion, Decimal + , dynamic-graph, either, fftwRaw, GLFW-b, mwc-random, OpenGL + , optparse-applicative, pango, pipes, pipes-bytestring + , pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr + , storable-complex, test-framework, test-framework-quickcheck2 + , time, tuple, vector }: mkDerivation { pname = "sdr"; @@ -152578,6 +154835,9 @@ self: { base primitive QuickCheck storable-complex test-framework test-framework-quickcheck2 vector ]; + benchmarkHaskellDepends = [ + base criterion primitive storable-complex vector + ]; homepage = "https://github.com/adamwalker/sdr"; description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; @@ -152614,8 +154874,8 @@ self: { ({ mkDerivation, base, bytestring, free, mtl, text }: mkDerivation { pname = "seakale"; - version = "0.1.0.0"; - sha256 = "c1aebae23aaa611db361eb2327fba0d90b3559d5ab8702417696e80c6e6254ea"; + version = "0.2.0.0"; + sha256 = "cdbab7220b1935ef18dd78113fd87981371492d904a1e07d2911c94dcf2b2349"; libraryHaskellDepends = [ base bytestring free mtl text ]; description = "Pure SQL layer on top of other libraries"; license = stdenv.lib.licenses.bsd3; @@ -152627,8 +154887,8 @@ self: { }: mkDerivation { pname = "seakale-postgresql"; - version = "0.1.1.0"; - sha256 = "e13909695f1c4b1aa4615c2e2d586a352e42a144cbb7552fe0d029702d9f5533"; + version = "0.2.0.0"; + sha256 = "f7205329cf6388331f77da685cfc9e742130e6714d6a2103e57a5cd6cf49b9ac"; libraryHaskellDepends = [ base bytestring free mtl postgresql-libpq seakale time ]; @@ -152642,8 +154902,8 @@ self: { }: mkDerivation { pname = "seakale-tests"; - version = "0.1.0.0"; - sha256 = "bbd5c83a6335dca7f06bf8b7943e80bd3186530ff621d25b00b3a8a3950cec52"; + version = "0.1.0.1"; + sha256 = "ac54690de63000b5492d85b4009e5e6d3baab645726e06d4f099b990ce707508"; libraryHaskellDepends = [ base bytestring free mtl recursion-schemes seakale ]; @@ -153140,6 +155400,8 @@ self: { pname = "semiring"; version = "0.3"; sha256 = "befab81cfef9ae6499f44fdd93a2bc892f118b335462bcf2010aba4254f1a6ac"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base Boolean containers monoids ]; homepage = "http://github.com/srush/SemiRings/tree/master"; description = "Semirings, ring-like structures used for dynamic programming applications"; @@ -153177,8 +155439,8 @@ self: { }) {}; "semver" = callPackage - ({ mkDerivation, attoparsec, base, deepseq, tasty, tasty-hunit - , text + ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty + , tasty-hunit, text }: mkDerivation { pname = "semver"; @@ -153186,6 +155448,7 @@ self: { sha256 = "36d3369706836d60f3bc517f30c6860734481866363723904b8768823b6bc8b1"; libraryHaskellDepends = [ attoparsec base deepseq text ]; testHaskellDepends = [ base tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion text ]; homepage = "https://github.com/brendanhay/semver"; description = "Representation, manipulation, and de/serialisation of Semantic Versions"; license = "unknown"; @@ -153517,6 +155780,8 @@ self: { pname = "sequent-core"; version = "0.5.0.1"; sha256 = "cd0a56a9fad3b7b0f53fd2e913f16a7d3c9472d0925f2ec56ed0da6c41ce39e1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers ghc transformers ]; @@ -153883,14 +156148,17 @@ self: { "servant-auth-cookie" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , cereal, cookie, cryptonite, data-default, deepseq, exceptions - , hspec, http-api-data, http-types, memory, mtl, QuickCheck - , servant, servant-server, tagged, time, transformers, wai + , cereal, cookie, criterion, cryptonite, data-default, deepseq + , exceptions, hspec, http-api-data, http-types, memory, mtl + , QuickCheck, servant, servant-server, tagged, time, transformers + , wai }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4.3.2"; - sha256 = "faf62ad020d449638c3059847f16af7d72bfa623d9f5a8ad375e2add9f2c2e3c"; + version = "0.4.3.3"; + sha256 = "40376b033b2bd4d78ad327d0b83c2d2dcce05406fb5fbb4fd49e306f30dfee10"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring cereal cookie cryptonite data-default exceptions http-api-data http-types memory @@ -153900,6 +156168,9 @@ self: { base bytestring cereal cryptonite data-default deepseq hspec QuickCheck servant-server time ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite servant-server + ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -154012,22 +156283,23 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.2.0"; - sha256 = "ffec3373f25cabc2b182ea7226fff9e43a151c02e603780e5848a5ea03ee48b4"; + version = "0.2.4.0"; + sha256 = "c61e2d4b8de2aee42713fd30f37532ae60c19527ea06601e656c595102c6bbf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data jose lens monad-time mtl - servant-auth servant-server text time unordered-containers wai + data-default-class entropy http-api-data http-types jose lens + monad-time mtl servant-auth servant-server text time + unordered-containers wai ]; executableHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data jose lens markdown-unlit - monad-time mtl servant-auth servant-server text time transformers - unordered-containers wai warp + data-default-class entropy http-api-data http-types jose lens + markdown-unlit monad-time mtl servant-auth servant-server text time + transformers unordered-containers wai warp ]; testHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring @@ -154254,6 +156526,8 @@ self: { pname = "servant-db-postgresql"; version = "0.2.1.0"; sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers postgresql-query postgresql-simple servant servant-db text @@ -154382,6 +156656,8 @@ self: { pname = "servant-elm"; version = "0.4.0.1"; sha256 = "69b3a5dcbb680fc1e923d76afa8255987d4613e0d4387eb493de071c9842ffc5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base elm-export lens servant servant-foreign text wl-pprint-text ]; @@ -154523,6 +156799,8 @@ self: { pname = "servant-jquery"; version = "0.4.4.7"; sha256 = "f3e7ba3e47ab318fc448f0539b4e58e8d82a5e9b32e3a6a6b5dea849dd7d11b1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; testHaskellDepends = [ base hspec hspec-expectations language-ecmascript lens servant @@ -154540,10 +156818,10 @@ self: { }: mkDerivation { pname = "servant-js"; - version = "0.9.1"; - sha256 = "bbc8a860d7b84f716fcff7337654115cf6b7ba756d9a325cc0b1124cf82ade27"; - revision = "2"; - editedCabalFile = "babc912d297dfde6d2f7ae019458ae5d5f363b5930566a7827df219746aad537"; + version = "0.9.2"; + sha256 = "ad4676667cdd72f5bafac5c2d6de710b9c0082131b72dd117026fecb0d544369"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base-compat charset lens servant servant-foreign text ]; @@ -154769,17 +157047,18 @@ self: { "servant-pushbullet-client" = callPackage ({ mkDerivation, aeson, base, http-api-data, http-client - , http-client-tls, microlens, microlens-th, scientific, servant - , servant-client, text, time, unordered-containers + , http-client-tls, microlens, microlens-th, pushbullet-types + , scientific, servant, servant-client, text, time + , unordered-containers }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.0.3.0"; - sha256 = "f6374498a3f6cfd59b8562cd506408dcbd6805cb107d2a756c1e3700aef09b9d"; + version = "0.1.0.0"; + sha256 = "185b20038906ae4e74dc08eb6723502444c9a9aa272f0051aed8325c31be6a1f"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens - microlens-th scientific servant servant-client text time - unordered-containers + microlens-th pushbullet-types scientific servant servant-client + text time unordered-containers ]; description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; @@ -155407,6 +157686,8 @@ self: { pname = "set-cover"; version = "0.0.8"; sha256 = "186d3a1b6e824e3bd1d479347d8310dba9f1cba98e90bc03d885c42558ea95d1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers enummapset psqueues utility-ht ]; @@ -155530,7 +157811,7 @@ self: { "sets" = callPackage ({ mkDerivation, base, commutative, composition, containers - , contravariant, hashable, keys, mtl, QuickCheck + , contravariant, criterion, hashable, keys, mtl, QuickCheck , quickcheck-instances, semigroupoids, semigroups, tasty , tasty-hunit, tasty-quickcheck, transformers, transformers-base , unordered-containers, witherable @@ -155549,6 +157830,10 @@ self: { quickcheck-instances tasty tasty-hunit tasty-quickcheck unordered-containers ]; + benchmarkHaskellDepends = [ + base commutative containers contravariant criterion + unordered-containers + ]; description = "Ducktyped set interface for Haskell containers"; license = stdenv.lib.licenses.mit; }) {}; @@ -155605,10 +157890,10 @@ self: { }) {}; "sexp-grammar" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, happy - , mtl, profunctors, QuickCheck, scientific, semigroups, split - , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, transformers, wl-pprint-text + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, happy, mtl, profunctors, QuickCheck, scientific + , semigroups, split, tagged, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, transformers, wl-pprint-text }: mkDerivation { pname = "sexp-grammar"; @@ -155624,6 +157909,9 @@ self: { base QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck text ]; + benchmarkHaskellDepends = [ + base bytestring criterion scientific semigroups text + ]; homepage = "https://github.com/esmolanka/sexp-grammar"; description = "Invertible parsers for S-expressions"; license = stdenv.lib.licenses.bsd3; @@ -155651,6 +157939,8 @@ self: { pname = "sexpr"; version = "0.2.1"; sha256 = "7724dc079ba390c8302079483ddf5f12bb425c2461133f94be71fe62402edab9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base64-string binary bytestring pretty ]; @@ -156488,6 +158778,8 @@ self: { sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd"; revision = "1"; editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base bytestring containers directory enclosed-exceptions exceptions lifted-async lifted-base monad-control mtl process @@ -157145,11 +159437,13 @@ self: { }) {}; "simple-conduit" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, chunked-data - , containers, either, exceptions, filepath, free, lifted-async - , lifted-base, mmorph, monad-control, mono-traversable, mtl - , mwc-random, primitive, semigroups, stm, streaming-commons, text - , transformers, transformers-base, vector + ({ mkDerivation, base, bifunctors, bytestring, CC-delcont + , chunked-data, conduit, conduit-combinators, conduit-extra + , containers, criterion, either, exceptions, filepath, foldl, free + , hspec, lifted-async, lifted-base, mmorph, monad-control + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , semigroups, stm, streaming-commons, text, transformers + , transformers-base, vector, void }: mkDerivation { pname = "simple-conduit"; @@ -157161,6 +159455,14 @@ self: { monad-control mono-traversable mtl mwc-random primitive semigroups stm streaming-commons text transformers transformers-base vector ]; + benchmarkHaskellDepends = [ + base bifunctors bytestring CC-delcont chunked-data conduit + conduit-combinators conduit-extra containers criterion either + exceptions filepath foldl free hspec lifted-async lifted-base + mmorph monad-control mono-traversable mtl mwc-random primitive + QuickCheck semigroups stm streaming-commons text transformers + transformers-base vector void + ]; homepage = "http://github.com/jwiegley/simple-conduit"; description = "A simple streaming I/O library based on monadic folds"; license = stdenv.lib.licenses.bsd3; @@ -157219,8 +159521,9 @@ self: { }) {}; "simple-effects" = callPackage - ({ mkDerivation, array, base, exceptions, list-t, monad-control - , MonadRandom, mtl, text, transformers, transformers-base + ({ mkDerivation, array, base, criterion, exceptions, list-t + , monad-control, MonadRandom, mtl, text, transformers + , transformers-base }: mkDerivation { pname = "simple-effects"; @@ -157231,6 +159534,7 @@ self: { transformers transformers-base ]; testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion mtl transformers ]; homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; @@ -157653,6 +159957,8 @@ self: { pname = "simple-sql-parser"; version = "0.4.2"; sha256 = "ba720de50c82b47a90a1774e7b50365483801cfcb19e664cd184e04003ec7b04"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; testHaskellDepends = [ base HUnit mtl parsec pretty test-framework test-framework-hunit @@ -157727,8 +160033,8 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck - , tasty-th, vector, vector-th-unbox + ({ mkDerivation, base, criterion, QuickCheck, tasty + , tasty-quickcheck, tasty-th, vector, vector-th-unbox }: mkDerivation { pname = "simple-vec3"; @@ -157739,6 +160045,9 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th vector vector-th-unbox ]; + benchmarkHaskellDepends = [ + base criterion QuickCheck vector vector-th-unbox + ]; homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; @@ -158053,24 +160362,25 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade - , contravariant, either, HUnit, pipes, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector + , contravariant, either, HUnit, pipes, profunctors, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, vector }: mkDerivation { pname = "siphon"; - version = "0.2"; - sha256 = "e55afce422fa4724636f7383624239a817f580cfedae68714df10ab0ff6ecc2d"; + version = "0.6"; + sha256 = "5776b99c6ef4262278ab7f76ecc9c83ee5ab7c137c3cdb9ee9c5badac24e2511"; libraryHaskellDepends = [ attoparsec base bytestring colonnade contravariant pipes text vector ]; testHaskellDepends = [ base bytestring colonnade contravariant either HUnit pipes - QuickCheck test-framework test-framework-hunit + profunctors QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/colonnade#readme"; - description = "Generic types and functions for columnar encoding and decoding"; + description = "Encode and decode CSV files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -158165,6 +160475,8 @@ self: { sha256 = "c76772fc89028f5407906bc699e7dd98e02328d0fe98c151706100e49f4899db"; revision = "3"; editedCabalFile = "ecf77e6598e7fbe7a12fc5bbb3cce000f14ffe87bee8386c95912e49f9a31e54"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base base-compat containers singletons ]; @@ -158341,16 +160653,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "skylark-client" = callPackage + ({ mkDerivation, base, conduit, conduit-extra, http-conduit + , http-types, lifted-async, optparse-generic, preamble, shakers + , stm, stm-conduit + }: + mkDerivation { + pname = "skylark-client"; + version = "0.1.5"; + sha256 = "e50e874a1f16ce71721d92118740853c53ee8822d43e173e670b47297dbb3ff7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit http-conduit http-types lifted-async preamble stm + stm-conduit + ]; + executableHaskellDepends = [ + base conduit-extra optparse-generic preamble shakers + ]; + homepage = "https://github.com/githubuser/skylark-client#readme"; + description = "Skylark client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "skylighting" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring - , case-insensitive, containers, Diff, directory, filepath, HUnit - , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty - , tasty-golden, tasty-hunit, text, utf8-string + , case-insensitive, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text + , utf8-string }: mkDerivation { pname = "skylighting"; version = "0.1.1.5"; sha256 = "0a4b666b2ccfeed35386bd364d663e919adc1815547e6360e83487253e33b13c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers directory filepath hxt mtl regex-pcre-builtin safe text utf8-string @@ -158359,30 +160697,40 @@ self: { aeson base bytestring containers Diff directory filepath HUnit pretty-show random tasty tasty-golden tasty-hunit text ]; + benchmarkHaskellDepends = [ + base criterion directory filepath text + ]; homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "skylighting_0_3" = callPackage - ({ mkDerivation, aeson, base, binary, blaze-html, bytestring - , case-insensitive, containers, Diff, directory, filepath, HUnit - , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty - , tasty-golden, tasty-hunit, text, utf8-string + "skylighting_0_3_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html + , bytestring, case-insensitive, containers, criterion, Diff + , directory, filepath, HUnit, hxt, mtl, pretty-show, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text + , utf8-string }: mkDerivation { pname = "skylighting"; - version = "0.3"; - sha256 = "ebfb2d5c8ce5769522826a2d5744064c578291d25d3671dcfe89a41f694ebf59"; + version = "0.3.1"; + sha256 = "d93ee3b15d74ab66fd729c4b56741c052fe331b4cfc78bad2a433827417d4f74"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base binary blaze-html bytestring case-insensitive containers - directory filepath hxt mtl regex-pcre-builtin safe text utf8-string + aeson attoparsec base binary blaze-html bytestring case-insensitive + containers directory filepath hxt mtl regex-pcre-builtin safe text + utf8-string ]; testHaskellDepends = [ aeson base bytestring containers Diff directory filepath HUnit pretty-show random tasty tasty-golden tasty-hunit text ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; @@ -158490,6 +160838,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "slack-web" = callPackage + ({ mkDerivation, aeson, base, generics-sop, http-api-data + , http-client, http-client-tls, servant, servant-client, text + , transformers + }: + mkDerivation { + pname = "slack-web"; + version = "0.1.0"; + sha256 = "82186c8bfe6857856034c9d53b0259e61b0575519d1cb22cb024f8464fb5f380"; + libraryHaskellDepends = [ + aeson base generics-sop http-api-data http-client http-client-tls + servant servant-client text transformers + ]; + homepage = "https://github.com/jpvillaisaza/slack-web"; + description = "Bindings for the Slack web API"; + license = stdenv.lib.licenses.mit; + }) {}; + "slave-thread" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore @@ -159373,6 +161739,8 @@ self: { pname = "snap-extras"; version = "0.12.0.0"; sha256 = "76ec979fa905a305392a545f24c6a33217e83aeedd0a8eec311623722b26e494"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring case-insensitive configurator containers data-default digestive-functors @@ -159482,12 +161850,12 @@ self: { "snap-server" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock - , containers, deepseq, directory, filepath, HsOpenSSL, http-common - , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base - , monad-control, mtl, network, old-locale, openssl-streams - , parallel, QuickCheck, random, snap-core, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, threads - , time, transformers, unix, unix-compat, vector + , containers, criterion, deepseq, directory, filepath, HsOpenSSL + , http-common, http-streams, HUnit, io-streams, io-streams-haproxy + , lifted-base, monad-control, mtl, network, old-locale + , openssl-streams, parallel, QuickCheck, random, snap-core + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, threads, time, transformers, unix, unix-compat, vector }: mkDerivation { pname = "snap-server"; @@ -159496,6 +161864,8 @@ self: { revision = "1"; editedCabalFile = "5b9b8071df32b8590c28df9cf4eb4afd77ee4554ff536b7e5a1d617f5e32f9a7"; configureFlags = [ "-fopenssl" ]; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring bytestring-builder case-insensitive clock containers filepath HsOpenSSL io-streams @@ -159511,6 +161881,10 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text threads time transformers unix unix-compat vector ]; + benchmarkHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + criterion io-streams io-streams-haproxy snap-core vector + ]; homepage = "http://snapframework.com/"; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -160582,9 +162956,10 @@ self: { }) {}; "snowball" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck - , quickcheck-instances, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text, text-icu + ({ mkDerivation, base, bytestring, criterion, HUnit + , language-haskell-extract, QuickCheck, quickcheck-instances + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, text-icu }: mkDerivation { pname = "snowball"; @@ -160595,6 +162970,9 @@ self: { base HUnit QuickCheck quickcheck-instances test-framework-hunit test-framework-quickcheck2 test-framework-th text ]; + benchmarkHaskellDepends = [ + base criterion language-haskell-extract text + ]; homepage = "http://hub.darcs.net/dag/snowball"; description = "Bindings to the Snowball library"; license = stdenv.lib.licenses.bsd3; @@ -160771,6 +163149,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "socket_0_8_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "socket"; + version = "0.8.0.1"; + sha256 = "745f6d1ef2299e321ad646918b9b733c82b4ded51b3b6aab6755c85182ab09a2"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/lpeterse/haskell-socket"; + description = "An extensible socket library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "socket-activation" = callPackage ({ mkDerivation, base, network, transformers, unix }: mkDerivation { @@ -160821,8 +163217,8 @@ self: { }: mkDerivation { pname = "socket-unix"; - version = "0.1.1.0"; - sha256 = "7541dd005761c6d08f8a87fe8157e1cfde128437c3bb3b9a72f3052f799ebd0f"; + version = "0.2.0.0"; + sha256 = "4d7591116dcbf70f9aea4a4f80fe9261abc19b03184b46a6463e09d020f435ac"; libraryHaskellDepends = [ base bytestring socket ]; testHaskellDepends = [ async base bytestring socket tasty tasty-hunit unix @@ -161016,8 +163412,8 @@ self: { }) {}; "sophia" = callPackage - ({ mkDerivation, base, bindings-sophia, bytestring, directory - , tasty, tasty-hunit + ({ mkDerivation, base, binary, bindings-sophia, bytestring + , criterion, directory, tasty, tasty-hunit }: mkDerivation { pname = "sophia"; @@ -161027,6 +163423,9 @@ self: { testHaskellDepends = [ base bindings-sophia bytestring directory tasty tasty-hunit ]; + benchmarkHaskellDepends = [ + base binary bindings-sophia bytestring criterion directory + ]; description = "Bindings to Sophia library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -161061,12 +163460,13 @@ self: { }) {}; "sorted-list" = callPackage - ({ mkDerivation, base, deepseq }: + ({ mkDerivation, base, criterion, deepseq }: mkDerivation { pname = "sorted-list"; version = "0.2.0.0"; sha256 = "cc52c787b056f4d3a9ecc59f06701695602558a4233042ff8f613cdd4985d138"; libraryHaskellDepends = [ base deepseq ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; description = "Type-enforced sorted lists and related functions"; license = stdenv.lib.licenses.bsd3; @@ -161161,8 +163561,8 @@ self: { }) {}; "sourcemap" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, process, text - , unordered-containers, utf8-string + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , process, random, text, unordered-containers, utf8-string }: mkDerivation { pname = "sourcemap"; @@ -161177,6 +163577,7 @@ self: { testHaskellDepends = [ aeson base bytestring process text unordered-containers utf8-string ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Implementation of source maps as proposed by Google and Mozilla"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -161229,6 +163630,8 @@ self: { pname = "soxlib"; version = "0.0.3"; sha256 = "18b555beb0eaafce25550feea23575ec68477728654bd2fbaad67d448f5dcd8b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers explicit-exception extensible-exceptions sample-frame storablevector transformers utility-ht @@ -161286,8 +163689,8 @@ self: { }) {}; "spaceprobe" = callPackage - ({ mkDerivation, base, clock, containers, erf, mtl, QuickCheck - , test-framework, test-framework-quickcheck2 + ({ mkDerivation, base, clock, containers, criterion, erf, mtl + , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "spaceprobe"; @@ -161298,6 +163701,7 @@ self: { base clock containers erf mtl QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/SeanRBurton/spaceprobe"; description = "Optimization over arbitrary search spaces"; license = stdenv.lib.licenses.bsd3; @@ -161347,12 +163751,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sparkle_0_5_0_1" = callPackage + ({ mkDerivation, base, binary, bytestring, choice + , distributed-closure, filepath, jni, jvm, jvm-streaming, process + , regex-tdfa, singletons, streaming, text, vector, zip-archive + }: + mkDerivation { + pname = "sparkle"; + version = "0.5.0.1"; + sha256 = "6b3458a12a880567c1ab2a8b51d3e0a2186e8d2621ce8c3dcf72f8dca183d133"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring choice distributed-closure jni jvm + jvm-streaming singletons streaming text vector + ]; + executableHaskellDepends = [ + base bytestring filepath process regex-tdfa text zip-archive + ]; + homepage = "http://github.com/tweag/sparkle#readme"; + description = "Distributed Apache Spark applications in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sparse" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , deepseq, directory, doctest, filepath, hlint, hybrid-vectors - , lens, linear, mtl, primitive, QuickCheck, semigroups - , simple-reflect, test-framework, test-framework-quickcheck2 - , test-framework-th, transformers, vector, vector-algorithms + ({ mkDerivation, array, base, bytestring, containers, contravariant + , criterion, deepseq, directory, doctest, filepath, hlint + , hybrid-vectors, lens, linear, mtl, primitive, QuickCheck + , semigroups, simple-reflect, test-framework + , test-framework-quickcheck2, test-framework-th, transformers + , vector, vector-algorithms }: mkDerivation { pname = "sparse"; @@ -161368,6 +163797,7 @@ self: { test-framework test-framework-quickcheck2 test-framework-th transformers vector ]; + benchmarkHaskellDepends = [ array base criterion deepseq vector ]; homepage = "http://github.com/ekmett/sparse"; description = "A playground of sparse linear algebra primitives using Morton ordering"; license = stdenv.lib.licenses.bsd3; @@ -161393,21 +163823,21 @@ self: { }) {}; "sparse-linear-algebra" = callPackage - ({ mkDerivation, base, containers, criterion, exceptions, hspec - , mtl, mwc-random, primitive, QuickCheck, transformers, vector - , vector-algorithms, vector-space + ({ mkDerivation, base, containers, exceptions, hspec + , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck + , scientific, transformers, vector, vector-algorithms, vector-space }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.9.4"; - sha256 = "5d97d81653785f08783cd29107f0f87c01611cf5b1ad1395ef1a8b799a04adf6"; + version = "0.2.9.7"; + sha256 = "f807cccc34abde9b33235b18739ca69f4b94500b932350a04c0107bb56d8536b"; libraryHaskellDepends = [ base containers exceptions mtl transformers vector vector-algorithms vector-space ]; testHaskellDepends = [ - base containers criterion exceptions hspec mtl mwc-random primitive - QuickCheck vector-space + base containers exceptions hspec matrix-market-attoparsec mtl + mwc-random primitive QuickCheck scientific vector-space ]; homepage = "https://github.com/ocramz/sparse-linear-algebra"; description = "Numerical computation in native Haskell"; @@ -161844,8 +164274,9 @@ self: { }) {}; "splines" = callPackage - ({ mkDerivation, base, containers, polynomial, QuickCheck - , test-framework, test-framework-quickcheck2, vector, vector-space + ({ mkDerivation, base, containers, criterion, polynomial + , QuickCheck, test-framework, test-framework-quickcheck2, vector + , vector-space }: mkDerivation { pname = "splines"; @@ -161858,6 +164289,7 @@ self: { base containers polynomial QuickCheck test-framework test-framework-quickcheck2 vector vector-space ]; + benchmarkHaskellDepends = [ base criterion polynomial vector ]; description = "B-Splines, other splines, and NURBS"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -162035,6 +164467,8 @@ self: { pname = "spreadsheet"; version = "0.1.3.4"; sha256 = "7e4a26ac4e565cb6fbc5845f010e0930b0ce2beff05dca998f312cd3d40249c2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base explicit-exception transformers utility-ht ]; @@ -162176,8 +164610,9 @@ self: { }) {}; "spsa" = callPackage - ({ mkDerivation, base, hmatrix, HUnit, mtl, QuickCheck, random - , test-framework, test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, criterion, hmatrix, HUnit, mtl, QuickCheck + , random, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "spsa"; @@ -162188,6 +164623,7 @@ self: { base hmatrix HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion hmatrix random ]; homepage = "https://github.com/yanatan16/haskell-spsa"; description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm"; license = stdenv.lib.licenses.mit; @@ -162341,8 +164777,8 @@ self: { }: mkDerivation { pname = "sqlite-simple"; - version = "0.4.12.1"; - sha256 = "2f24f4dfea3b3bc1657b26c786666abd041bb89e09c22d084eaea43d67112227"; + version = "0.4.13.0"; + sha256 = "59b124c667b9c80cb59bcaf5ed9319b248daec81a70754063571a61b1771f9e8"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers direct-sqlite text time transformers @@ -162578,6 +165014,8 @@ self: { pname = "ssh-known-hosts"; version = "0.2.0.0"; sha256 = "0a93cbeae395701ff1cd609c29aaa2b59d507304b91612a28193156faac210fe"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base iproute text ]; testHaskellDepends = [ base HUnit iproute QuickCheck test-framework test-framework-hunit @@ -162693,12 +165131,17 @@ self: { }) {}; "stable-heap" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion, fingertree, heaps, mwc-random + , pqueue, vector + }: mkDerivation { pname = "stable-heap"; version = "0.1.0.0"; sha256 = "410f316118037f3fed6dcd58c667b5ad278f4e5bac6053c6366d8b59a9209d93"; libraryHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion fingertree heaps mwc-random pqueue vector + ]; homepage = "http://hub.darcs.net/jmcarthur/stable-heap"; description = "Purely functional stable heaps (fair priority queues)"; license = stdenv.lib.licenses.mit; @@ -162770,8 +165213,8 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, file-embed, filepath, hspec + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, exceptions, file-embed, filepath, hspec , hspec-megaparsec, megaparsec, mtl, template-haskell, text , unordered-containers, vector, yaml }: @@ -162790,6 +165233,9 @@ self: { aeson base bytestring containers file-embed hspec hspec-megaparsec megaparsec text yaml ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; homepage = "https://github.com/stackbuilders/stache"; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -163430,7 +165876,8 @@ self: { }) {}; "stateWriter" = callPackage - ({ mkDerivation, base, free, hspec, mtl, QuickCheck, transformers + ({ mkDerivation, base, containers, criterion, deepseq, dlist, free + , hspec, lens, mtl, QuickCheck, transformers, vector }: mkDerivation { pname = "stateWriter"; @@ -163438,6 +165885,10 @@ self: { sha256 = "dbed209ec350b751b2c56388ab751149874f6b76c0d7a6725de1583682ccc6e2"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dlist lens mtl transformers + vector + ]; description = "A faster variant of the RWS monad transformers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -163969,7 +166420,8 @@ self: { }) {}; "stitch" = callPackage - ({ mkDerivation, base, Cabal, containers, hspec, text, transformers + ({ mkDerivation, base, Cabal, containers, criterion, hspec, text + , transformers }: mkDerivation { pname = "stitch"; @@ -163977,6 +166429,7 @@ self: { sha256 = "72c114222abde4dbee6f087def13105bde3036a039ac6ded9e0f44462691ad77"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base Cabal hspec text ]; + benchmarkHaskellDepends = [ base criterion ]; description = "lightweight CSS DSL"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -164057,9 +166510,10 @@ self: { }) {}; "stm-containers" = callPackage - ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF - , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive - , QuickCheck, transformers, unordered-containers + ({ mkDerivation, async, base, base-prelude, containers, criterion + , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl + , mtl-prelude, mwc-random, mwc-random-monad, placeholders + , primitive, QuickCheck, text, transformers, unordered-containers }: mkDerivation { pname = "stm-containers"; @@ -164073,6 +166527,11 @@ self: { mtl-prelude placeholders primitive QuickCheck transformers unordered-containers ]; + benchmarkHaskellDepends = [ + async base base-prelude containers criterion focus free hashable + hashtables list-t loch-th mtl mtl-prelude mwc-random + mwc-random-monad placeholders text unordered-containers + ]; homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; license = stdenv.lib.licenses.mit; @@ -164408,6 +166867,8 @@ self: { pname = "storable-record"; version = "0.0.3.1"; sha256 = "74e5ceee49e0b7625d13759597d21e714843406b8b80e9168a0bb1199ffdadba"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base transformers utility-ht ]; homepage = "http://code.haskell.org/~thielema/storable-record/"; description = "Elegant definition of Storable instances for records"; @@ -164442,7 +166903,8 @@ self: { "storablevector" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative - , QuickCheck, random, syb, transformers, unsafe, utility-ht + , QuickCheck, random, sample-frame, syb, transformers, unsafe + , utility-ht }: mkDerivation { pname = "storablevector"; @@ -164455,6 +166917,7 @@ self: { testHaskellDepends = [ base bytestring QuickCheck random utility-ht ]; + benchmarkHaskellDepends = [ base deepseq sample-frame utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = stdenv.lib.licenses.bsd3; @@ -164478,6 +166941,8 @@ self: { pname = "storablevector-streamfusion"; version = "0.0"; sha256 = "d52cd96003f494733840cba6e0f83fd2a5900ceaa5e180b38a48b800f254f6e1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base storablevector stream-fusion utility-ht ]; @@ -164524,6 +166989,16 @@ self: { time transformers unordered-containers vector vector-binary-instances void weigh ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bytestring conduit + containers contravariant criterion cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core streaming-commons + syb template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; @@ -164573,6 +167048,8 @@ self: { pname = "stratosphere"; version = "0.4.0"; sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring hashable lens template-haskell text unordered-containers @@ -164693,8 +167170,8 @@ self: { }) {}; "stream" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hspec, mtl - , streaming-commons, temporary, transformers + ({ mkDerivation, base, bytestring, criterion, exceptions, ghc-prim + , hspec, mtl, streaming-commons, temporary, transformers, vector }: mkDerivation { pname = "stream"; @@ -164704,6 +167181,9 @@ self: { base bytestring exceptions mtl streaming-commons transformers ]; testHaskellDepends = [ base bytestring hspec temporary ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim temporary vector + ]; homepage = "https://github.com/githubuser/stream#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; @@ -164729,6 +167209,8 @@ self: { pname = "stream-monad"; version = "0.4.0.2"; sha256 = "86cd5770f903184b47113c42978cc409a483a5bdd2619c9e11f5a2339491210c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base logict ]; homepage = "http://github.com/sebfisch/stream-monad"; description = "Simple, Fair and Terminating Backtracking Monad"; @@ -164798,8 +167280,8 @@ self: { "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring - , deepseq, directory, hspec, network, process, QuickCheck, random - , stm, text, transformers, unix, zlib + , criterion, deepseq, directory, hspec, network, process + , QuickCheck, random, stm, text, transformers, unix, zlib }: mkDerivation { pname = "streaming-commons"; @@ -164813,6 +167295,9 @@ self: { array async base blaze-builder bytestring deepseq hspec network QuickCheck text unix zlib ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text + ]; homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; @@ -164851,6 +167336,7 @@ self: { testHaskellDepends = [ base containers tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; license = stdenv.lib.licenses.asl20; }) {}; @@ -164863,6 +167349,8 @@ self: { pname = "streaming-png"; version = "0.1.0.0"; sha256 = "ecb3509c29481d7deb3b65c976cc08fb9a859cff9f52ad48c16402d9439420ca"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal exceptions JuicyPixels mmorph mtl resourcet streaming streaming-bytestring streaming-commons transformers @@ -165273,13 +167761,16 @@ self: { }) {}; "string-similarity" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, suffixtree }: + ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck + , suffixtree + }: mkDerivation { pname = "string-similarity"; version = "0.1.0.0"; sha256 = "bb2e18741f084bef90531050a5b14712aca4e78d05de12d3ec6b803a5e9e034c"; libraryHaskellDepends = [ base suffixtree ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/mwotton/string-similarity"; description = "longest common substring"; license = stdenv.lib.licenses.bsd3; @@ -165637,12 +168128,12 @@ self: { }) {}; "structures" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , deepseq, directory, doctest, filepath, free, ghc, ghc-prim - , hashable, hlint, hybrid-vectors, lens, monad-st, parallel - , primitive, QuickCheck, semigroups, tasty, tasty-quickcheck - , tasty-th, transformers, unordered-containers, vector - , vector-algorithms + ({ mkDerivation, array, base, bytestring, containers, contravariant + , criterion, deepseq, directory, doctest, filepath, free, ghc + , ghc-prim, hashable, hlint, hybrid-vectors, lens, monad-st + , MonadRandom, parallel, primitive, QuickCheck, semigroups, tasty + , tasty-quickcheck, tasty-th, transformers, unordered-containers + , vector, vector-algorithms }: mkDerivation { pname = "structures"; @@ -165658,6 +168149,10 @@ self: { QuickCheck semigroups tasty tasty-quickcheck tasty-th unordered-containers ]; + benchmarkHaskellDepends = [ + array base containers criterion deepseq MonadRandom + unordered-containers vector + ]; homepage = "http://github.com/ekmett/structures"; description = "\"Advanced\" Data Structures"; license = stdenv.lib.licenses.bsd3; @@ -165804,10 +168299,11 @@ self: { "subhask" = callPackage ({ mkDerivation, approximate, array, base, bloomfilter, bytes - , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim - , hmatrix, hyperloglog, lens, monad-primitive, MonadRandom, mtl - , parallel, primitive, QuickCheck, semigroups, template-haskell - , test-framework, test-framework-quickcheck2, vector + , bytestring, cassava, containers, criterion, deepseq, erf, gamma + , ghc-prim, hmatrix, hyperloglog, lens, monad-primitive + , MonadRandom, mtl, parallel, primitive, QuickCheck, semigroups + , template-haskell, test-framework, test-framework-quickcheck2 + , vector }: mkDerivation { pname = "subhask"; @@ -165822,6 +168318,7 @@ self: { testHaskellDepends = [ base test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion MonadRandom ]; homepage = "http://github.com/mikeizbicki/subhask"; description = "Type safe interface for programming in subcategories of Hask"; license = stdenv.lib.licenses.bsd3; @@ -165929,8 +168426,8 @@ self: { }) {}; "suffix-array" = callPackage - ({ mkDerivation, array, base, containers, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, array, base, containers, criterion, random, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "suffix-array"; @@ -165943,6 +168440,7 @@ self: { testHaskellDepends = [ array base containers tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion random ]; homepage = "https://github.com/kadoban/suffix-array#readme"; description = "Simple and moderately efficient suffix array implementation"; license = stdenv.lib.licenses.bsd3; @@ -166142,13 +168640,18 @@ self: { }) {}; "superbuffer" = callPackage - ({ mkDerivation, async, base, bytestring, HTF, QuickCheck }: + ({ mkDerivation, async, base, buffer-builder, bytestring, criterion + , HTF, QuickCheck + }: mkDerivation { pname = "superbuffer"; version = "0.2.0.1"; sha256 = "ced2a0ed729661412d28da1248d39a5b47bb4513847deae59219a0fc12b51166"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring HTF QuickCheck ]; + benchmarkHaskellDepends = [ + async base buffer-builder bytestring criterion + ]; homepage = "https://github.com/agrafix/superbuffer#readme"; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; @@ -166162,6 +168665,8 @@ self: { pname = "supercollider-ht"; version = "0.3"; sha256 = "3cceb4e622bf1d6d7887cbefcd8d68e277c0d638de522276d4aa09db1cc316ed"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hosc hsc3 opensoundcontrol-ht process random transformers ]; @@ -166804,10 +169309,10 @@ self: { }) {}; "sync-mht" = callPackage - ({ mkDerivation, array, base, base16-bytestring, byteable, bytes - , bytestring, cereal, containers, cryptohash, directory, exceptions - , filepath, HUnit, io-streams, mtl, process, random, regex-compat - , temporary, text, time, transformers, unix, zlib + ({ mkDerivation, aeson, array, base, base16-bytestring, byteable + , bytes, bytestring, cereal, containers, cryptohash, directory + , exceptions, filepath, HUnit, io-streams, mtl, process, random + , regex-compat, temporary, text, time, transformers, unix, zlib }: mkDerivation { pname = "sync-mht"; @@ -166833,6 +169338,9 @@ self: { io-streams mtl process random regex-compat temporary text time transformers unix zlib ]; + benchmarkHaskellDepends = [ + aeson base bytestring directory filepath process temporary time + ]; homepage = "https://github.com/ekarayel/sync-mht"; description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; @@ -166905,10 +169413,10 @@ self: { }) {Synt = null;}; "syntactic" = callPackage - ({ mkDerivation, base, constraints, containers, data-hash, deepseq - , mtl, QuickCheck, syb, tagged, tasty, tasty-golden - , tasty-quickcheck, tasty-th, template-haskell, tree-view - , utf8-string + ({ mkDerivation, base, constraints, containers, criterion + , data-hash, deepseq, mtl, QuickCheck, syb, tagged, tasty + , tasty-golden, tasty-quickcheck, tasty-th, template-haskell + , tree-view, utf8-string }: mkDerivation { pname = "syntactic"; @@ -166922,6 +169430,7 @@ self: { base containers mtl QuickCheck tagged tasty tasty-golden tasty-quickcheck tasty-th utf8-string ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; @@ -167085,6 +169594,8 @@ self: { pname = "synthesizer"; version = "0.2.0.1"; sha256 = "6dfc0790c370fe8743052ee4ead7eb341d8ac44b126cc7911241a01e0c38b9d8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base binary bytestring containers event-list filepath gnuplot non-negative numeric-prelude numeric-quest process QuickCheck @@ -167106,6 +169617,8 @@ self: { pname = "synthesizer-alsa"; version = "0.5.0.5"; sha256 = "aa9ac69ac0f0e1728b635cd06a1753d67a877ecfb24e6d51cbab15660f13ce26"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa non-negative numeric-prelude old-time random sox storablevector @@ -167120,10 +169633,11 @@ self: { "synthesizer-core" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, event-list, explicit-exception, filepath, non-empty - , non-negative, numeric-prelude, numeric-quest, process, QuickCheck - , random, sample-frame-np, sox, storable-record, storable-tuple - , storablevector, transformers, utility-ht + , deepseq, directory, event-list, explicit-exception, filepath + , non-empty, non-negative, numeric-prelude, numeric-quest, old-time + , process, QuickCheck, random, sample-frame-np, sox + , storable-record, storable-tuple, storablevector, timeit + , transformers, utility-ht }: mkDerivation { pname = "synthesizer-core"; @@ -167140,6 +169654,10 @@ self: { base containers event-list non-empty non-negative numeric-prelude QuickCheck random storable-tuple storablevector utility-ht ]; + benchmarkHaskellDepends = [ + array base binary bytestring directory numeric-prelude old-time + storable-tuple storablevector timeit utility-ht + ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell: Low level part"; license = "GPL"; @@ -167155,6 +169673,8 @@ self: { pname = "synthesizer-dimensional"; version = "0.8.0.2"; sha256 = "d687c5907132d106952e033618ab7256885aa03bc462840c68131fbd4ec1a19d"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring event-list non-negative numeric-prelude random sox storable-record storablevector synthesizer-core transformers @@ -167192,6 +169712,8 @@ self: { pname = "synthesizer-inference"; version = "0.2"; sha256 = "2ba794a3c1331a8f5c6e7927c6a4f06ea389d1692d1bac4cdf14e63d4e6b501e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base event-list non-negative numeric-prelude random synthesizer-core transformers UniqueLogicNP utility-ht @@ -167213,6 +169735,8 @@ self: { pname = "synthesizer-llvm"; version = "0.8.1.2"; sha256 = "29fe7aacb673c44726a7aefa627759e4545cee369c09f1197784b1b8a2aa74e6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers event-list llvm-extra llvm-tf midi non-empty non-negative numeric-prelude pathtype random sox storable-record @@ -167240,6 +169764,8 @@ self: { pname = "synthesizer-midi"; version = "0.6.0.4"; sha256 = "607da1d5dd809228f89a73fc7caa26f5f7b7c41da0c8fa928848610835c47ff5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers data-accessor data-accessor-transformers deepseq event-list midi non-negative numeric-prelude sox @@ -167465,10 +169991,10 @@ self: { }) {}; "system-random-effect" = callPackage - ({ mkDerivation, base, bytestring, crypto-api, extensible-effects - , HUnit, mersenne-random-pure64, primitive, QuickCheck, statistics - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-algorithms + ({ mkDerivation, base, bytestring, criterion, crypto-api, deepseq + , extensible-effects, HUnit, mersenne-random-pure64, primitive + , QuickCheck, statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms }: mkDerivation { pname = "system-random-effect"; @@ -167483,6 +170009,9 @@ self: { base extensible-effects HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector ]; + benchmarkHaskellDepends = [ + base criterion deepseq extensible-effects vector + ]; homepage = "https://github.com/wowus/system-random-effect"; description = "Random number generation for extensible effects"; license = stdenv.lib.licenses.bsd3; @@ -167552,11 +170081,14 @@ self: { pname = "system-uuid"; version = "2.1.1"; sha256 = "8b911863eab0109f0030282af3b94fa233988de78ef2050bd30ebbfeb02a8089"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers murmur-hash parsec template-haskell ]; librarySystemDepends = [ libossp_uuid ]; + executableSystemDepends = [ libossp_uuid ]; homepage = "http://github.com/solidsnack/system-uuid/"; description = "Bindings to system UUID functions"; license = stdenv.lib.licenses.bsd3; @@ -167935,17 +170467,23 @@ self: { "tagchup" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor - , explicit-exception, transformers, utility-ht, xml-basic + , explicit-exception, old-time, transformers, utility-ht, xml-basic }: mkDerivation { pname = "tagchup"; version = "0.4.0.5"; sha256 = "c0c12eeec562a7769deb165c7edae8a8dbc0087d5788655b72864df122a0fa35"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-accessor explicit-exception transformers utility-ht xml-basic ]; testHaskellDepends = [ base xml-basic ]; + benchmarkHaskellDepends = [ + base bytestring containers data-accessor explicit-exception + old-time transformers utility-ht xml-basic + ]; homepage = "http://code.haskell.org/~thielema/tagchup/"; description = "alternative package for processing of tag soups"; license = "GPL"; @@ -168088,8 +170626,8 @@ self: { "taggy" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , directory, hspec, hspec-attoparsec, text, unordered-containers - , vector + , criterion, directory, hspec, hspec-attoparsec, tagsoup, text + , unordered-containers, vector }: mkDerivation { pname = "taggy"; @@ -168108,6 +170646,9 @@ self: { attoparsec base blaze-html blaze-markup directory hspec hspec-attoparsec text unordered-containers vector ]; + benchmarkHaskellDepends = [ + attoparsec base criterion tagsoup text vector + ]; homepage = "http://github.com/alpmestan/taggy"; description = "Efficient and simple HTML/XML parsing library"; license = stdenv.lib.licenses.bsd3; @@ -168194,8 +170735,10 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "tagsoup"; - version = "0.14"; - sha256 = "90822d8bb9d3a40d070a1f282fb2f7f6beec13f01f958f716de9d005e2e9ea1e"; + version = "0.14.1"; + sha256 = "028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers text ]; homepage = "https://github.com/ndmitchell/tagsoup#readme"; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; @@ -168386,6 +170929,8 @@ self: { pname = "takusen-oracle"; version = "0.9.4.1"; sha256 = "492159551e80b58cff2318546f3649dd1c2b08eb4ff4f94d855d713df4ec868b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; librarySystemDepends = [ clntsh ]; homepage = "https://github.com/paulrzcz/takusen-oracle.git"; @@ -168530,8 +171075,8 @@ self: { "tar" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-handle - , containers, deepseq, directory, filepath, QuickCheck, tasty - , tasty-quickcheck, time + , containers, criterion, deepseq, directory, filepath, old-time + , QuickCheck, tasty, tasty-quickcheck, time }: mkDerivation { pname = "tar"; @@ -168544,6 +171089,10 @@ self: { array base bytestring bytestring-handle containers deepseq directory filepath QuickCheck tasty tasty-quickcheck time ]; + benchmarkHaskellDepends = [ + array base bytestring containers criterion deepseq directory + filepath old-time time + ]; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -168575,12 +171124,13 @@ self: { }) {}; "target" = callPackage - ({ mkDerivation, array, base, containers, deepseq, directory - , exceptions, filepath, ghc, ghc-paths, ghc-prim, hint - , liquid-fixpoint, liquidhaskell, mtl, pretty, process, QuickCheck - , syb, tagged, tasty, tasty-hunit, template-haskell, text - , text-format, th-lift, transformers, unordered-containers, vector - , z3 + ({ mkDerivation, aeson, array, base, bytestring, cassava + , containers, data-timeout, deepseq, directory, exceptions + , filepath, ghc, ghc-paths, ghc-prim, hint, liquid-fixpoint + , liquidhaskell, mtl, pretty, process, QuickCheck, random + , SafeSemaphore, smallcheck, syb, tagged, tasty, tasty-hunit + , template-haskell, text, text-format, th-lift, time, transformers + , unordered-containers, vector, xml-conduit, z3 }: mkDerivation { pname = "target"; @@ -168601,6 +171151,12 @@ self: { unordered-containers ]; testSystemDepends = [ z3 ]; + benchmarkHaskellDepends = [ + aeson base bytestring cassava containers data-timeout deepseq ghc + liquid-fixpoint liquidhaskell mtl QuickCheck random SafeSemaphore + smallcheck tagged template-haskell time unordered-containers vector + xml-conduit + ]; description = "Generate test-suites from refinement types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -168718,6 +171274,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_0_5" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.0.5"; + sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + homepage = "http://github.com/ocharles/tasty-ant-xml"; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-auto" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -168752,6 +171327,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_0_4_0_0" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "0.4.0.0"; + sha256 = "b2e4f21f9ccc2777d36090f71f560fbff0c3fde3bf43d966339b3fc2bf19577e"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-th @@ -169076,8 +171664,8 @@ self: { }: mkDerivation { pname = "tasty-stats"; - version = "0.2.0.1"; - sha256 = "0957921fffb8ecc225694ab16812d329dbb3ab60c4905cd08bca6b087faa4311"; + version = "0.2.0.2"; + sha256 = "f6871db08e37ce62802d85040c59742f5611bc2450a2c1ceab6a6e80d58dc6a5"; libraryHaskellDepends = [ base containers directory process stm tagged tasty time ]; @@ -169260,6 +171848,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tcp-streams_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, directory + , HUnit, io-streams, network, pem, test-framework + , test-framework-hunit, tls, x509, x509-store, x509-system + }: + mkDerivation { + pname = "tcp-streams"; + version = "1.0.0.0"; + sha256 = "eb47251fa998f141bf5969e50980e5573da4531461d733e707695d504cca00b8"; + libraryHaskellDepends = [ + base bytestring data-default-class io-streams network pem tls x509 + x509-store x509-system + ]; + testHaskellDepends = [ + base bytestring directory HUnit io-streams network test-framework + test-framework-hunit + ]; + homepage = "https://github.com/didi-FP/tcp-streams"; + description = "One stop solution for tcp client and server with tls support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tcp-streams-openssl" = callPackage ({ mkDerivation, base, bytestring, directory, HsOpenSSL , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck @@ -169285,6 +171896,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tcp-streams-openssl_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system + , HUnit, io-streams, network, tcp-streams, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "tcp-streams-openssl"; + version = "1.0.0.0"; + sha256 = "779dde5cac1fd61a8ee04ded3075bcad61e4851c7e685104196ac44fedf22f47"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network + tcp-streams + ]; + testHaskellDepends = [ + base bytestring HUnit io-streams network tcp-streams test-framework + test-framework-hunit + ]; + homepage = "https://github.com/didi-FP/tcp-streams"; + description = "Tcp streams using openssl for tls support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tdd-util" = callPackage ({ mkDerivation, base, bytestring, HUnit, lens , MonadCatchIO-transformers, parallel-io, process, QuickCheck @@ -169315,8 +171949,10 @@ self: { "tdigest" = callPackage ({ mkDerivation, base, base-compat, binary, bytes, Cabal - , cabal-doctest, deepseq, directory, doctest, filepath, reducers - , semigroups, tasty, tasty-quickcheck, vector, vector-algorithms + , cabal-doctest, Chart, Chart-diagrams, deepseq, directory, doctest + , filepath, machines, mwc-random, optparse-applicative, parallel + , reducers, semigroups, statistics, tasty, tasty-quickcheck, time + , vector, vector-algorithms }: mkDerivation { pname = "tdigest"; @@ -169331,6 +171967,11 @@ self: { base base-compat binary bytes deepseq directory doctest filepath semigroups tasty tasty-quickcheck vector vector-algorithms ]; + benchmarkHaskellDepends = [ + base base-compat binary Chart Chart-diagrams deepseq machines + mwc-random optparse-applicative parallel semigroups statistics time + vector vector-algorithms + ]; homepage = "https://github.com/futurice/haskell-tdigest#readme"; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; @@ -169855,8 +172496,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.2"; - sha256 = "2154905572f2b12c37d4a6ec3dd57d1bdd243057216aaf584432538af2635d1d"; + version = "0.2.1.1"; + sha256 = "81ea2a0712af3b6f8f802c29f2fbc2dfb8e48db81dd4da48c42aa5382987e64e"; libraryHaskellDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -169893,6 +172534,8 @@ self: { pname = "terminal-progress-bar"; version = "0.1.1"; sha256 = "2053a7ac9113378a6ae8852447b4e7ba430c014776443046788e84183dc9f380"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base stm stm-chans ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -170059,6 +172702,8 @@ self: { sha256 = "7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273"; revision = "1"; editedCabalFile = "a6d9dbedbb574271e85c6e5ef9a9f935d87501a9b99b473bf306e3dcd36bdd9e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -170266,13 +172911,16 @@ self: { }) {}; "test-invariant" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: + ({ mkDerivation, base, criterion, QuickCheck, tasty + , tasty-quickcheck + }: mkDerivation { pname = "test-invariant"; version = "0.4.5.0"; sha256 = "306fbfcd1b7fea5a88b757ac90550ae6083f64e9dae7da5a3a26c87acf9c6332"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion QuickCheck ]; homepage = "https://github.com/knupfer/test-invariant"; description = "Provide common invariants to be checked with QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -170434,6 +173082,8 @@ self: { pname = "testbench"; version = "0.1.0.0"; sha256 = "66592406ff6e1a03d3ae994560e0bf04e500398fd0a9c9be6bca34a3b86f3e83"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base boxes criterion deepseq HUnit statistics transformers ]; @@ -170573,6 +173223,8 @@ self: { pname = "texmath"; version = "0.9.1"; sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers mtl pandoc-types parsec syb xml ]; @@ -170674,7 +173326,7 @@ self: { }) {}; "text-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring + ({ mkDerivation, base, base-prelude, bytestring, criterion , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, text }: @@ -170689,6 +173341,7 @@ self: { quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + benchmarkHaskellDepends = [ criterion rerebase ]; homepage = "https://github.com/nikita-volkov/text-builder"; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; @@ -170937,13 +173590,14 @@ self: { }) {}; "text-manipulate" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, text }: + ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }: mkDerivation { pname = "text-manipulate"; version = "0.2.0.1"; sha256 = "e0e9c71d9b1cfb7d3bca3d0a500d939b3efc6684515c0d7bd685503aa4f49d2f"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion text ]; homepage = "https://github.com/brendanhay/text-manipulate"; description = "Case conversion, word boundary manipulation, and textual subjugation"; license = "unknown"; @@ -170967,13 +173621,15 @@ self: { }) {}; "text-metrics" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, text }: + ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck, text + }: mkDerivation { pname = "text-metrics"; version = "0.2.0"; sha256 = "082304ce14ac6182cbb93f51207d90b91d104e5d1fc1b17bbe1c9280ebffe43a"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; homepage = "https://github.com/mrkkrp/text-metrics"; description = "Calculate various string metrics efficiently"; license = stdenv.lib.licenses.bsd3; @@ -171132,10 +173788,10 @@ self: { "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant - , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec - , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups - , tagged, template-haskell, text, th-lift, transformers - , transformers-compat, void + , criterion, deepseq, deriving-compat, generic-deriving + , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck + , quickcheck-instances, semigroups, tagged, template-haskell, text + , th-lift, transformers, transformers-compat, void }: mkDerivation { pname = "text-show"; @@ -171154,6 +173810,12 @@ self: { QuickCheck quickcheck-instances semigroups tagged template-haskell text th-lift transformers transformers-compat void ]; + benchmarkHaskellDepends = [ + array base base-compat bifunctors bytestring bytestring-builder + containers contravariant criterion deepseq generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-lift transformers transformers-compat void + ]; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; @@ -171195,7 +173857,8 @@ self: { }) {}; "text-stream-decode" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hspec, text }: + ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text + }: mkDerivation { pname = "text-stream-decode"; version = "0.1.0.5"; @@ -171204,6 +173867,7 @@ self: { editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring deepseq hspec text ]; + benchmarkHaskellDepends = [ base bytestring criterion text ]; homepage = "http://github.com/fpco/text-stream-decode"; description = "Streaming decoding functions for UTF encodings. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -172117,13 +174781,14 @@ self: { }) {}; "thread-local-storage" = callPackage - ({ mkDerivation, atomic-primops, base, containers }: + ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { pname = "thread-local-storage"; version = "0.1.1"; sha256 = "11a0dfa77abf3d39e33529975aade945b0a6720143b3b134fd9460b0889845ca"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ atomic-primops base ]; + benchmarkHaskellDepends = [ atomic-primops base criterion ]; homepage = "https://github.com/rrnewton/thread-local-storage"; description = "Several options for thread-local-storage (TLS) in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -172264,6 +174929,8 @@ self: { pname = "threepenny-gui"; version = "0.7.0.1"; sha256 = "b5802dbb6c43304d613373f464d6fd16a4f219a5d289be003a28c2c46cae44c8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring containers data-default deepseq filepath hashable network-uri safe snap-core snap-server stm @@ -172403,9 +175070,10 @@ self: { "thyme" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , containers, cpphs, deepseq, directory, filepath, mtl, old-locale - , profunctors, QuickCheck, random, system-posix-redirect, text - , time, vector, vector-space, vector-th-unbox + , containers, cpphs, criterion, deepseq, directory, filepath, mtl + , old-locale, profunctors, QuickCheck, random + , system-posix-redirect, text, time, vector, vector-space + , vector-th-unbox }: mkDerivation { pname = "thyme"; @@ -172422,6 +175090,10 @@ self: { old-locale profunctors QuickCheck random system-posix-redirect text time vector-space ]; + benchmarkHaskellDepends = [ + base criterion mtl old-locale profunctors QuickCheck random time + vector vector-space + ]; homepage = "https://github.com/liyang/thyme"; description = "A faster time library"; license = stdenv.lib.licenses.bsd3; @@ -172471,8 +175143,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.0"; - sha256 = "008b976ca9b9bbd5ebe620e64bddccde31e0eed95ddcda20378cac96d3ca8115"; + version = "0.1.1.1"; + sha256 = "fa38e4f2062e801c5f8bccb2afea945cfcf40bd24671d9080bf538e0533bbb2a"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -173007,6 +175679,8 @@ self: { pname = "time-w3c"; version = "0.1.0.1"; sha256 = "6fb9bd6dcaf5d95093d7d24b6d37edfae71c22dab8158b650b7ba2b019dc168a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base convertible parsec time ]; homepage = "http://cielonegro.org/W3CDateTime.html"; description = "Parse, format and convert W3C Date and Time"; @@ -173177,14 +175851,16 @@ self: { }) {}; "timemap" = callPackage - ({ mkDerivation, base, containers, focus, hashable, list-t - , QuickCheck, quickcheck-instances, stm, stm-containers, tasty - , tasty-hunit, tasty-quickcheck, time, unordered-containers + ({ mkDerivation, base, containers, criterion, focus, hashable + , list-t, QuickCheck, quickcheck-instances, stm, stm-containers + , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers }: mkDerivation { pname = "timemap"; version = "0.0.4"; sha256 = "6e7c85c727fd9152db635c33ddb72cab5dca9ae240d41fcb653883f1bcd1d9e3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers focus hashable list-t stm stm-containers time unordered-containers @@ -173194,6 +175870,10 @@ self: { quickcheck-instances stm stm-containers tasty tasty-hunit tasty-quickcheck time unordered-containers ]; + benchmarkHaskellDepends = [ + base containers criterion focus hashable list-t stm stm-containers + time unordered-containers + ]; description = "A mutable hashmap, implicitly indexed by UTCTime"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -173526,8 +176206,8 @@ self: { }) {}; "tinylog" = callPackage - ({ mkDerivation, base, bytestring, containers, double-conversion - , fast-logger, text, transformers, unix-time + ({ mkDerivation, base, bytestring, containers, criterion + , double-conversion, fast-logger, text, transformers, unix-time }: mkDerivation { pname = "tinylog"; @@ -173537,6 +176217,7 @@ self: { base bytestring containers double-conversion fast-logger text transformers unix-time ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://gitlab.com/twittner/tinylog/"; description = "Simplistic logging using fast-logger"; license = stdenv.lib.licenses.mpl20; @@ -173677,7 +176358,7 @@ self: { pname = "tkyprof"; version = "0.2.2.2"; sha256 = "ea40c354d37843757b76152cbde1d9612000593fae4a515ad2d2cbf5940adef7"; - isLibrary = false; + isLibrary = true; isExecutable = true; executableHaskellDepends = [ aeson attoparsec base bytestring cmdargs conduit conduit-extra @@ -173707,9 +176388,9 @@ self: { "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , cereal, cryptonite, data-default-class, hourglass, memory, mtl - , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 - , x509-store, x509-validation + , cereal, criterion, cryptonite, data-default-class, hourglass + , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck + , transformers, x509, x509-store, x509-validation }: mkDerivation { pname = "tls"; @@ -173724,6 +176405,10 @@ self: { base bytestring cereal cryptonite data-default-class hourglass mtl QuickCheck tasty tasty-quickcheck x509 x509-validation ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite data-default-class hourglass + mtl QuickCheck tasty-quickcheck x509 x509-validation + ]; homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; @@ -173758,6 +176443,8 @@ self: { pname = "tls-extra"; version = "0.6.6"; sha256 = "dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey crypto-random cryptohash mtl network pem time tls vector @@ -173973,12 +176660,17 @@ self: { }) {}; "tokenize" = callPackage - ({ mkDerivation, base, split, text }: + ({ mkDerivation, base, bytestring, criterion, deepseq, filepath + , split, text + }: mkDerivation { pname = "tokenize"; version = "0.3.0"; sha256 = "0e88490f06efb45c17138ebbc9bec206b87b98361c2c949ca16546e3f9ab91b5"; libraryHaskellDepends = [ base split text ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq filepath split text + ]; homepage = "https://bitbucket.org/gchrupala/lingo/overview"; description = "Simple tokenizer for English text"; license = stdenv.lib.licenses.bsd3; @@ -174137,8 +176829,8 @@ self: { ({ mkDerivation, base, void }: mkDerivation { pname = "total"; - version = "1.0.4"; - sha256 = "eadd2440d593a5df926f8ed77c6455c235e25948240d235a0ae7bd6bff15807e"; + version = "1.0.5"; + sha256 = "922078be30b4ef27b37c9c7ecafa19e892ac8e19e5c99056ba0456d4c492694f"; libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -174200,6 +176892,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tower" = callPackage + ({ mkDerivation, base, HUnit, protolude, QuickCheck, smallcheck + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector + }: + mkDerivation { + pname = "tower"; + version = "0.1.0"; + sha256 = "0a9daecc7b1ab68b5dfdf108df6d324f27b3798b4eb43e275d957cd4313cd90b"; + libraryHaskellDepends = [ base protolude QuickCheck vector ]; + testHaskellDepends = [ + base HUnit protolude QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/tonyday567/tower"; + description = "A numeric tower"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "toxcore" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary , data-default-class, hspec, QuickCheck, saltine, toxcore @@ -174224,7 +176934,7 @@ self: { "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-builder - , containers, data-default-class, data-interval, deepseq + , containers, criterion, data-default-class, data-interval, deepseq , exceptions, extended-reals, filepath, finite-field, ghc-prim , hashable, haskeline, heaps, intern, loop, mtl, multiset , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes @@ -174263,6 +176973,9 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-th transformers transformers-compat vector vector-space ]; + benchmarkHaskellDepends = [ + array base criterion data-default-class parse-dimacs vector + ]; description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -174294,12 +177007,41 @@ self: { base binary containers distributed-process exceptions network-transport-inmemory pipes QuickCheck stm transformers ]; + benchmarkHaskellDepends = [ + async base binary bytestring containers distributed-process errors + exceptions ghc-prim heaps network network-transport-tcp + optparse-applicative pipes pipes-bytestring pipes-concurrency + pipes-safe process stm transformers trifecta + ]; homepage = "http://github.com/bgamari/tpar/"; description = "simple, parallel job scheduling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tpb" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, boxes, bytestring + , directory, filepath, free, http-client, http-client-tls + , libnotify, microlens, mtl, optparse-applicative, pushbullet-types + , servant, servant-client, servant-pushbullet-client, text, time + , websockets, wuss + }: + mkDerivation { + pname = "tpb"; + version = "0.1.1.1"; + sha256 = "816c0381011987955c8aa1b379f90077334547edf5675e1540d7562acafe5c70"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-wl-pprint base boxes bytestring directory filepath free + http-client http-client-tls libnotify microlens mtl + optparse-applicative pushbullet-types servant servant-client + servant-pushbullet-client text time websockets wuss + ]; + description = "Applications for interacting with the Pushbullet API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tpdb" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text @@ -174394,6 +177136,8 @@ self: { sha256 = "12d0eb7923a905fff4b92c7f4f187a4715ba95883ac1df5e0a7efb59427f5115"; revision = "1"; editedCabalFile = "9e20b69ed0c5280699565c000bcd8f8b70ae6bc2275e37669af70bbca5d4f77a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bifunctors containers json mtl transformers ]; @@ -174427,9 +177171,9 @@ self: { }) {}; "traildb" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , exceptions, Judy, lens, primitive, text, time, traildb - , transformers, unix, vector + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, directory, exceptions, Judy, lens, primitive, random + , text, time, traildb, transformers, unix, vector }: mkDerivation { pname = "traildb"; @@ -174440,6 +177184,9 @@ self: { time transformers unix vector ]; librarySystemDepends = [ Judy traildb ]; + benchmarkHaskellDepends = [ + base bytestring cereal criterion deepseq directory random + ]; description = "TrailDB bindings for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -174628,7 +177375,8 @@ self: { }) {}; "transformers-eff" = callPackage - ({ mkDerivation, base, free, list-transformer, mmorph, transformers + ({ mkDerivation, base, criterion, effect-interpreters, free + , list-transformer, mmorph, mtl, pipes, transformers }: mkDerivation { pname = "transformers-eff"; @@ -174637,6 +177385,9 @@ self: { libraryHaskellDepends = [ base free list-transformer mmorph transformers ]; + benchmarkHaskellDepends = [ + base criterion effect-interpreters mtl pipes transformers + ]; homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; @@ -174743,6 +177494,8 @@ self: { pname = "translatable-intset"; version = "0.1"; sha256 = "7556dd009fa229c94ad47dfc7ef86b1e5e5bf76feee8db9b704419820b0d685f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base fingertree ]; description = "Integer sets with a constant time translate operation"; license = stdenv.lib.licenses.mit; @@ -174968,6 +177721,8 @@ self: { pname = "treeviz"; version = "2.0.3"; sha256 = "dab7dd9935cde4259dab1604b732292a0076e1e8a277476abf822ea2819f26a9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; homepage = "http://www.haskell.org/haskellwiki/Treeviz"; description = "Visualization of computation decomposition trees"; @@ -175020,9 +177775,9 @@ self: { "tries" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, composition - , composition-extra, containers, deepseq, hashable, keys, mtl - , QuickCheck, quickcheck-instances, rose-trees, semigroups, sets - , tasty, tasty-quickcheck, unordered-containers + , composition-extra, containers, criterion, deepseq, hashable, keys + , mtl, QuickCheck, quickcheck-instances, rose-trees, semigroups + , sets, tasty, tasty-quickcheck, unordered-containers }: mkDerivation { pname = "tries"; @@ -175039,6 +177794,12 @@ self: { quickcheck-instances rose-trees semigroups sets tasty tasty-quickcheck unordered-containers ]; + benchmarkHaskellDepends = [ + base bytestring bytestring-trie composition composition-extra + containers criterion deepseq hashable keys mtl QuickCheck + quickcheck-instances rose-trees semigroups sets + unordered-containers + ]; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -175294,6 +178055,8 @@ self: { pname = "tsparse"; version = "0.4.0.0"; sha256 = "511b4bca012747f7fc97a78f620ea3d9dca4e1a6d7a0b2fb17d8f010f7a5bb68"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base Decimal parsec pretty process split time ]; @@ -175376,9 +178139,11 @@ self: { }) {}; "ttrie" = callPackage - ({ mkDerivation, atomic-primops, base, containers, hashable - , primitive, QuickCheck, stm, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, async, atomic-primops, base, bifunctors + , containers, criterion-plus, deepseq, hashable, mwc-random + , primitive, QuickCheck, stm, stm-containers, stm-stats + , test-framework, test-framework-quickcheck2, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "ttrie"; @@ -175391,6 +178156,11 @@ self: { base containers hashable QuickCheck stm test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + async base bifunctors containers criterion-plus deepseq mwc-random + primitive stm stm-containers stm-stats text transformers + unordered-containers vector + ]; homepage = "http://github.com/mcschroeder/ttrie"; description = "Contention-free STM hash map"; license = stdenv.lib.licenses.mit; @@ -175673,8 +178443,8 @@ self: { "turtle" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , directory, doctest, foldl, hostname, managed, optional-args - , optparse-applicative, process, stm, system-fileio + , criterion, directory, doctest, foldl, hostname, managed + , optional-args, optparse-applicative, process, stm, system-fileio , system-filepath, temporary, text, time, transformers, unix , unix-compat }: @@ -175689,6 +178459,7 @@ self: { unix-compat ]; testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -176686,6 +179457,8 @@ self: { pname = "type-natural"; version = "0.7.1.3"; sha256 = "56d3962fb5c7a9e858f75603e1dc8d73c8a8adea65a0097bdf5ef033b0529ee2"; + revision = "1"; + editedCabalFile = "97d8c20d880fd2296ff023ced046b16a9291fa32922c45532027dda1e228db23"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger monomorphic singletons template-haskell @@ -177165,10 +179938,11 @@ self: { }) {}; "tz" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , deepseq, HUnit, QuickCheck, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, time, tzdata, vector + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, thyme, time, timezone-olson, timezone-series + , tzdata, vector }: mkDerivation { pname = "tz"; @@ -177182,6 +179956,9 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th time tzdata ]; + benchmarkHaskellDepends = [ + base criterion lens thyme time timezone-olson timezone-series + ]; preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; homepage = "https://github.com/nilcons/haskell-tz"; description = "Efficient time zone handling"; @@ -177249,9 +180026,9 @@ self: { }) {}; "ua-parser" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, file-embed - , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck - , text, yaml + ({ mkDerivation, aeson, base, bytestring, criterion, data-default + , deepseq, file-embed, filepath, HUnit, pcre-light, tasty + , tasty-hunit, tasty-quickcheck, text, yaml }: mkDerivation { pname = "ua-parser"; @@ -177264,6 +180041,10 @@ self: { aeson base bytestring data-default file-embed filepath HUnit pcre-light tasty tasty-hunit tasty-quickcheck text yaml ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion data-default deepseq file-embed + filepath pcre-light text yaml + ]; description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -177336,6 +180117,8 @@ self: { pname = "udbus"; version = "0.2.1"; sha256 = "d325b0c1f2a7b1eabde17d85734175f622c6597e9dfc40704894da94a09ef328"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring cereal containers ghc-prim mtl network unix utf8-string @@ -177352,6 +180135,8 @@ self: { pname = "udbus-model"; version = "0.2.1"; sha256 = "517ea7b540848f782f3dd6890a5cf41747eca445952649827c2addd3c11f3f76"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring udbus xml ]; homepage = "http://github.com/vincenthz/hs-udbus"; description = "Model API for udbus introspection and definitions"; @@ -177376,6 +180161,8 @@ self: { pname = "udev"; version = "0.1.0.0"; sha256 = "a2bb00c7c75ff9beb1951dfec706c628f5354a6a9d58abcb5e9d6950dc29b1a8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; libraryPkgconfigDepends = [ libudev ]; homepage = "https://github.com/pxqr/udev"; @@ -177552,6 +180339,8 @@ self: { pname = "unagi-bloomfilter"; version = "0.1.1.0"; sha256 = "4cdbd8c483c0c2285737e5f12f6a9c512c6697683b4be5e2e5cb286199db5a0f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ atomic-primops base bytestring hashabler primitive ]; @@ -177561,8 +180350,8 @@ self: { }) {}; "unagi-chan" = callPackage - ({ mkDerivation, atomic-primops, base, containers, ghc-prim - , primitive + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , ghc-prim, primitive }: mkDerivation { pname = "unagi-chan"; @@ -177572,6 +180361,7 @@ self: { testHaskellDepends = [ atomic-primops base containers ghc-prim primitive ]; + benchmarkHaskellDepends = [ async base criterion ]; description = "Fast concurrent queues with a Chan-like API, and more"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -177594,6 +180384,8 @@ self: { pname = "unamb"; version = "0.2.5"; sha256 = "3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; homepage = "http://haskell.org/haskellwiki/unamb"; description = "Unambiguous choice"; @@ -177634,9 +180426,10 @@ self: { }) {}; "unbound-generics" = callPackage - ({ mkDerivation, base, containers, contravariant, deepseq, mtl - , profunctors, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers, transformers-compat + ({ mkDerivation, base, containers, contravariant, criterion + , deepseq, deepseq-generics, mtl, profunctors, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, transformers + , transformers-compat }: mkDerivation { pname = "unbound-generics"; @@ -177649,6 +180442,9 @@ self: { testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics + ]; homepage = "http://github.com/lambdageek/unbound-generics"; description = "Support for programming with names and binders using GHC Generics"; license = stdenv.lib.licenses.bsd3; @@ -177905,6 +180701,8 @@ self: { pname = "unicode"; version = "0.0"; sha256 = "d41708f5800a83a2b7f44d10f74371625fbc50dd4a9520dd6fc53762904cc83b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers utility-ht ]; homepage = "http://code.haskell.org/~thielema/unicode/"; @@ -177992,8 +180790,9 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bitarray, bytestring, deepseq - , getopt-generics, QuickCheck, split, text + ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq + , filepath, getopt-generics, optparse-applicative, path, path-io + , QuickCheck, split, text }: mkDerivation { pname = "unicode-transforms"; @@ -178003,14 +180802,19 @@ self: { testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text ]; + benchmarkHaskellDepends = [ + base criterion deepseq filepath optparse-applicative path path-io + text + ]; homepage = "http://github.com/harendra-kumar/unicode-transforms"; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; }) {}; "unicode-transforms_0_3_0" = callPackage - ({ mkDerivation, base, bitarray, bytestring, deepseq - , getopt-generics, QuickCheck, split, text + ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq + , filepath, getopt-generics, optparse-applicative, path, path-io + , QuickCheck, split, text }: mkDerivation { pname = "unicode-transforms"; @@ -178020,6 +180824,10 @@ self: { testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text ]; + benchmarkHaskellDepends = [ + base criterion deepseq filepath optparse-applicative path path-io + text + ]; homepage = "http://github.com/harendra-kumar/unicode-transforms"; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; @@ -178102,12 +180910,15 @@ self: { }) {}; "union" = callPackage - ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: + ({ mkDerivation, base, criterion, deepseq, lens, profunctors + , tagged, vinyl + }: mkDerivation { pname = "union"; version = "0.1.1.1"; sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; + benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -178587,6 +181398,8 @@ self: { pname = "unix-fcntl"; version = "0.0.0"; sha256 = "69c1852fa11e98c99e0f61052bd642e66f2e491ffba1e0ee6d7cd5d049f832a3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base foreign-var ]; homepage = "https://github.com/maoe/unix-fcntl"; description = "Comprehensive bindings to fcntl(2)"; @@ -178754,8 +181567,9 @@ self: { }) {}; "unordered-containers" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { @@ -178767,6 +181581,10 @@ self: { base ChasingBottoms containers hashable HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; license = stdenv.lib.licenses.bsd3; @@ -178866,6 +181684,8 @@ self: { pname = "unsafely"; version = "0.2.0.0"; sha256 = "19341a7d3d2e4d4ae3a4a232c566edb071c895a17e5f1d1ad092b1d3fe026583"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; homepage = "http://github.com/konn/unsafely"; description = "Flexible access control for unsafe operations and instances"; @@ -179150,27 +181970,63 @@ self: { "uri-bytestring" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, generics-sop, HUnit, lens-simple, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck + , containers, criterion, deepseq, deepseq-generics, generics-sop + , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances + , semigroups, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, th-lift-instances }: mkDerivation { pname = "uri-bytestring"; - version = "0.2.2.1"; - sha256 = "9185e8f05d5c5154348c0d57d0df2b92ba6d09153fbdebded995b2f54e71c67e"; + version = "0.2.3.0"; + sha256 = "50178faac44a67095602412846682040b8b72ae8af5289e73dabe2cc49a639dd"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers + template-haskell th-lift-instances ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring containers generics-sop HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq deepseq-generics + network-uri + ]; homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_2_3_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , containers, criterion, deepseq, deepseq-generics, generics-sop + , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances + , semigroups, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, th-lift-instances + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.2.3.1"; + sha256 = "1d2814b8ca76c8b72fcf995d4d863c492b22bc80c62d990dad2d969cbef1b16d"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers + template-haskell th-lift-instances + ]; + testHaskellDepends = [ + attoparsec base blaze-builder bytestring containers generics-sop + HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq deepseq-generics + network-uri + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -179197,6 +182053,8 @@ self: { pname = "uri-encode"; version = "1.5.0.5"; sha256 = "e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring network-uri text utf8-string ]; @@ -179356,6 +182214,8 @@ self: { pname = "urlencoded"; version = "0.4.1"; sha256 = "91431808fc26a7a9d2d18100c93c8b0a815de519e33547e8f60da9ed66976799"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mtl network network-uri split ]; homepage = "https://github.com/pheaver/urlencoded"; description = "Generate or process x-www-urlencoded data"; @@ -179468,6 +182328,8 @@ self: { pname = "usb-id-database"; version = "0.4.0.9"; sha256 = "4187f776f53c50423e1064753c0bf5446db871a6a4113ec8d970d24a5ffe26ca"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base-unicode-symbols bytestring containers containers-unicode-symbols parsimony @@ -179888,9 +182750,10 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash-md5 - , cryptohash-sha1, entropy, HUnit, network-info, QuickCheck, random - , tasty, tasty-hunit, tasty-quickcheck, text, time, uuid-types + ({ mkDerivation, base, binary, bytestring, criterion + , cryptohash-md5, cryptohash-sha1, entropy, HUnit + , mersenne-random-pure64, network-info, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, time, uuid-types }: mkDerivation { pname = "uuid"; @@ -179904,6 +182767,9 @@ self: { base bytestring HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base criterion mersenne-random-pure64 random + ]; homepage = "https://github.com/hvr/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -179961,8 +182827,9 @@ self: { }) {}; "uuid-types" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit - , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, hashable, HUnit, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "uuid-types"; @@ -179976,6 +182843,9 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq random + ]; homepage = "https://github.com/aslatter/uuid"; description = "Type definitions for Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -180382,8 +183252,8 @@ self: { }) {}; "var" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-quickcheck2, transformers + ({ mkDerivation, array, base, criterion, deepseq, QuickCheck + , test-framework, test-framework-quickcheck2, transformers }: mkDerivation { pname = "var"; @@ -180393,6 +183263,7 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ array base criterion deepseq ]; homepage = "http://github.com/sonyandy/var"; description = "Mutable variables and tuples"; license = stdenv.lib.licenses.bsd3; @@ -180450,7 +183321,9 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: + ({ mkDerivation, base, criterion, hspec, QuickCheck, time + , transformers + }: mkDerivation { pname = "varying"; version = "0.7.0.3"; @@ -180460,6 +183333,7 @@ self: { libraryHaskellDepends = [ base transformers ]; executableHaskellDepends = [ base time transformers ]; testHaskellDepends = [ base hspec QuickCheck time transformers ]; + benchmarkHaskellDepends = [ base criterion time transformers ]; homepage = "https://github.com/schell/varying"; description = "FRP through value streams and monadic splines"; license = stdenv.lib.licenses.mit; @@ -180803,6 +183677,8 @@ self: { sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070"; revision = "1"; editedCabalFile = "82d67db49c85c1e136b6e6e44f99c908b405628a17b0d220c95aed34845426a5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -180825,13 +183701,18 @@ self: { }) {}; "vector-binary-instances" = callPackage - ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , tasty, tasty-quickcheck, vector + }: mkDerivation { pname = "vector-binary-instances"; version = "0.2.3.4"; sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq vector + ]; homepage = "https://github.com/bos/vector-binary-instances"; description = "Instances of Data.Binary and Data.Serialize for vector"; license = stdenv.lib.licenses.bsd3; @@ -180886,6 +183767,8 @@ self: { pname = "vector-bytestring"; version = "0.0.0.1"; sha256 = "641eef86c91a0c742d74c1ea0f29ca69d9105379296ad622cb5f991142d53376"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq ghc-prim primitive vector ]; @@ -181167,8 +184050,9 @@ self: { }) {}; "vectortiles" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex - , protobuf, tasty, tasty-hunit, text, transformers, vector + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, hex, microlens, microlens-platform, protobuf, tasty + , tasty-hunit, text, transformers, vector }: mkDerivation { pname = "vectortiles"; @@ -181181,6 +184065,10 @@ self: { testHaskellDepends = [ base bytestring cereal hex protobuf tasty tasty-hunit text vector ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers criterion microlens + microlens-platform protobuf text + ]; homepage = "https://github.com/fosskers/vectortiles"; description = "GIS Vector Tiles, as defined by Mapbox"; license = stdenv.lib.licenses.asl20; @@ -181237,6 +184125,8 @@ self: { pname = "verdict-json"; version = "0.0.0.0"; sha256 = "7b64ab1ec3ae42db778f8adc52219a472af76ea0dd4d91d9376ad57dc9abaf4a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base containers text unordered-containers vector verdict ]; @@ -181321,6 +184211,8 @@ self: { pname = "vhd"; version = "0.2.2"; sha256 = "7c678f076395f44d853f87a4538635bc83d7a10319933dec9e06b40ce409ea7c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base byteable bytestring cereal cipher-aes cryptohash directory filepath mmap random storable-endian text time @@ -181513,13 +184405,18 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }: + ({ mkDerivation, base, criterion, doctest, ghc-prim, lens, linear + , mwc-random, singletons, vector + }: mkDerivation { pname = "vinyl"; version = "0.5.3"; sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base doctest lens singletons ]; + benchmarkHaskellDepends = [ + base criterion lens linear mwc-random vector + ]; description = "Extensible Records"; license = stdenv.lib.licenses.mit; }) {}; @@ -181619,6 +184516,8 @@ self: { pname = "vinyl-vectors"; version = "0.2.0"; sha256 = "6f9b6b8772937c967ad2b51e062cab27cb94fdbfb6d5e35eaae7c396e42362d7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring constraints data-default primitive template-haskell text vector vinyl @@ -182639,6 +185538,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-auth" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary + , blaze-builder, blaze-html, bytestring, case-insensitive, cereal + , clientsession, cookie, exceptions, hoauth2, http-client + , http-client-tls, http-conduit, http-reverse-proxy, http-types + , optparse-simple, regex-posix, safe-exceptions, shakespeare, text + , unix-compat, unordered-containers, vault, wai, wai-app-static + , wai-extra, warp, yaml + }: + mkDerivation { + pname = "wai-middleware-auth"; + version = "0.1.1.0"; + sha256 = "f951faa7f3b143b36268b3c3b0250779d229490b0a4bad8722cda3ea0a60a1a1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary blaze-builder blaze-html + bytestring case-insensitive cereal clientsession cookie exceptions + hoauth2 http-client http-client-tls http-conduit http-reverse-proxy + http-types regex-posix safe-exceptions shakespeare text unix-compat + unordered-containers vault wai wai-app-static wai-extra yaml + ]; + executableHaskellDepends = [ + base bytestring cereal clientsession optparse-simple warp + ]; + description = "Authentication middleware that secures WAI application"; + license = stdenv.lib.licenses.mit; + }) {}; + "wai-middleware-cache" = callPackage ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring , conduit, crypto-conduit, http-types, HUnit, pureMD5 @@ -182759,6 +185687,8 @@ self: { pname = "wai-middleware-consul"; version = "0.1.0.2"; sha256 = "d89d5a5bf0b08cf4fcd300d9e16c351a146119c34a9f31949498a874699c0763"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base base-prelude bytestring conduit conduit-extra consul-haskell enclosed-exceptions http-client http-types @@ -182910,6 +185840,8 @@ self: { pname = "wai-middleware-hmac-client"; version = "0.1.0.2"; sha256 = "ba419c0e9a6d00e7ab03150219012128908bc3018b43d7d4cb46cbb01babaeca"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base64-bytestring byteable bytestring case-insensitive cryptohash http-client http-types mtl old-locale time transformers @@ -182921,9 +185853,9 @@ self: { }) {}; "wai-middleware-metrics" = callPackage - ({ mkDerivation, base, bytestring, ekg-core, http-types, QuickCheck - , scotty, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, wai, wai-extra + ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types + , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, wai, wai-extra }: mkDerivation { pname = "wai-middleware-metrics"; @@ -182934,6 +185866,10 @@ self: { base bytestring ekg-core http-types QuickCheck scotty tasty tasty-hunit tasty-quickcheck text time transformers wai wai-extra ]; + benchmarkHaskellDepends = [ + base bytestring criterion ekg-core http-types scotty text time wai + wai-extra + ]; homepage = "https://github.com/Helkafen/wai-middleware-metrics"; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; @@ -183073,6 +186009,8 @@ self: { pname = "wai-middleware-verbs"; version = "0.3.2"; sha256 = "691fa97fda7204d84e1fa8f953334ca51cb1055577a5ec1d56cc5f07491aaa66"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base errors exceptions hashable http-types mmorph monad-logger mtl resourcet transformers transformers-base unordered-containers wai @@ -183106,7 +186044,7 @@ self: { "wai-request-spec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-types, text, wai + , criterion, http-types, text, wai }: mkDerivation { pname = "wai-request-spec"; @@ -183115,6 +186053,9 @@ self: { libraryHaskellDepends = [ base bytestring case-insensitive containers http-types text wai ]; + benchmarkHaskellDepends = [ + base bytestring criterion http-types text wai + ]; homepage = "https://gitlab.com/queertypes/wai-request-spec"; description = "Declarative request parsing"; license = stdenv.lib.licenses.bsd3; @@ -183194,8 +186135,8 @@ self: { "wai-routing" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie - , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers - , wai, wai-predicates, wai-route + , criterion, http-types, tasty, tasty-hunit, tasty-quickcheck + , transformers, wai, wai-predicates, wai-route }: mkDerivation { pname = "wai-routing"; @@ -183210,6 +186151,9 @@ self: { case-insensitive containers http-types tasty tasty-hunit tasty-quickcheck wai wai-predicates ]; + benchmarkHaskellDepends = [ + base criterion http-types wai wai-predicates + ]; homepage = "https://gitlab.com/twittner/wai-routing/"; description = "Declarative routing for WAI"; license = stdenv.lib.licenses.mpl20; @@ -183503,6 +186447,8 @@ self: { sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12"; revision = "2"; editedCabalFile = "7b2f9d4fe0358eb303c3993233b05c1505f4021ebee41fccfad0b6badbf8bd8f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring directory filepath http-types regex-applicative template-haskell text wai @@ -183547,15 +186493,16 @@ self: { "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers - , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 + , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP + , http-date, http-types, http2, HUnit, iproute, lifted-base + , network, process, QuickCheck, silently, simple-sendfile, stm + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, wai, word8 }: mkDerivation { pname = "warp"; - version = "3.2.11"; - sha256 = "193e6cd899c09850819c09ae4a4368f569ee65559eef3f440be83b6c2b2cffac"; + version = "3.2.11.1"; + sha256 = "853f672c48893936902a0c6b3e4711f58c0fd02f36e8badb46a0c8b58067e5fe"; libraryHaskellDepends = [ array async auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers ghc-prim hashable @@ -183570,6 +186517,10 @@ self: { simple-sendfile stm streaming-commons text time transformers unix unix-compat vault wai word8 ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers criterion hashable http-date + http-types network unix unix-compat + ]; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; @@ -183641,6 +186592,8 @@ self: { pname = "warp-tls-uid"; version = "0.1.0.4"; sha256 = "beacad56f701aa913e0912a7a319a8b95d8e5100dddbf1f8655d7ce4a64c5b85"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring certificate conduit crypto-random network network-conduit pem tls tls-extra unix wai warp @@ -183823,6 +186776,8 @@ self: { pname = "wcwidth"; version = "0.0.2"; sha256 = "ffc68736a3bbde3e8157710f29f4a99c0ca593c41194579c54a92c62f6c12ed8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers ]; homepage = "http://github.com/solidsnack/wcwidth/"; description = "Native wcwidth"; @@ -183878,6 +186833,8 @@ self: { pname = "web-encodings"; version = "0.3.0.9"; sha256 = "a30b0e0c596a1e9953fb1d5a5aa2ebe1710561d662294088d0cea657f5dae951"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring directory failure old-locale text time ]; @@ -183954,6 +186911,8 @@ self: { pname = "web-page"; version = "0.2.0"; sha256 = "143301e4a9ff9f01507ef2b4548aebce01811090b176d52adc3dc87bcce5f8c3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring clay containers jmacro lens mtl Stream text vector wl-pprint-text @@ -184070,6 +187029,8 @@ self: { pname = "web-routes-quasi"; version = "0.7.1.1"; sha256 = "aeb63d0670b2229a246530cb05666957bfa15387d2617104856d1e0b62f50be7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base path-pieces template-haskell text ]; homepage = "http://docs.yesodweb.com/web-routes-quasi/"; description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; @@ -184134,8 +187095,8 @@ self: { }) {}; "web-routing" = callPackage - ({ mkDerivation, base, bytestring, doctest, primitive, text - , types-compat, unordered-containers + ({ mkDerivation, base, bytestring, criterion, doctest, primitive + , text, types-compat, unordered-containers }: mkDerivation { pname = "web-routing"; @@ -184147,6 +187108,7 @@ self: { base bytestring primitive text types-compat unordered-containers ]; testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion text ]; homepage = "https://github.com/philopon/web-routing"; description = "simple routing library"; license = stdenv.lib.licenses.mit; @@ -184160,8 +187122,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.5.3.0"; - sha256 = "258d2344367d7ceb3c1a43acd99b05bb23afbc5c5476be4d341e3ca2f56ae91d"; + version = "0.5.4.0"; + sha256 = "a33d6944539d6f7f811c8e0fffed8a8a291d6a0e147f29199cd9eadaada69e01"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptonite http-client http-client-tls memory template-haskell text @@ -184458,6 +187420,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; "webkit-javascriptcore" = callPackage @@ -184504,6 +187467,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; "webkitgtk3-javascriptcore" = callPackage @@ -184517,6 +187481,7 @@ self: { libraryPkgconfigDepends = [ webkit ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; "webpage" = callPackage @@ -184586,6 +187551,8 @@ self: { pname = "websockets"; version = "0.10.0.0"; sha256 = "3ee56fa6683912928a7d336d591c43e4948886037b5aa72cbab2f33fb43fa2eb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy network random SHA text @@ -184707,6 +187674,8 @@ self: { pname = "weighted-regexp"; version = "0.3.1.2"; sha256 = "f963773841854c56d36f329dae51ec08b9028832eee53b62a9ba7df5ef2de664"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ happy ]; homepage = "http://sebfisch.github.com/haskell-regexp"; @@ -184958,13 +187927,18 @@ self: { }) {}; "wigner-symbols" = callPackage - ({ mkDerivation, base, bytestring, cryptonite }: + ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive + , random, vector + }: mkDerivation { pname = "wigner-symbols"; version = "1.0.0"; sha256 = "0d2ae52728e6ef32519a6b648033185617291e76c4996c7107b9a3caf73db28e"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring cryptonite ]; + benchmarkHaskellDepends = [ + base criterion primitive random vector + ]; homepage = "https://github.com/Rufflewind/wigner-symbols"; description = "CG coefficients and Wigner symbols"; license = stdenv.lib.licenses.mit; @@ -185098,6 +188072,8 @@ self: { pname = "windowslive"; version = "0.3"; sha256 = "7fc9617306ccbe99a8f910ca442bfeabd8e78b8668db773defefa5b41b1fb395"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base Crypto dataenc mtl network parsec pretty split time urlencoded ]; @@ -185113,8 +188089,7 @@ self: { pname = "winerror"; version = "1.0.1"; sha256 = "0d527e4024967909171d3aea30d43abb0fd84306f77aa26625466c0f3de95575"; - isLibrary = false; - isExecutable = false; + doHaddock = false; description = "Error handling for foreign calls to the Windows API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -185139,19 +188114,26 @@ self: { }) {kernel32 = null; ws2_32 = null;}; "wire-streams" = callPackage - ({ mkDerivation, base, binary, binary-parsers, bytestring - , io-streams, QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, binary, binary-parsers, bytestring, cereal + , cereal-conduit, conduit, conduit-extra, criterion, io-streams + , QuickCheck, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "wire-streams"; version = "0.1.1.0"; sha256 = "96dffb70c08c89589881c96f199d271b55e4a5b3cc5be0f3e24e101858e2fb27"; + revision = "1"; + editedCabalFile = "08816c7fa53b20f52e5c465252c106d9de8e6d9580ec0b6d9f000a34c7bcefc8"; libraryHaskellDepends = [ base binary binary-parsers bytestring io-streams ]; testHaskellDepends = [ base binary bytestring io-streams QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base binary bytestring cereal cereal-conduit conduit conduit-extra + criterion io-streams transformers + ]; homepage = "https://github.com/winterland1989/wire-streams"; description = "Fast binary io-streams adapter"; license = stdenv.lib.licenses.bsd3; @@ -185165,6 +188147,8 @@ self: { pname = "wires"; version = "0.1.0"; sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base deepseq profunctors semigroupoids these ]; @@ -185583,8 +188567,8 @@ self: { }) {}; "word24" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, base, criterion, deepseq, QuickCheck + , test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "word24"; @@ -185594,6 +188578,7 @@ self: { testHaskellDepends = [ base deepseq QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/winterland1989/word24"; description = "24-bit word and int types for GHC"; license = stdenv.lib.licenses.bsd3; @@ -185601,13 +188586,14 @@ self: { }) {}; "word8" = callPackage - ({ mkDerivation, base, hspec }: + ({ mkDerivation, base, bytestring, criterion, hspec }: mkDerivation { pname = "word8"; version = "0.1.2"; sha256 = "3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Word8 library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -185763,7 +188749,7 @@ self: { pname = "workflow-windows"; version = "0.0.0"; sha256 = "4c922f26ea5580022b8ecd184ce473eabead4a035cc95ea9394f9fc04efdff92"; - isLibrary = false; + isLibrary = true; isExecutable = true; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hspec QuickCheck ]; @@ -185821,6 +188807,8 @@ self: { pname = "wraxml"; version = "0.4.4.1"; sha256 = "828d9250db9472c321c55d08f9daa2c4c9995e95d2fd964ef0c1d16b32c75613"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers data-accessor explicit-exception HaXml hxt hxt-filter polyparse tagchup tagsoup transformers utility-ht @@ -185893,6 +188881,8 @@ self: { pname = "wreq"; version = "0.5.0.0"; sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base base16-bytestring byteable bytestring case-insensitive containers cryptohash exceptions @@ -185929,6 +188919,8 @@ self: { pname = "wreq-sb"; version = "0.4.0.0"; sha256 = "dfc9c0a13696bbe2521a9d440bd9c8a57b8dccef270bdffb011bf320a7971b54"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base base16-bytestring byteable bytestring case-insensitive containers cryptohash exceptions @@ -186766,6 +189758,8 @@ self: { pname = "xenstore"; version = "0.1.1"; sha256 = "c2b538c9ce6716f4a1b4c0cb63ed5c6e5ee3e69e80dbb7826ee7f5392f45e874"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring cereal mtl network ]; description = "Xenstore client access"; license = stdenv.lib.licenses.bsd3; @@ -186781,10 +189775,14 @@ self: { sha256 = "9febbf8349f27fa184c56959a01db2f78176bd534f103f6b1be0bb01b7fac360"; revision = "1"; editedCabalFile = "ce4bb3ab326d8e4c0a4fc2576045b589305b12f7ca28b79a69fcc367c429d33c"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base Cabal containers directory filepath ]; libraryHaskellDepends = [ base glib ]; libraryPkgconfigDepends = [ libxfconf ]; libraryToolDepends = [ gtk2hs-buildtools ]; + executablePkgconfigDepends = [ libxfconf ]; + executableToolDepends = [ gtk2hs-buildtools ]; homepage = "http://patch-tag.com/r/obbele/xfconf/home"; description = "FFI bindings to xfconf"; license = stdenv.lib.licenses.gpl3; @@ -186943,6 +189941,8 @@ self: { pname = "xing-api"; version = "0.1.3"; sha256 = "b3e21b098ef46e9d496efa4257172fa5a872149e708f694cd0ea60ef192d23fc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring containers http-conduit http-types lifted-base monad-control resourcet text time @@ -186974,8 +189974,9 @@ self: { "xkbcommon" = callPackage ({ mkDerivation, base, bytestring, Cabal, cpphs, data-flags - , directory, filepath, libxkbcommon, process, storable-record - , template-haskell, text, transformers, unix + , directory, filepath, libxkbcommon, process, random + , storable-record, template-haskell, text, time, transformers, unix + , vector }: mkDerivation { pname = "xkbcommon"; @@ -186990,6 +189991,7 @@ self: { ]; librarySystemDepends = [ libxkbcommon ]; testHaskellDepends = [ base unix ]; + benchmarkHaskellDepends = [ base random time vector ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -187288,6 +190290,8 @@ self: { pname = "xml-enumerator-combinators"; version = "0.1"; sha256 = "63c9e2548ef8c83116fff84160b48494974b1cf34852fe2e6377cab53ef754d8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers enumerator xml-enumerator xml-types ]; @@ -187351,6 +190355,8 @@ self: { pname = "xml-html-conduit-lens"; version = "0.3.2.2"; sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac"; + revision = "1"; + editedCabalFile = "4673f03cf274523d25c1b07e4fddd6b1729e42a372ef7e1967705b808eda52a8"; libraryHaskellDepends = [ base bytestring containers html-conduit lens text xml-conduit ]; @@ -187386,6 +190392,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-indexed-cursor" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , doctest, Glob, tasty, tasty-hunit, text, xml-conduit + }: + mkDerivation { + pname = "xml-indexed-cursor"; + version = "0.1.1.0"; + sha256 = "46d622fc738e8cc1513f598207ee5e6cda790c79e0697fe02d2da6ad02a6da74"; + libraryHaskellDepends = [ + base bytestring containers data-default text xml-conduit + ]; + testHaskellDepends = [ + base bytestring data-default doctest Glob tasty tasty-hunit text + xml-conduit + ]; + homepage = "https://github.com/cdepillabout/xml-indexed-cursor"; + description = "Indexed XML cursors similar to 'Text.XML.Cursor' from xml-conduit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xml-isogen" = callPackage ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck , semigroups, template-haskell, text, xml-conduit-writer @@ -187719,7 +190745,8 @@ self: { "xmlgen" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers - , filepath, HUnit, hxt, mtl, process, QuickCheck, text, unix + , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text + , unix }: mkDerivation { pname = "xmlgen"; @@ -187732,6 +190759,7 @@ self: { base bytestring containers filepath HUnit hxt process QuickCheck text unix ]; + benchmarkHaskellDepends = [ base bytestring criterion text ]; description = "Fast XML generation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -188029,20 +191057,20 @@ self: { }) {}; "xmonad-vanessa" = callPackage - ({ mkDerivation, base, containers, process, transformers, X11 - , xmonad, xmonad-contrib, xmonad-extras + ({ mkDerivation, base, containers, hspec, process, transformers + , X11, xmonad, xmonad-contrib }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.0.3"; - sha256 = "2ec997506b554282bbbddf02d9bb72326637ce5c6cd5634604b93a7e6e2b9ffa"; + version = "0.1.0.6"; + sha256 = "7abfe1bdaf7a9bbecdfa89b36b7144fe590d5b6344cc4838fb287e8f5ded52c4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers process transformers X11 xmonad xmonad-contrib - xmonad-extras ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec xmonad ]; homepage = "https://github.com/vmchale/xmonad-vanessa#readme"; description = "Custom xmonad, which uses stack and sets various defaults"; license = stdenv.lib.licenses.bsd3; @@ -188353,8 +191381,8 @@ self: { }) {}; "xxhash" = callPackage - ({ mkDerivation, base, bytestring, crypto-api, hspec, QuickCheck - , tagged + ({ mkDerivation, base, bytestring, criterion, crypto-api, deepseq + , digest, hashable, hspec, murmur-hash, QuickCheck, tagged }: mkDerivation { pname = "xxhash"; @@ -188362,6 +191390,9 @@ self: { sha256 = "4f5cc71564d71b7ab1e9f70ce9b8d32a3d73cb0b1e08ff96bc54298b21eb2f27"; libraryHaskellDepends = [ base bytestring crypto-api tagged ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq digest hashable murmur-hash + ]; description = "A Haskell implementation of the xxHash algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -188550,37 +191581,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, enclosed-exceptions - , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific - , semigroups, template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.21.2"; - sha256 = "441cf712cd20ac6b0ded900562ca33770c8752702963ab267bff72b0657fef29"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - enclosed-exceptions filepath resourcet scientific semigroups - template-haskell text transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet temporary text transformers - unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_22" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, filepath, hspec , HUnit, libyaml, mockery, resourcet, scientific, semigroups @@ -188609,7 +191609,6 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage @@ -188781,6 +191780,8 @@ self: { sha256 = "167c8dc3992d98d879eb281b27a0dbf6fde21ca69992e384df4b5babcdda3e3c"; revision = "1"; editedCabalFile = "98e99a555170a8b7281116b4e9c829c011b2401f21589f55ae80333ff2d6f34a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; description = "blank-canvas frontend for Yampa"; license = stdenv.lib.licenses.bsd3; @@ -188814,6 +191815,8 @@ self: { pname = "yampa-glut"; version = "0.1.1.1"; sha256 = "f7c2b8aec210261341310f0c63f2eed3f80952077ad907ebff4427902ce4c304"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base GLUT newtype OpenGL vector-space Yampa-core ]; @@ -188984,9 +191987,9 @@ self: { }) {}; "yeller" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-client-tls, http-types, network, stm, text - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, hspec, http-client, http-client-tls, http-types, network + , stm, text, unordered-containers }: mkDerivation { pname = "yeller"; @@ -189000,6 +192003,10 @@ self: { aeson base bytestring containers hspec http-client http-client-tls http-types network stm text unordered-containers ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq http-client + http-client-tls http-types network stm text unordered-containers + ]; homepage = "http://yellerapp.com"; description = "A Yeller Client For Haskell"; license = stdenv.lib.licenses.mit; @@ -189073,6 +192080,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod_1_4_5" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , conduit, conduit-extra, data-default-class, directory + , fast-logger, monad-control, monad-logger, resourcet, semigroups + , shakespeare, streaming-commons, template-haskell, text + , transformers, unix, unordered-containers, wai, wai-extra + , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.4.5"; + sha256 = "267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring conduit conduit-extra + data-default-class directory fast-logger monad-control monad-logger + resourcet semigroups shakespeare streaming-commons template-haskell + text transformers unix unordered-containers wai wai-extra + wai-logger warp yaml yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-angular" = callPackage ({ mkDerivation, aeson, base, containers, shakespeare , template-haskell, text, transformers, yesod @@ -189137,6 +192169,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_4_17" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, mime-mail + , network-uri, nonce, persistent, persistent-template, random + , resourcet, safe, shakespeare, template-haskell, text, time + , transformers, unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.17"; + sha256 = "444a9b4b913e5f7addb1b9c5aa778f32d2b9e040d9b1c4d8a232fae908392891"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptohash data-default email-validate + file-embed http-client http-conduit http-types lifted-base + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -189384,8 +192446,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.4.1.1"; - sha256 = "2dd9eda01b3b7625711b0a1dafce82915e82154976cd94c6076c8fa929d80773"; + version = "1.4.2"; + sha256 = "c115b0cd142423642e83775d81feee450e7bea2785ea882cd197bf3926ca7927"; libraryHaskellDepends = [ authenticate-oauth base bytestring lifted-base text transformers yesod-auth yesod-core yesod-form @@ -189405,6 +192467,8 @@ self: { pname = "yesod-auth-oauth2"; version = "0.2.2"; sha256 = "6276f3bef0c992084ce55cdefb64dbb63b9a27b3ccfed515318f043ea7b85c33"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson authenticate base bytestring hoauth2 http-client http-conduit http-types lifted-base network-uri random text transformers vector @@ -189504,6 +192568,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_5_2" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, http-client, http-client-tls + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, safe-exceptions, say, shakespeare, split, stm + , streaming-commons, tar, template-haskell, text, time + , transformers, transformers-compat, typed-process, unix-compat + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.5.2"; + sha256 = "b37087eb7e167c2250dd23452e8f4858190db11570e540df44809c197219439a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + safe-exceptions say shakespeare split stm streaming-commons tar + template-haskell text time transformers transformers-compat + typed-process unix-compat unordered-containers wai wai-extra warp + warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -189527,8 +192626,8 @@ self: { }: mkDerivation { pname = "yesod-colonnade"; - version = "0.4"; - sha256 = "3cdb1f10dee36cdf4adebc5799fb108e4112065659051aed025ef4359b3509d7"; + version = "1.1.0"; + sha256 = "163fbe1c8618c01d17900ba205e7df8bd9e0a7abc5475ae6436417afafbf0a34"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text yesod-core ]; @@ -189605,9 +192704,9 @@ self: { ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie - , data-default, deepseq, deepseq-generics, directory, exceptions - , fast-logger, hspec, hspec-expectations, http-types, HUnit - , lifted-base, monad-control, monad-logger, mtl, mwc-random + , criterion, data-default, deepseq, deepseq-generics, directory + , exceptions, fast-logger, hspec, hspec-expectations, http-types + , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random , network, old-locale, parsec, path-pieces, primitive, QuickCheck , random, resourcet, safe, semigroups, shakespeare , streaming-commons, template-haskell, text, time, transformers @@ -189636,11 +192735,58 @@ self: { resourcet shakespeare streaming-commons template-haskell text transformers wai wai-extra ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion shakespeare text transformers + ]; homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_32" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , criterion, data-default, deepseq, deepseq-generics, directory + , exceptions, fast-logger, hspec, hspec-expectations, http-types + , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.32"; + sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -189796,6 +192942,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-eventsource_1_4_1" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, transformers, wai + , wai-eventsource, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-eventsource"; + version = "1.4.1"; + sha256 = "4019782d074ed5c23719e8e96f604b63990d9fd49255e14b7f5b769e7f3d3e13"; + libraryHaskellDepends = [ + base blaze-builder conduit transformers wai wai-eventsource + wai-extra yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Server-sent events support for Yesod apps"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-examples" = callPackage ({ mkDerivation, base, blaze-html, bytestring, data-object , data-object-yaml, hamlet, persistent-sqlite, persistent-template @@ -189880,6 +193044,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_4_11" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.4.11"; + sha256 = "45edd3ea97a09968426ab20ea4595389b61f5fc2c9e328cecbdeed4a78dcd8d6"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -189991,6 +193180,8 @@ self: { pname = "yesod-job-queue"; version = "0.3.0.1"; sha256 = "a58805e218e5b0e6c623a5447f06484004d72a357f4b2e30d476da56618b734f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson api-field-json-th base bytestring cron file-embed hedis lens monad-control monad-logger stm text time transformers uuid yesod @@ -190048,6 +193239,8 @@ self: { pname = "yesod-mangopay"; version = "1.12"; sha256 = "a53c0d1e8e1654a4c251b1830264f581a1ed668fffb303c05993e10e20932754"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers http-conduit http-types lifted-base mangopay persistent-template text time yesod yesod-core @@ -190149,8 +193342,10 @@ self: { }: mkDerivation { pname = "yesod-paginator"; - version = "0.10.1"; - sha256 = "06dd2e4ffb031176e3e9538f5ed5051e4e188ad803b8071bbc69a95e59d576c3"; + version = "0.11.0"; + sha256 = "60afa9b2a11f8c61a5ca090d3e0b0effe35162f67038e9c833a6e100b28aeb96"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base persistent resourcet text transformers yesod ]; @@ -190198,6 +193393,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_4_2" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.4.2"; + sha256 = "d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate @@ -190613,6 +193831,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-static_1_5_2" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, cryptohash-conduit, css-text + , data-default, directory, exceptions, file-embed, filepath + , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time + , process, resourcet, template-haskell, text, transformers + , unix-compat, unordered-containers, wai, wai-app-static, wai-extra + , yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-static"; + version = "1.5.2"; + sha256 = "b949c5f6087d9e32c7ff2f41ed647b1df605bbe1ce2cbcfe59cc46dc4a72099e"; + libraryHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder byteable + bytestring conduit conduit-extra containers cryptohash + cryptohash-conduit css-text data-default directory exceptions + file-embed filepath hashable hjsmin http-types mime-types old-time + process resourcet template-haskell text transformers unix-compat + unordered-containers wai wai-app-static yesod-core + ]; + testHaskellDepends = [ + async base base64-bytestring byteable bytestring conduit + conduit-extra containers cryptohash cryptohash-conduit data-default + directory exceptions file-embed filepath hjsmin hspec http-types + HUnit mime-types old-time process resourcet template-haskell text + transformers unix-compat unordered-containers wai wai-app-static + wai-extra yesod-core yesod-test + ]; + homepage = "http://www.yesodweb.com/"; + description = "Static file serving subsite for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-static-angular" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-markup , bytestring, data-default, directory, filepath, hamlet, hspec @@ -190623,6 +193877,8 @@ self: { pname = "yesod-static-angular"; version = "0.1.8"; sha256 = "97b3ef260a7e6c70b811cbf3b2b3532a003c5028bd6a0df52fc14bd45ce03beb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base blaze-builder blaze-markup bytestring data-default directory filepath hamlet language-javascript mime-types @@ -190692,6 +193948,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_5_5" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, containers, cookie + , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base + , monad-control, network, persistent, pretty-show, text, time + , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.5.5"; + sha256 = "44425bf59542649ff0b1ba4c976d8c35060c17c082e8b9f75a81ff89e16f0a39"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive containers cookie hspec-core html-conduit + http-types HUnit monad-control network persistent pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit + lifted-base text wai xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -190809,6 +194093,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets_0_2_6" = callPackage + ({ mkDerivation, async, base, conduit, enclosed-exceptions + , monad-control, transformers, wai, wai-websockets, websockets + , yesod-core + }: + mkDerivation { + pname = "yesod-websockets"; + version = "0.2.6"; + sha256 = "98111901a0f33f4c43459a20310dbf20a3fda142c5d42c30cfe9c53eeabeee29"; + libraryHaskellDepends = [ + async base conduit enclosed-exceptions monad-control transformers + wai wai-websockets websockets yesod-core + ]; + homepage = "https://github.com/yesodweb/yesod"; + description = "WebSockets support for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-websockets-extra" = callPackage ({ mkDerivation, base, enclosed-exceptions, transformers , websockets, yesod-websockets @@ -191238,7 +194541,7 @@ self: { "yi-rope" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae - , data-default, deepseq, fingertree, hspec, QuickCheck + , criterion, data-default, deepseq, fingertree, hspec, QuickCheck , quickcheck-instances, text, text-icu }: mkDerivation { @@ -191252,6 +194555,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck quickcheck-instances text ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -191626,6 +194930,8 @@ self: { pname = "z3"; version = "4.1.0"; sha256 = "096f9f4b92f5c9591d3098022b0b4047d1d6c4b970dc7d3ead6129d67fe4f5ee"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ base hspec QuickCheck ]; @@ -191960,8 +195266,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.7"; - sha256 = "8b7e4f597e926db852397bb2cbad04d05c718a222702076fbbdfcccb62679c9e"; + version = "0.1.8"; + sha256 = "3b6addaaf314df1587baf8b5e0423cbfa9fc256a09a20c70e1a746a8067370d1"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path @@ -191987,6 +195293,8 @@ self: { sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7"; revision = "1"; editedCabalFile = "f9284c6bdf1e6c9f85091c602faae19dfad856ac6628531d999a611994f3da86"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath @@ -192004,9 +195312,10 @@ self: { "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra - , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet - , temporary, test-framework, test-framework-hunit, time - , transformers, utf8-string + , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl + , old-time, random, resourcet, temporary, test-framework + , test-framework-hunit, time, transformers, utf8-string + , zip-archive }: mkDerivation { pname = "zip-conduit"; @@ -192022,6 +195331,10 @@ self: { base bytestring conduit directory filepath hpc HUnit mtl resourcet temporary test-framework test-framework-hunit time ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory filepath LibZip random + temporary zip-archive + ]; homepage = "https://github.com/tymmym/zip-conduit"; description = "Working with zip archives via conduits"; license = stdenv.lib.licenses.bsd3; @@ -192072,8 +195385,8 @@ self: { }) {}; "zippers" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , profunctors, semigroupoids + ({ mkDerivation, base, criterion, directory, doctest, filepath + , lens, profunctors, semigroupoids }: mkDerivation { pname = "zippers"; @@ -192081,6 +195394,7 @@ self: { sha256 = "d9c499cec6f60e0556b9874d2bf3b801b0a022b226a396200d11b91d3a1aede7"; libraryHaskellDepends = [ base lens profunctors semigroupoids ]; testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion lens ]; homepage = "http://github.com/ekmett/zippers/"; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; @@ -192164,6 +195478,8 @@ self: { pname = "zlib-enum"; version = "0.2.3.1"; sha256 = "e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring enumerator transformers zlib-bindings ]; @@ -192393,8 +195709,8 @@ self: { }) {}; "zstd" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, QuickCheck - , test-framework, test-framework-quickcheck2 + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2, zlib }: mkDerivation { pname = "zstd"; @@ -192405,6 +195721,9 @@ self: { base bytestring QuickCheck test-framework test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim zlib + ]; homepage = "https://github.com/facebookexperimental/hs-zstd"; description = "Haskell bindings to the Zstandard compression algorithm"; license = stdenv.lib.licenses.bsd3; From 2e5a4b1a3801bbea8980b71d8d77dc412be81f83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Feb 2017 16:02:39 +0100 Subject: [PATCH 214/274] haskell-lambdabot: fix evaluation --- pkgs/development/haskell-modules/configuration-common.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cd88262c919..53ffd68a997 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -712,9 +712,7 @@ self: super: { ]; jailbreak = true; - })).override { - haskell-src-exts = self.haskell-src-exts-simple; - }; + })); # Needs new version. haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; From 9e72734826389c20b473c99d7b2375a01323838c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Feb 2017 14:53:33 +0100 Subject: [PATCH 215/274] haskell-yaml: build with bundled libyaml rather than our system version It looks like the yaml package bundles an unreleased version of libyaml and relies on particulars of that versions behavior. Therefore, the package no longer works with the official libyaml 0.1.7 release, which is what we have. https://github.com/snoyberg/yaml/issues/106 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 53ffd68a997..7fbdd3d3c49 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -880,4 +880,8 @@ self: super: { rank1dynamic = doJailbreak super.rank1dynamic; cabal-lenses = doJailbreak super.cabal-lenses; + + # https://github.com/snoyberg/yaml/issues/106 + yaml = disableCabalFlag super.yaml "system-libyaml"; + } From 1f709ad136ff18b209638372a0b48345cf1f4fa6 Mon Sep 17 00:00:00 2001 From: Itai Zukerman Date: Thu, 2 Mar 2017 00:07:56 -0800 Subject: [PATCH 216/274] bazel: add gcc to PATH and simplify patch Removed patches that are purely for testing. Removed dependencies that seemed to not be needed. Expand all instances of #!/bin/bash, not just those at the start of scripts. --- .../tools/build-managers/bazel/default.nix | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index a8ad08feec1..16e31eaf5a8 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils, makeWrapper }: +{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper }: stdenv.mkDerivation rec { @@ -22,24 +22,16 @@ stdenv.mkDerivation rec { sourceRoot = "."; postPatch = '' - patchShebangs . + for f in $(grep -l -r '#!/bin/bash'); do + substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash' + done for f in \ src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \ src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \ - src/test/java/com/google/devtools/build/lib/shell/CommandTest.java \ - src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java \ - src/test/java/com/google/devtools/build/lib/shell/LoadTest.java \ - src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java \ - src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java - do - substituteInPlace $f \ - --replace /bin/bash ${bash}/bin/bash \ - --replace /bin/cat ${coreutils}/bin/cat \ - --replace /bin/echo ${coreutils}/bin/echo \ - --replace /bin/false ${coreutils}/bin/false \ - --replace /bin/pwd ${coreutils}/bin/pwd \ - --replace /bin/sleep ${coreutils}/bin/sleep \ - --replace /bin/true ${coreutils}/bin/true + src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \ + src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \ + ; do + substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash done ''; @@ -49,8 +41,6 @@ stdenv.mkDerivation rec { jdk zip unzip - which - binutils makeWrapper ]; @@ -59,7 +49,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bash - coreutils ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink @@ -81,10 +70,12 @@ stdenv.mkDerivation rec { examples/java-native/src/test/java/com/example/myproject:hello ''; + # Bazel expects gcc and java to be in the path. + installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --prefix PATH : "${jdk}/bin" + wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin" ''; dontStrip = true; From 3806d47b490d207cdc1b2dfa9d22a9782bd3ef44 Mon Sep 17 00:00:00 2001 From: ndowens Date: Thu, 2 Mar 2017 03:21:08 -0600 Subject: [PATCH 217/274] uptimed: 0.3.18 -> 0.4.0 (#23316) * uptimed: 0.3.18 -> 0.4.0 * uptimed: autoreconfHook belongs to nativeBuildInputs --- pkgs/tools/system/uptimed/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 6e0c2da5c18..58e194d38b9 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -let version = "0.3.18"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "uptimed-${version}"; - + version = "0.4.0"; + src = fetchFromGitHub { - sha256 = "108h8ck8cyzvf3xv23vzyj0j8dffdmwavj6nbn9ryqhqhqmk4fhb"; + sha256 = "0h3192angfiv01bjk3f3nd2fmjic37cl72pvmr556n0wy3cfybas"; rev = "v${version}"; repo = "uptimed"; owner = "rpodgorny"; }; + nativeBuildInputs = [ autoreconfHook ]; + patches = [ ./no-var-spool-install.patch ]; + meta = with stdenv.lib; { description = "Uptime record daemon"; longDescription = '' @@ -24,7 +27,4 @@ stdenv.mkDerivation { platforms = platforms.linux; }; - patches = [ ./no-var-spool-install.patch ]; - - buildInputs = [ autoreconfHook ]; } From 9addeafe1a70a138ef6bb6b7f300634285b1b47e Mon Sep 17 00:00:00 2001 From: ndowens Date: Thu, 2 Mar 2017 04:02:08 -0600 Subject: [PATCH 218/274] par2cmdline: 0.6.11 -> 0.6.13 (#23361) * par2cmdline: 0.6.11 -> 0.6.13 * par2cmdline: add autoreconfHook to nativeBuildInputs --- pkgs/tools/networking/par2cmdline/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 94b9f3bdc7c..e29c72fd0b9 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchzip, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "par2cmdline-${version}"; - version = "0.6.11"; + version = "0.6.13"; - src = fetchzip { - url = "https://github.com/BlackIkeEagle/par2cmdline/archive/v${version}.tar.gz"; - sha256 = "0maywssv468ia7rf8jyq4axwahgli3nfykl7x3zip503psywjj8a"; + src = fetchFromGitHub { + owner = "Parchive"; + repo = "par2cmdline"; + rev = "v${version}"; + sha256 = "0jxixkc8vid933nph2mvhgz58my42kwjlzbir38hml2xrzq00d8f"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/BlackIkeEagle/par2cmdline; description = "PAR 2.0 compatible file verification and repair tool"; longDescription = '' @@ -19,8 +21,8 @@ stdenv.mkDerivation rec { damage in data files and repair them if necessary. It can be used with any kind of file. ''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.muflax ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.muflax ]; + platforms = platforms.all; }; } From ec98c1d8f41a29fb4763ab629032ece46fc573dc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Mar 2017 11:03:25 +0100 Subject: [PATCH 219/274] haskellPackages.cabal-lenses: add comment to upstream issue --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7fbdd3d3c49..0c62c187ac0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -879,6 +879,7 @@ self: super: { # https://github.com/haskell-distributed/rank1dynamic/issues/17 rank1dynamic = doJailbreak super.rank1dynamic; + # https://github.com/dan-t/cabal-lenses/issues/6 cabal-lenses = doJailbreak super.cabal-lenses; # https://github.com/snoyberg/yaml/issues/106 From 5a68d5484e9a3c654ac768093ca29026302a7c23 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 1 Mar 2017 21:36:18 +0100 Subject: [PATCH 220/274] blitz: switch back to boost-1.60 The build fails with boost-1.62. More specifically, the test of the boost-serialization integration fails due to the protected destructor in the class template `MemoryBlock`. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 170fa60c27b..9c72a200d62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -636,7 +636,9 @@ with pkgs; blink1-tool = callPackage ../tools/misc/blink1-tool { }; - blitz = callPackage ../development/libraries/blitz { }; + blitz = callPackage ../development/libraries/blitz { + boost = boost160; + }; blockdiag = pythonPackages.blockdiag; From d2aa1706bd627989713e9330a3fdd8c872444341 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 2 Mar 2017 02:19:24 -0800 Subject: [PATCH 221/274] ffmpeg-full: 3.2.2 -> 3.2.4 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 090881107ce..47fcd76240b 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1z7d5y5crhsl5fm74236rdwbkd4jj5frx1l4iizjfym1w4gvs09z"; + sha256 = "0ymg1mkg1n0770gmjfqp79p5ijxq04smfrsrrxc8pjc0y0agyf3f"; }; patchPhase = ''patchShebangs . From 0b7861dc7fc02f93a63f68bdd9104c41b272c00b Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 2 Mar 2017 02:18:57 -0800 Subject: [PATCH 222/274] obs-studio: 17.0.1 -> 18.0.0 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 8051d5ee376..61630c9a15c 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -22,13 +22,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "17.0.1"; + version = "18.0.0"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "0x5lnl1xkmm8x4g0f8rma8ir1bcldz9sssj2fzkv80hn79h2cvxm"; + sha256 = "0qjv1l69ca8l8jihpkz7yln7gr7168k8c7yxgd8y23dp1db9hdrm"; }; nativeBuildInputs = [ cmake From c5367a4409891ae5ea9aa564175a115bc6a83976 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Mar 2017 11:45:36 +0100 Subject: [PATCH 223/274] maintainers/hydra-eval-failures: flush stdout more often --- maintainers/scripts/hydra-eval-failures.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index 1b5df32c452..b339f296056 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -5,6 +5,7 @@ import subprocess import json +import sys import click import requests @@ -75,12 +76,16 @@ def cli(jobset): a = pq(tr)('a')[1] print "- [ ] [{}]({})".format(a.text, a.get('href')) + sys.stdout.flush() + maintainers = get_maintainers(a.text) if maintainers: print " - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))) # TODO: print last three persons that touched this file # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? + sys.stdout.flush() + if __name__ == "__main__": try: From c44a41c73f15e7bf834a424d84ce23382c2e7bc4 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 2 Mar 2017 03:09:27 +0100 Subject: [PATCH 224/274] tor: split out geoip data Saves about 5.2 MiB. To use geoip, add something like ``` GeoIPFile ${tor.geoip}/share/tor/geoip GeoIPv6File ${tor.geoip}/share/tor/geoip6 ``` to torrc --- pkgs/tools/security/tor/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 25f80a16fea..8128b58155c 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0h8kpn42mgpkzmnga143hi8nh0ai65ypxh7qhkwbb15j3wz2h4fn"; }; + outputs = [ "out" "geoip" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl zlib ] ++ stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; @@ -22,6 +24,12 @@ stdenv.mkDerivation rec { --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks' ''; + postInstall = '' + mkdir -p $geoip/share/tor + mv $out/share/tor/geoip{,6} $geoip/share/tor + rm -rf $out/share/tor + ''; + doCheck = true; meta = with stdenv.lib; { From bfe15ec83f769bc9b0511033a753425b05ca0bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 2 Mar 2017 12:56:05 +0100 Subject: [PATCH 225/274] electron: 1.4.13 -> 1.4.15 --- pkgs/development/tools/electron/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 1bd7ac76bb1..3d5c23678db 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.4.13"; + version = "1.4.15"; name = "electron-${version}"; meta = with stdenv.lib; { @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1fd8axaln31c550dh7dnfwigrp44ahp142cklpdc57mz34xjawp3"; + sha256 = "07b9jdbjrf3siv205wd1dphq6ly0hkaapzvj87d2yjfiyzv3cbsl"; name = "${name}.zip"; }; @@ -45,7 +45,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0aa4wrba1y7pab5g6bzxagj5dfl9bqrbpj3bbi5v5gsd0h34k0yx"; + sha256 = "0p8gkyq4qczzia26wrnbs91vdqzxhgq515cmsrwvhw87mc9fka4k"; name = "${name}.zip"; }; From eebb5f20a3530cef84eb27ed84501efa1b6d0c99 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Mar 2017 11:51:22 +0100 Subject: [PATCH 226/274] cuter: fix indentation --- .../tools/erlang/cuter/default.nix | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 4d4dac0c834..35b7774ab93 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -2,43 +2,43 @@ beamPackages, z3, python27 }: stdenv.mkDerivation rec { - name = "cuter"; - version = "0.1"; + name = "cuter"; + version = "0.1"; - src = fetchFromGitHub { - owner = "aggelgian"; - repo = "cuter"; - rev = "v${version}"; - sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv"; - }; + src = fetchFromGitHub { + owner = "aggelgian"; + repo = "cuter"; + rev = "v${version}"; + sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv"; + }; - setupHook = writeText "setupHook.sh" '' + setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" - ''; - buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ]; + ''; + buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ]; - buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; - configurePhase = '' - autoconf - ./configure --prefix $out - ''; + buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; + configurePhase = '' + autoconf + ./configure --prefix $out + ''; - installPhase = '' - mkdir -p "$out/lib/erlang/lib/cuter-${version}" - mkdir -p "$out/bin" - cp -r * "$out/lib/erlang/lib/cuter-${version}" - cp cuter "$out/bin/cuter" - wrapProgram $out/bin/cuter \ - --prefix PATH : "${python27}/bin" \ - --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ - --suffix ERL_LIBS : "$out/lib/erlang/lib" - ''; + installPhase = '' + mkdir -p "$out/lib/erlang/lib/cuter-${version}" + mkdir -p "$out/bin" + cp -r * "$out/lib/erlang/lib/cuter-${version}" + cp cuter "$out/bin/cuter" + wrapProgram $out/bin/cuter \ + --prefix PATH : "${python27}/bin" \ + --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ + --suffix ERL_LIBS : "$out/lib/erlang/lib" + ''; - meta = { - description = "A concolic testing tool for the Erlang functional programming language"; - license = stdenv.lib.licenses.gpl3; - homepage = "https://github.com/aggelgian/cuter"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; - platforms = with stdenv.lib.platforms; unix; - }; + meta = { + description = "A concolic testing tool for the Erlang functional programming language"; + license = stdenv.lib.licenses.gpl3; + homepage = "https://github.com/aggelgian/cuter"; + maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + platforms = with stdenv.lib.platforms; unix; + }; } From feffa1aabf895f78bdaafe92990ebf4be34edc20 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Mar 2017 13:00:25 +0100 Subject: [PATCH 227/274] cuter: fix build --- pkgs/development/tools/erlang/cuter/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 35b7774ab93..b9682bead7d 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -1,5 +1,5 @@ -{stdenv, autoconf, which, writeText, makeWrapper, fetchFromGitHub, erlang, - beamPackages, z3, python27 }: +{ stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang +, beamPackages, z3, python27 }: stdenv.mkDerivation rec { name = "cuter"; @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; - buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' From 306eb6ded018040470be2a462b0adbd7412349a2 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Mar 2017 13:20:25 +0100 Subject: [PATCH 228/274] d4x: remove removed in debian in 2010 --- pkgs/applications/misc/d4x/default.nix | 20 -------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/applications/misc/d4x/default.nix diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix deleted file mode 100644 index b6d6e53b001..00000000000 --- a/pkgs/applications/misc/d4x/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }: - -stdenv.mkDerivation { - name = "d4x-2.5.7.1"; - - inherit boost; - - src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/d4x/d4x-2.5.7.1.tar.bz2/68d6336c3749a7caabb0f5a5f84f4102/d4x-2.5.7.1.tar.bz2; - sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; - }; - - buildInputs = [ gtk2 glib pkgconfig openssl boost ]; - - meta = { - description = "Graphical download manager"; - homepage = http://www.krasu.ru/soft/chuchelo/; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c72a200d62..f5230fd8290 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12990,8 +12990,6 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - d4x = callPackage ../applications/misc/d4x { }; - darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; enableSharedExecutables = false; From 095cf1b903a9a3c52c2fdf67afc76d97a0c6af7b Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Wed, 1 Mar 2017 11:06:05 -0800 Subject: [PATCH 229/274] Revert "buildRustPackage: fix deprecated use of registry.index config key" This reverts commit e8aa8cc94be45103fcd32b5f0bfee4a55eae4080. --- pkgs/build-support/rust/fetch-cargo-deps | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index 89b78547b38..54593994990 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -11,11 +11,8 @@ fetchCargoDeps() { echo "Using rust registry from $rustRegistry" cat < $out/config -[source.nix-store-rust-registry] -registry = "file://$rustRegistry" - -[source.crates-io] -replace-with = "nix-store-rust-registry" +[registry] +index = "file://$rustRegistry" EOF export CARGO_HOME=$out From 3deb85bc63ecd39909d08c7e71df128af0fa4094 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 1 Mar 2017 15:16:23 +0100 Subject: [PATCH 230/274] locate: fix security.wrappers --- nixos/modules/misc/locate.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 089f354f611..6d9bc915ba0 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -104,13 +104,13 @@ in { users.extraGroups = mkIf isMLocate { mlocate = {}; }; security.wrappers = mkIf isMLocate { - mlocate = { + locate = { group = "mlocate"; owner = "root"; permissions = "u+rx,g+x,o+x"; setgid = true; setuid = false; - program = "locate"; + source = "${cfg.locate}/bin/locate"; }; }; From 869bc1c07e66cb1da432ccde8dd65816f5a7d617 Mon Sep 17 00:00:00 2001 From: Gauthier POGAM--LE MONTAGNER Date: Thu, 2 Mar 2017 13:44:47 +0100 Subject: [PATCH 231/274] atom: 1.14.3 -> 1.14.4 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 27ba155ad74..47a8eff3da8 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "16zc1bbvxs9fpd9y3mzgbl789djp3p1664a8b2nn9ann1mbkdgsk"; + sha256 = "0b1dbhpphbsjkizii6l5cxr2pqk6bjix0amc2avk3p7ys710zazv"; name = "${name}.deb"; }; From c1866cade9bce6fefa209095055248302ef6ad9d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Mar 2017 14:13:02 +0100 Subject: [PATCH 232/274] libsForQt5.qmltermwidget: fix build --- pkgs/applications/science/misc/gplates/default.nix | 8 ++++++-- pkgs/development/libraries/qmltermwidget/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 9dd7b6b72db..bc5b8060e23 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }: +{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal +, proj, boost160, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { name = "gplates-${version}"; @@ -13,7 +14,10 @@ stdenv.mkDerivation rec { ./boostfix.patch ]; - buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; + buildInputs = [ + qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost160 cmake python2 + doxygen graphviz gmp + ]; meta = with stdenv.lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index c4bb36209d9..bb058711b2e 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook }: +{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook, qtmultimedia }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; }; - buildInputs = [ qtbase qtquick1 ]; + buildInputs = [ qtbase qtquick1 qtmultimedia ]; nativeBuildInputs = [ qmakeHook ]; patchPhase = '' From b955f27ad9c355d42f9d45ed9e416422f425cddc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 1 Mar 2017 07:43:24 -0600 Subject: [PATCH 233/274] elpa-packages: 2017-03-01 --- .../editors/emacs-modes/elpa-generated.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 53b7d04d2e9..5e736392fd2 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -41,10 +41,10 @@ }) {}; ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ada-ref-man"; - version = "2012.0"; + version = "2012.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-ref-man-2012.0.tar"; - sha256 = "1g97892h8d1xa7cfxgg4i232i15hhci7gijj0dzc31yd9vbqayx8"; + url = "https://elpa.gnu.org/packages/ada-ref-man-2012.3.tar"; + sha256 = "0w88xw51jb85nmqbi3i9kj9kx2fa6zlazk3x7afll7njc6g4105z"; }; packageRequires = []; meta = { @@ -306,6 +306,19 @@ license = lib.licenses.free; }; }) {}; + cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "cl-print"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cl-print-1.0.el"; + sha256 = "0ib8j7rv5f4c4xg3kban58jm6cam756i3xz6j8100846g3jn9zcc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cl-print.html"; + license = lib.licenses.free; + }; + }) {}; cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cobol-mode"; version = "1.0.0"; @@ -376,10 +389,10 @@ company-statistics = callPackage ({ company, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company-statistics"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-statistics-0.2.2.tar"; - sha256 = "0h1k0dbb7ngk6pghli2csfpzpx37si0wg840jmay0jlb80q6vw73"; + url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar"; + sha256 = "0780xp09f739jys469x4fqpgj1lysi8gnhiaz0735jib07lmh4ww"; }; packageRequires = [ company emacs ]; meta = { @@ -1995,10 +2008,10 @@ }) {}; wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wconf"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wconf-0.2.0.el"; - sha256 = "07adnx2ni7kprxw9mx1nywzs1a2h43rszfa8r8i0s9j16grvgphk"; + url = "https://elpa.gnu.org/packages/wconf-0.2.1.el"; + sha256 = "13p1xycp3mcrg8jv65mcyqvln4h7awhjz35dzr5bi86zb824ryxf"; }; packageRequires = [ emacs ]; meta = { From 6034d429fc03b6c846d4251e933d9269c9c4215f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Mar 2017 14:23:41 +0100 Subject: [PATCH 234/274] btrfs-dedupe: dependency is broken on i686 --- pkgs/tools/filesystems/btrfs-dedupe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix index 2cd1e8162c6..a9e05686e40 100644 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -20,7 +20,7 @@ buildRustPackage rec { homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe"; description = "BTRFS deduplication utility"; license = licenses.mit; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ikervagyok ]; }; } From 00f28d74c9f6a79bf51cc45187430a09e4fd3d54 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 1 Mar 2017 07:44:19 -0600 Subject: [PATCH 235/274] melpa-packages: 2017-03-01 --- .../editors/emacs-modes/melpa-generated.nix | 1669 +++++++++-------- 1 file changed, 935 insertions(+), 734 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 6f67650e763..daaf1f61891 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -712,12 +712,12 @@ ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-octave"; - version = "20150111.1708"; + version = "20170220.1728"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "28dfce296dd2aa0ea46b51803109f3fdd1e5c379"; - sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q"; + rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c"; + sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; @@ -1486,12 +1486,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20170106.1020"; + version = "20170223.1030"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "2c21ee4ebe3e0b60e5df5c8e54a7c2b10f110b85"; - sha256 = "119canyh19ck8fzashnwj9yfk0rm9qsg1yibyfjccd9inp8h7k6z"; + rev = "fa9e6917c48e5338f3ed81226e1e5e5ec21563fb"; + sha256 = "0ri8lv3ln7n3msc8y6y9133dv8h0550xi142fn7w0s95hbskr61l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1688,8 +1688,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059"; - sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk"; + rev = "65de04e9bda55b858d53d4d7982183fd82839b55"; + sha256 = "1x3wl30rbza8y4693jmpjpq7mcdv8gjhcnr451lgvfjmzxfhbn3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1829,12 +1829,12 @@ annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate"; - version = "20161006.16"; + version = "20170227.23"; src = fetchFromGitHub { owner = "bastibe"; repo = "annotate.el"; - rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87"; - sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1"; + rev = "f08923762fb851edb292ba4d3ebb07bea025f83d"; + sha256 = "11v8claymx40ix5zwzrklzc6g71nmzxhdhdzwfdh2b57fwmfvv95"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; @@ -2473,10 +2473,10 @@ apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropos-fn-plus-var"; - version = "20170102.902"; + version = "20170221.748"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el"; - sha256 = "0a9cfycj4y9z7sm7501bcyn6d66fq1jlna3zmr85m9fbkk42zlyj"; + sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var"; @@ -2512,10 +2512,10 @@ }) {}; apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apu"; - version = "20161210.842"; + version = "20170221.750"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apu.el"; - sha256 = "0knmp8kryndpag0hy3mjbhmw9spvi6kzmx0s215m0lbiqzzibgwz"; + sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu"; @@ -3656,10 +3656,10 @@ autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }: melpaBuild { pname = "autofit-frame"; - version = "20170102.903"; + version = "20170221.752"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/autofit-frame.el"; - sha256 = "05pww6hqfknrkhn8iq53r8lzikggw6is6syrypxybkmxhfbx4d9h"; + sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame"; @@ -4221,12 +4221,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170213.1604"; + version = "20170227.1310"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "9b6f8f93af9eb892a4df0e460f3d98031b8bad30"; - sha256 = "1l4h4cyhbkfg3zpf8wi7c44zkxjv1qjjm0v9mjv4cb7bav7f8kfb"; + rev = "0ebf2ee7ab5ae3b3cb6140ea57b2a88e02a59818"; + sha256 = "197avkxslnvp95f0spmys1nis6nmqfvrv0b1cm945syk7yxa30db"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4531,12 +4531,12 @@ bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb2erc"; - version = "20130606.2329"; + version = "20170221.554"; src = fetchFromGitHub { owner = "unhammer"; repo = "bbdb2erc"; - rev = "f39a36351e1e6f1105c9e32970e7502b77b0dbcd"; - sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs"; + rev = "15db2bd29df0f6ee32c499fdeffb960b6a7f97a0"; + sha256 = "0jlm6qffhh84vy5wmkxmsm5i4dp87cfh7zr5kvrw72zyww986kn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/bbdb2erc"; @@ -4885,12 +4885,12 @@ bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibtex-utils"; - version = "20150924.647"; + version = "20170221.1757"; src = fetchFromGitHub { owner = "plantarum"; repo = "bibtex-utils"; - rev = "1695db9f4f9198bb27f219bd4da7d34a9ae58069"; - sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8"; + rev = "36953c6bd1e14eac553834720f383d4114585f55"; + sha256 = "0z21p9j4wsbiygwk8lz9awwy1c2w2mnfyq501bvvd7r99k7hhy2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5764b6a880e8143db66e9011cc1c2bf0bcd61082/recipes/bibtex-utils"; @@ -5364,10 +5364,10 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170129.1207"; + version = "20170227.1053"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1"; + sha256 = "14xkhc0x5ac2b0np5hvb0f4d1rap4yysbvm3fnmaaq4kylriysad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; @@ -5635,10 +5635,10 @@ browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring-plus"; - version = "20170102.910"; + version = "20170221.757"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el"; - sha256 = "0qps93fx9x7iy9m2061fkizw90y0d6y4q9wk0c8krpbny73a18v2"; + sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+"; @@ -6022,6 +6022,27 @@ license = lib.licenses.free; }; }) {}; + build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "build-status"; + version = "20170226.655"; + src = fetchFromGitHub { + owner = "sshaw"; + repo = "build-status"; + rev = "25c61f445502699d18fda7eb2010a38cbf8085a2"; + sha256 = "04siqz69c5dp762c118b1b7iwdz8x3gavc3bncacgnx4ybyb1crf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; + sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92"; + name = "build-status"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/build-status"; + license = lib.licenses.free; + }; + }) {}; bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "bundler"; @@ -6214,12 +6235,12 @@ c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c-eldoc"; - version = "20160704.957"; + version = "20170227.809"; src = fetchFromGitHub { owner = "nflath"; repo = "c-eldoc"; - rev = "008a2e70cd690ff5689145e01086316002b237fb"; - sha256 = "1rzx185d1qqb9rirw97vl9449ax4n72ak6k0q7mscrxz9k8vd00p"; + rev = "2232000692f6f891456fecf23c538d5b47302a60"; + sha256 = "0mr49mvjak30c6x8n4c13xi4rjfnbpnizq27f4zmryx5k8w5f9fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc"; @@ -6720,8 +6741,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "1536311cda64a00abb5c1631bbdb253689117a1c"; - sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv"; + rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c"; + sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6762,8 +6783,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "1536311cda64a00abb5c1631bbdb253689117a1c"; - sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv"; + rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c"; + sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6842,12 +6863,12 @@ celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "celery"; - version = "20150812.147"; + version = "20170225.124"; src = fetchFromGitHub { owner = "ardumont"; repo = "emacs-celery"; - rev = "5b5b1968fd258c444dc2372e989aab82830004c3"; - sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c"; + rev = "51197d74f5eaa8ae09144af7663a2f4277f07d16"; + sha256 = "1845qz0ih30z1jgm1zi11q4gvw9gy6w3vyj2mc1aiv5r170qj8as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b896b2b89d990a7ce2f4bf4ce0aee0d126f3e55/recipes/celery"; @@ -6949,8 +6970,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "55a097ff3743e8a0c806a168545390007336f97e"; - sha256 = "0h51y5k6bly50w280v948r3lbj849w8117zlgk0zyhjqzr3xzp4h"; + rev = "4a880501207d066a865f929b605bf113753ffd62"; + sha256 = "1h4db9g4ph6v6fz02hmby823rfr57rxafxynlhlwf4cfmimmdfcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6989,7 +7010,7 @@ version = "20170201.347"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12010"; + rev = "12019"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7321,12 +7342,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20170219.2115"; + version = "20170221.206"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "527af4291245b4ede1983cc27c08fe00db38ea1c"; - sha256 = "09jbfnwhvrv8dvxzdd7w0j6p305wfpv95z9v45w8wjc987fgzs6l"; + rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1"; + sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7570,12 +7591,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170129.1941"; + version = "20170228.2202"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "eb1bc430288af6e666e385c634c434a863a4ef8b"; - sha256 = "137rkssq1gkf9djg0x5vwnsf8z64yvjigp05zkkxrdfwcgs2gria"; + rev = "5d32b960739162b75c044be0175b9564e7b8293e"; + sha256 = "0mih9dqk6ydqksa5jgjjcqiz6gnrwzp024mda0csibdf9snxb4a8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7759,12 +7780,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170212.240"; + version = "20170225.344"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902"; - sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c"; + rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961"; + sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7846,8 +7867,8 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "295677"; - sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y"; + rev = "296613"; + sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -8232,12 +8253,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170120.2239"; + version = "20170225.2308"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "0113aa969e09e31d65717d4a9c16c934c77dcb9b"; - sha256 = "1dcj6brfw7fcjn86ibl5sk1q5qij8zmrfr7776nczwh9i7986l4a"; + rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682"; + sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8257,8 +8278,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "0113aa969e09e31d65717d4a9c16c934c77dcb9b"; - sha256 = "1dcj6brfw7fcjn86ibl5sk1q5qij8zmrfr7776nczwh9i7986l4a"; + rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682"; + sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8402,14 +8423,14 @@ pname = "clues-theme"; version = "20161213.327"; src = fetchFromGitHub { - owner = "jasonm23"; + owner = "emacsfodder"; repo = "emacs-clues-theme"; rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7"; sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme"; - sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme"; + sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr"; name = "clues-theme"; }; packageRequires = [ emacs ]; @@ -8488,8 +8509,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "3c0de6db2d9e0580f23cc95c4a1e00a8f66108c9"; - sha256 = "01ngv9qylhxfg3jj3yvj927y0iyjqlxpxs7fnzywpmkwv50mfj2w"; + rev = "e9cfe63dfca48688064b56777508ab20c5f2aed4"; + sha256 = "180npd4nb2qc2bp1xk0qqpvqm4glskf3xczlmhh8wb03dpn5fzsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8546,10 +8567,10 @@ }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; - version = "20170124.1824"; + version = "20170221.1557"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cmds-menu.el"; - sha256 = "1mcrgfwpckrx0k82waqyd80x72mxzv42jg878rkycf4qpa0wxjh4"; + sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; @@ -8607,12 +8628,12 @@ coati = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coati"; - version = "20160725.1704"; + version = "20170228.705"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "emacs-coati"; - rev = "a4f2aaaf1c4b92dfed801c8c264ab2ddc8ee3d4c"; - sha256 = "1dlx1f5p662f1zbc7pr66ymbb4x3v7szybsvskjd5a25mdggwn05"; + rev = "c5943d556ab44949b8d4cf295e7c4e8a665bb18a"; + sha256 = "15vks08bnrz3q2z5f7h69l8fka7k5p3r03ciah9nh3c11d3ldw36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f28144401803d86bafdc9c5b60bcb3ada0bab/recipes/coati"; @@ -8775,10 +8796,10 @@ col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }: melpaBuild { pname = "col-highlight"; - version = "20170102.918"; + version = "20170221.1559"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/col-highlight.el"; - sha256 = "0ayr0psmfjy8iqq779v12ccgzclwakzlcfsl7g98qvxxmkh1vm8j"; + sha256 = "1xm1sbmcily1zy5xfpiphy3waq7928xpqmsrm3rcy37xbk2xj7vr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight"; @@ -8923,8 +8944,8 @@ src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; - rev = "faf7415c99e132094f1f09c6b6974ec118a18d87"; - sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0"; + rev = "e606dec66f16a06140b9aad625a4fd52bca4f936"; + sha256 = "0c04fy3hc8wc0aabilqx9mcipmd41rmshqjxc3z8m1w0bm4288g1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e43060d80b3345ef4e8df9f5a9d66af8a44a9c41/recipes/color-theme-buffer-local"; @@ -9407,12 +9428,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170206.2151"; + version = "20170227.644"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "f77e4b12a7deebc83125d69ac1e2288d8aecf521"; - sha256 = "04a8vlw3999yhmn3jg9d3jvvmfwmc88xnpfw1qm820s97cinzsgf"; + rev = "202f38a11d8b14b8f3a84c8261816dbcf0dbff8f"; + sha256 = "0zs3n1nycpahx5qmlfpkb4nc1g7kjr0q9pc5lwgpasi54bcp3371"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9582,12 +9603,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20170208.756"; + version = "20170226.1930"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "b86eaff31a66e311c210da93b83fa218f8def24b"; - sha256 = "1lpihk96pz3v7qd62icm950wds1xc02mx08ygfv7ia1zv1m4m6w5"; + rev = "e2183e247720c1e252e04300313f386749997f5b"; + sha256 = "0gsdcm84k2j6753r44r2qxaq62264xj8cxqayynxvjsawzv3ljav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9670,8 +9691,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc"; - sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks"; + rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b"; + sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9792,12 +9813,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20160229.732"; + version = "20170221.751"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "9407824d2b29d427ed5732aa01cb0a8530a8259f"; - sha256 = "1xsk02ymgj0gfblz2f6pzwh96crgx4m524ia6m95kcxrd7y63004"; + rev = "34b4b52f67e5c1ffaf807e4be1512fca4695eea8"; + sha256 = "0xl2am7kwbdfaxysjamq0b9slcdmlqqprb23zf07i4b28qa72qca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -9838,8 +9859,8 @@ src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "23c4d6b2ef184da1a4ce0a7f3e979bc2ea2600ca"; - sha256 = "1db1wzrcrbh4yfc23xx46fv43n45npzg0syz5d8pwrh1xlx1aj04"; + rev = "09a68b802e64799e95f205b438d469bbd78cd2e6"; + sha256 = "0qg1ws7xi418lbnx130xqkwgpsl0p218gqxwy0fpwky01iahwcw9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -9939,12 +9960,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20170119.2217"; + version = "20170226.522"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "639baefc78ee9346229969cf794fba596e15a7d3"; - sha256 = "0ql5a34cgkdbz1bxml5sam5kwd78zllkf8hm0r6zcnjykh4b5wv4"; + rev = "30197a39ddedef550fd98803805dc15f844fc3c6"; + sha256 = "1a972l0y58bjpbnmxd2h33arx26naq9f8dbq2vka2axigpy4455r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -10075,8 +10096,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "company-tern"; - rev = "b20b3e490bf277c8480712210e3c92ea489859ef"; - sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm"; + rev = "dfa3f39d67f011a78fe04ad5a1c7f54d8d788a0a"; + sha256 = "125p6ipp9mrrc0va4a3pfc2wdnrsk945i9yv0p9lnmrrq69nnszr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern"; @@ -10159,8 +10180,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "386f6101fec6975000ad724f117816c01ab55f16"; - sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; + rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; + sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -10511,12 +10532,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170219.2346"; + version = "20170225.356"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2"; - sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq"; + rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309"; + sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10574,12 +10595,12 @@ counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; - version = "20161024.633"; + version = "20170223.509"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-counsel-gtags"; - rev = "59e7abc97715507e3c524a3e7132d38ed7ab0a12"; - sha256 = "01i1ilp87hg9s5bh4n7msf8ljx9h7ml3cxlawqh7y8c04m83yamp"; + rev = "2e9dd1ab3127819c6950a0bfd90c7c9894e37512"; + sha256 = "0896m45nmjw4nkibj3cz1clwq5pr7f5f2fsi84g5xhv5f97pgajp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; @@ -10637,12 +10658,12 @@ cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; - version = "20170217.1633"; + version = "20170222.940"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "e295cde1fc924c01dade3909f5b591bcfe5cf9d8"; - sha256 = "1axddbrwhb3akb07v20gxhpnaqj2nq04gn5501lh26351p2zjl3l"; + rev = "41719590b26b20642c31d233858dc27f34b277b3"; + sha256 = "1ph8hxnwbww194gcqq79ny6p3p396w1dgjr6inkg6f52ylycp25m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; @@ -10725,8 +10746,8 @@ src = fetchFromGitHub { owner = "zakame"; repo = "cpanfile-mode"; - rev = "6f0b6121baa2c1469f168c0cbbed7b74bbdd7d08"; - sha256 = "014ak97li7xsxrdqpsdmaclnsrm4d3gy2cw3msby4j6saj9rcn4r"; + rev = "eda675703525198df1f76ddf250bffa40217ec5d"; + sha256 = "07xivp1i9f884gs17lhp5jm0zk916c7gwazxnkm6m8rl3z2mcq0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673e828a076ad806cdb69102a9d55f80ace45670/recipes/cpanfile-mode"; @@ -10826,12 +10847,12 @@ creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "20170105.2029"; + version = "20170222.258"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f"; - sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi"; + rev = "32fa3f4e461da92700523b1b20e7b28974c19a26"; + sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; @@ -10973,10 +10994,10 @@ crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }: melpaBuild { pname = "crosshairs"; - version = "20151231.1238"; + version = "20170221.1608"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/crosshairs.el"; - sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am"; + sha256 = "1wjj88zv37ak9zd12d7sy7j261x5y17wxmw5jrzk56shkpdvcbq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4144c2fd45877effd8005abf64019aed651148a/recipes/crosshairs"; @@ -11345,10 +11366,10 @@ }) {}; cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-chg"; - version = "20170102.922"; + version = "20170221.1610"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cursor-chg.el"; - sha256 = "04as4z0sbirdi68swcia783caz7hlbk5qicnpq0d4ihmnbagy3fd"; + sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/871d02540951a217ea3d4aed9ce6b66a77223fbf/recipes/cursor-chg"; @@ -11551,8 +11572,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "299ad1163ac8e72c1910da3e03013e7634a94b91"; - sha256 = "1xcxmmzyag8lj5kdnw0p0yram0ahbzb4cjy7h1ca0za6v0m3yc4l"; + rev = "25cf792f735e8e7e06e2e4821d1ad21679c27f59"; + sha256 = "0v7mk33nr64d4a705d8ljfccj47wkih5qfizbk53r5dr7f3wzbqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11652,12 +11673,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170210.708"; + version = "20170227.251"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "95805f95aa780ecdb6ff35aaa6a56f3acc4c8be3"; - sha256 = "1bpyzx6i2z73y70na9a450bpv9gw4av5jx6njbwzjbapdcl7dxz6"; + rev = "5a52c5eca997655b7db349962d056daba64219cb"; + sha256 = "17kfv071zg0v3hcmlzk5yb88xpyknxig2fl2mj2cw3xjcshbxaa0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12156,12 +12177,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170218.1508"; + version = "20170227.412"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "1536311cda64a00abb5c1631bbdb253689117a1c"; - sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv"; + rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c"; + sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12174,6 +12195,46 @@ license = lib.licenses.free; }; }) {}; + debian-bug = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "debian-bug"; + version = "20140131.929"; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el"; + module = "emacs-goodies-el"; + sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-bug"; + sha256 = "0qlksbiw9qb0bv85b3rimsmzfr8dhbjjg4h0wnx7x434m6wqlm1a"; + name = "debian-bug"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/debian-bug"; + license = lib.licenses.free; + }; + }) {}; + debian-changelog-mode = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "debian-changelog-mode"; + version = "20140131.929"; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el"; + module = "emacs-goodies-el"; + sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-changelog-mode"; + sha256 = "185l9ghsi6rlbmhs99lpsq257r5q87j8vra6h7jd9fwxfp4n9r22"; + name = "debian-changelog-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/debian-changelog-mode"; + license = lib.licenses.free; + }; + }) {}; debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "debpaste"; @@ -12905,10 +12966,10 @@ dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-details-plus"; - version = "20170101.918"; + version = "20170221.1629"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-details+.el"; - sha256 = "1bm4q66wi476ppf8xiz9p0x491rqdxx9gpmn6sl9izjfg2xck4wb"; + sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b6a13a5dfd977979d3185139000e7a639d32ec4/recipes/dired-details+"; @@ -13071,16 +13132,16 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "20161206.130"; + version = "20170222.2126"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "4397e7858d5e63c251acc2741d78fe8e178cb206"; - sha256 = "0g97lii8n9pal46kipw59nj78qv3l0gpy6rwbd702gxccj94glgv"; + rev = "f60e10757a5011235b519231ad35974ff25963ed"; + sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; - sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon"; + sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1"; name = "dired-icon"; }; packageRequires = [ emacs ]; @@ -13134,12 +13195,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20170131.1740"; + version = "20170227.1532"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "0af40bc6755454beddc0d3cce7dead1b87b58904"; - sha256 = "01swk3pp88myfams2kpnyzl0d3r4bry1hn6gf6vvvglwif02d3rn"; + rev = "b62492c1a6404ed2ed32973d99cdcf8630cf7d02"; + sha256 = "09nwzihg1v5p8c4jcjzl3w2il701lh3ps8c472g2iwmkihljs093"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13196,10 +13257,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170220.922"; + version = "20170221.1620"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "1f84ym2c1wwbjsw7bh4p60k2qvrcr850vb1d7sha506b7319rgqh"; + sha256 = "0jfv0m3w3vqafaqcxp4n53msvjp83zczxc7drgng1amksr82xi63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13335,10 +13396,10 @@ dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sort-menu-plus"; - version = "20170101.923"; + version = "20170221.1630"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el"; - sha256 = "1ajx4nd14pzbj2629psc3aqmsfb7wsdggcrwyxy94mnvg553m5q9"; + sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+"; @@ -13810,12 +13871,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20170217.112"; + version = "20170224.615"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "e335e5cb619b69d68a179cb1d4d757d9314da9ba"; - sha256 = "1q1rrzfqc9a8mwmi8h35binh43f6zi6bgw4b5km4mqfgwpckrcqx"; + rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8"; + sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13835,8 +13896,8 @@ src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "e335e5cb619b69d68a179cb1d4d757d9314da9ba"; - sha256 = "1q1rrzfqc9a8mwmi8h35binh43f6zi6bgw4b5km4mqfgwpckrcqx"; + rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8"; + sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -14196,12 +14257,12 @@ dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dockerfile-mode"; - version = "20161209.631"; + version = "20170221.1317"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "bebfa1b73e7e006d574a0e4fbae225dc1db214ff"; - sha256 = "129kang099mw6lfi4616d47axm3q81hr8jhqwymc3ar9ramggyg3"; + rev = "5f1e17e4e59fee4725c5b4cd9b5b49f1faaa108f"; + sha256 = "1pw6706lnd6n866scwp35ar58y2c6jjyn82qpjdk0ma12hgv3gzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -14238,12 +14299,12 @@ dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dokuwiki-mode"; - version = "20160129.7"; + version = "20170223.501"; src = fetchFromGitHub { owner = "kai2nenobu"; repo = "emacs-dokuwiki-mode"; - rev = "0e8f11572b6842b5b9d6e1a5123d988b26af04bf"; - sha256 = "1qfmq8l4jqyrhfplsr1zd8bg9qqqwbh3mhipqzja0px0knjpqj85"; + rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1"; + sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode"; @@ -14301,12 +14362,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170217.1444"; + version = "20170222.1412"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "21354daf4cea7796ebbe238aea04720f14871d79"; - sha256 = "1j3rcvdp4wwyp7v45j5ypkb62660qmff704h77d1rxspn62rcs1x"; + rev = "f6a5a148851183b2e3a92d21bc179cc637b5fcdd"; + sha256 = "0w53gar82avmwx6rlhnn2p2vlmpghrn7hy83lggiawgr4h3yw4dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14321,10 +14382,10 @@ }) {}; doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi"; - version = "20170101.922"; + version = "20170221.1634"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi.el"; - sha256 = "11cxhfps8d0b0nsqq4mvwxpppmwagzxmlzy70icf85iv83xa74kv"; + sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi"; @@ -14340,10 +14401,10 @@ doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi-cmd"; - version = "20170101.919"; + version = "20170221.1631"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el"; - sha256 = "01x19bsdmz2z18s5a30mnbsgk1xjmff9rsd6dd2phaj750j6aiyb"; + sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd"; @@ -14359,10 +14420,10 @@ doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }: melpaBuild { pname = "doremi-frm"; - version = "20170101.920"; + version = "20170221.1632"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-frm.el"; - sha256 = "1gbm3iyfg96fafnydha5zyj3sip1i7bk2qhr3hpa2g895mjfv6kd"; + sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm"; @@ -14377,10 +14438,10 @@ }) {}; doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi-mac"; - version = "20170101.921"; + version = "20170221.1633"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-mac.el"; - sha256 = "1ilsnyzh4kka0kncd8w4fc5v9nm7q05i3g25z3m49zqifxp1vlfa"; + sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac"; @@ -14749,7 +14810,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1783810"; + rev = "1784923"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15353,12 +15414,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170208.1223"; + version = "20170222.1459"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "1ae554d1b67cb81b96c828e9710a4658db35b9fd"; - sha256 = "0ch8ws46r55rdap67xa40gb9h4llad6wx75iga4fyjzh6fxv9q9d"; + rev = "36d9d19abacaeade54a043701c5b2e4e58b8a61b"; + sha256 = "1fiwgdlykgnyi93lrnh0ifd4c5jlbs1kg69r2q2fyyfcwwvvq3ck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15394,10 +15455,10 @@ }) {}; echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "echo-bell"; - version = "20170101.925"; + version = "20170221.1635"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/echo-bell.el"; - sha256 = "1q1z151cfw1775gcfzpnm4afp62skqlnj5z2miizbnraincqy24b"; + sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell"; @@ -15501,8 +15562,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-database-url"; - rev = "a6e4be7547ee8e0bb43a11ff173d6271b21b5012"; - sha256 = "0f59s0a7zpa3dny1k7x6zrymrnzba184smq8v1vvz8hkc0ym1j1v"; + rev = "d56c580268cd93651998c4c6b1c5558e6b6ca90f"; + sha256 = "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb/recipes/edbi-database-url"; @@ -15522,8 +15583,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-django"; - rev = "01c44a330a8d6ff08932d63dec4d9512d582bcda"; - sha256 = "1029b7p1lnyqkg0jm9an6s1l7la0kb38gx42g7212wbj71s3krga"; + rev = "61c70d3a727ff28c1c7d1eb61af1efba7a268b8f"; + sha256 = "0kp2g0vb7pag57n20blqfri01cnkaxa0h6adbg2bfw7vcbn3h1gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345cafbf5358f8179bcbcb895cace75f289c02f1/recipes/edbi-django"; @@ -15602,12 +15663,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "20170220.1134"; + version = "20170221.1002"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "ed0bbffe5270a1df19e0e751c08a852f6f5a5c8e"; - sha256 = "0p64nvqxb3a554qa3x3w1lh9qj8dafzpjpmdvj2g47hr840sxdfn"; + rev = "dfabfc775ab3288ac91aac855de4b64e5279f0a2"; + sha256 = "0nb2yfbw3zsxpygy8ksz55k720lymy2fbfszh1qfd4yi0hkmbm5i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -15620,6 +15681,48 @@ license = lib.licenses.free; }; }) {}; + ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "ede-php-autoload-composer-installers"; + version = "20170221.1226"; + src = fetchFromGitHub { + owner = "xendk"; + repo = "ede-php-autoload-composer-installers"; + rev = "7840439802c7d11ee086bbf465657f3da12f9f66"; + sha256 = "1dkq0py1sybmpy59h3szafa59g5g3jp8l9az22l15qgmkpbqydh4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers"; + sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268"; + name = "ede-php-autoload-composer-installers"; + }; + packageRequires = [ ede-php-autoload f s ]; + meta = { + homepage = "https://melpa.org/#/ede-php-autoload-composer-installers"; + license = lib.licenses.free; + }; + }) {}; + ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "ede-php-autoload-drupal"; + version = "20170225.1448"; + src = fetchFromGitHub { + owner = "xendk"; + repo = "ede-php-autoload-drupal"; + rev = "b32b0f309e24969022d194035b9afc7675c22aca"; + sha256 = "1yydbrcydh712w6v5qg7pzpfqlgchsniq0fw6psmlichn8cfmsjv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal"; + sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964"; + name = "ede-php-autoload-drupal"; + }; + packageRequires = [ ede-php-autoload f s ]; + meta = { + homepage = "https://melpa.org/#/ede-php-autoload-drupal"; + license = lib.licenses.free; + }; + }) {}; edebug-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edebug-x"; @@ -15791,12 +15894,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170103.2124"; + version = "20170222.2141"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "99011d5780dd726ec46b7936e2cbbade66b725db"; - sha256 = "1757lgjbycbf5368s908xbj6dwn3xm9a9zix6ixwxd7j4gyhy16n"; + rev = "1d69cffd1dd4709338fba7241f344a55cb61f59e"; + sha256 = "1pv83biyiqkm5if3wkm071r5cl0ch1wv5yxzdqyxsq4k11s9z4qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15951,8 +16054,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6"; - sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x"; + rev = "5bf34ba5f71e993ea9ae0971240d5e0e975f1377"; + sha256 = "0wk5p4qr0a9mkwrayfcc6rshzjsg7dnwvlp5aj4rpfmlliy4qmfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16029,12 +16132,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20170216.1457"; + version = "20170224.1115"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "9e1341a704cfd6cacc1f5e4ffd75e8866a2519e8"; - sha256 = "1x73qsdnaywlvigas8m4djpb7gkddsp96v4v5vh178k9ppcrm8j0"; + rev = "4578772ff1a64fa50f225646a9f4cd2c3070bffb"; + sha256 = "0dcn3wkb1hvmk9jy5s28nyfw7hrxslzjlylxxrf8g454swkmx0i8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16092,12 +16195,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170218.916"; + version = "20170221.33"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "6ed56bc8a860c6b0719614210632202fd474bec7"; - sha256 = "0dgwl918n7pzmhflm3ljlsz218hqvfbblpmfiihjgy9zni4idfpj"; + rev = "4663cd80af74d8e29001adc696568de5d3d8717c"; + sha256 = "1r6b4dgk1scy1fwsri96gjldcx4q60vdgqb29k5g9sljsw00xzfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16218,12 +16321,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170211.1725"; + version = "20170227.2208"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c"; - sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46"; + rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b"; + sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16573,8 +16676,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d"; - sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4"; + rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1"; + sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16643,8 +16746,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d"; - sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4"; + rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1"; + sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17080,12 +17183,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170214.318"; + version = "20170224.702"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "65e7c410acfcc8d675f531894269866ecaedea6e"; - sha256 = "0khsycp7l93zz3n9aa2lbyk4imcdwyfpp2i9jc6g2j9k9jn1dcal"; + rev = "72f06e3e7f5010ff794e0db73950b33bcdfb2e72"; + sha256 = "0xbd5gq0pp6zn1rjkn3p44cvrg0xkyd8y8a41nnvgy5h1pjaqk0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17486,12 +17589,12 @@ emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emamux"; - version = "20161123.414"; + version = "20170226.1937"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-emamux"; - rev = "e4611a4049d3180e35da6419cf01f15c8fe2575f"; - sha256 = "1gskns6fqgp575hvk3jxl8wjlrh3i6wq1s4lwbgx0m5qybgqa62q"; + rev = "39f57786b2cdd3844888df42d71c7bd251f07158"; + sha256 = "184669qynz1m93s9nv5pdc8m4bnvqa56wz472nsq4xhixz44jjsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux"; @@ -17653,11 +17756,11 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20161222.1446"; + version = "20170226.1429"; src = fetchgit { url = "git://git.sv.gnu.org/emms.git"; - rev = "dde22abffb7a47adfe2cf98e4505ac0048e0b5fd"; - sha256 = "1r7gkilgmk2gll1ps0z7n0i74wbg66jla9cf8fvppvajxmmng4gv"; + rev = "0b0bdd12eb97797d3c481de70871d64f42672a58"; + sha256 = "1lvq4kc0sj5wrdjfyiarmz644ws36r7vp06jk4b11g5csk07lrc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; @@ -17925,12 +18028,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20161124.940"; + version = "20170220.2247"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "62609316f269bed9e6775f9614783789a79268e7"; - sha256 = "04wwi7f6cma1s0nhw2k756k3x3sjsc5s7iq1q6zlq4wmz08czg6v"; + rev = "181d619e96cd3275e69e010486169553c13479e7"; + sha256 = "1ms2pkjqdkwfvn8xq4dbm0585p2gdwcwplnx6rk7zjvir6nc6y5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18428,11 +18531,11 @@ erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "erc-hipchatify"; - version = "20160909.1503"; + version = "20170228.1151"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "dbb74dd91c5a"; - sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj"; + rev = "2b93fb7103f5"; + sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -18788,8 +18891,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "32a74e6c83cd110b8e8ab714be4365c0da558fca"; - sha256 = "12aw6rkh5dvznzzbwdlcjraw0s91bp5azs2d0lyblrnpi7lf28gg"; + rev = "a76345ae86f97c6c07569499a8f49c199a386444"; + sha256 = "1d8f3g5d6rjrlyzi77vx1c69lm8wx0h894zrw9y8nkp9mvydf1v3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19263,12 +19366,12 @@ eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20170220.832"; + version = "20170227.1220"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "4b0c93731d451ea7ddf4b1a8a61bab07915bbb0f"; - sha256 = "08384v47dasnw4dy3wlnj0n9wzc03wcf6r6y3hy36xizvkng4qdl"; + rev = "37f14a715d1909c9db271c435a3c0b234f131175"; + sha256 = "1kp9f3l2fnjw6sffxc5n439326kg00gfdhlvach9jpiy9dhkarpj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -19368,12 +19471,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170219.1024"; + version = "20170227.802"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "081ce9c0ac19e2f98fe2c35384f301de10cf8ce2"; - sha256 = "0q2s5mj2m3daqfhw34idvvlx0qkscbgqgpan6rc5aflibv7rlhk5"; + rev = "e7e52d2c07d374209261d207293caa391db7b398"; + sha256 = "1apk33hmsn5qlagnrqnmd975pz2ydf69s4kwsnx00fj9fb48bkzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19452,12 +19555,12 @@ ess-smart-underscore = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ess-smart-underscore"; - version = "20160711.748"; + version = "20170222.1715"; src = fetchFromGitHub { owner = "mattfidler"; repo = "ess-smart-underscore.el"; - rev = "bd219dc9af764e6c255299fe77ced4ed78df0cbb"; - sha256 = "1wnnswfpqcgspcij55i7z6cx41j3bbmqgvpgxhzzw3g47vsa1dkz"; + rev = "02e8a03553f34fe7184afff97f20e560d6f8d617"; + sha256 = "0kk9n66xjm08cj6zdqxfn332fb4c2is4pdxgqamypdwsdjhcz57l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore"; @@ -20370,12 +20473,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20170208.1712"; + version = "20170222.259"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "01a98a20c536a575ee5bc897f38116155154d5fe"; - sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl"; + rev = "8b5830a003ea4b1262621d822b9a45a0948bee22"; + sha256 = "11djm4qjj7h4iv661f55zpvlc3010ngj43rw5jgaii9mlrsfa6d2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -20664,12 +20767,12 @@ evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-swap-keys"; - version = "20170125.452"; + version = "20170221.444"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-swap-keys"; - rev = "1f137e85fc092cf5a1bd8abbd8e8fda0f4cd024b"; - sha256 = "0vx4gsyhcb050q8bh6d016ybjkji1mfpp9m000s4kq1k04nm4cwb"; + rev = "6a2f4db944076439c2cb481c4e9e4e5d736a5ab8"; + sha256 = "0ymxmlx6dfczxkdgsm8g8pz6dhdnb3ay74s2a70jgwqns8yaqv7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; @@ -21021,12 +21124,12 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20170213.616"; + version = "20170222.343"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "d9435e3d0954e9b791001a36d628124cc520445e"; - sha256 = "0i4463821lhi3cid6y3v3milq0ckagbdc513xs5vv3ri44h91n57"; + rev = "d1252200bac2e0197497d6d57ab6fd004f1b2e77"; + sha256 = "0bhwv92wqccz8y5xm6gj71ryci8cpsnm8z8vmdj8lsf6ki8vz512"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -21147,10 +21250,10 @@ eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "eyedropper"; - version = "20170101.930"; + version = "20170221.1640"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/eyedropper.el"; - sha256 = "1132mc9c79k07gh51i50qaykilnxwzb58rf18pja9fdqc9vzcs7y"; + sha256 = "1nyplgpcpbczb1lfj2x5l92ckn6f7wz28sviqiinh45fzsji5h3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/eyedropper"; @@ -21208,12 +21311,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170209.613"; + version = "20170228.815"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "5580dad950d866ff0110c01480b02b792167b83d"; - sha256 = "06ww18igmy7v07gqgw6yn9qb8h76a8mwd43pyi25y615k48ilrg6"; + rev = "4872561241cf67b679290fe91e5783dd9cba8d72"; + sha256 = "0ca36s17bhpzmsgl65q7c8fhadca0zpw6dh58vychrv4k7757gav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -21291,10 +21394,10 @@ }) {}; face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "face-remap-plus"; - version = "20170101.931"; + version = "20170222.1742"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/face-remap+.el"; - sha256 = "1mjh7hjpfxy476nwn0kbcq1zyaklrxd3l8482y5dlbcziwg85s1f"; + sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+"; @@ -21309,10 +21412,10 @@ }) {}; facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "facemenu-plus"; - version = "20170101.934"; + version = "20170222.1744"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/facemenu+.el"; - sha256 = "0xdrmmygyynk0rinfhikw5zjbh8kf8xbcs5a79irhm5mv88jiikf"; + sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+"; @@ -21327,10 +21430,10 @@ }) {}; faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "faces-plus"; - version = "20170101.934"; + version = "20170222.1745"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/faces+.el"; - sha256 = "1cvwna544xk5jlmimsszvvqcf2h8xmx6f9ripbpvkldgqalb91mn"; + sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+"; @@ -21742,10 +21845,10 @@ }) {}; files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "files-plus"; - version = "20170101.936"; + version = "20170222.1746"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/files+.el"; - sha256 = "01391gkkzciahi2azad5gd260i9s48c5k73m2w3qinv7clqwxc32"; + sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+"; @@ -21760,10 +21863,10 @@ }) {}; filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "filesets-plus"; - version = "20170101.937"; + version = "20170222.1748"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/filesets+.el"; - sha256 = "0d30i1vnmja1vjhqs25vdph2gcvrsrrxvzgnm5hp8pscf8wz1igf"; + sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+"; @@ -21862,10 +21965,10 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20170127.943"; + version = "20170222.1750"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "1d0h5bcvk6x20apkvi8ywq961y9zvs4qj8p4n9n8yhm5sznrksyc"; + sha256 = "002lcqhddw163w8h2lkp3yd47qhbia9ml7g8agngffsin9jip7qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; @@ -21964,10 +22067,10 @@ }) {}; finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "finder-plus"; - version = "20170101.945"; + version = "20170222.1752"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/finder+.el"; - sha256 = "1ip8y3qhswfhshh61c7b8iajdnlsyg2cpypbv87825mzy8vbgp6z"; + sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+"; @@ -22168,10 +22271,10 @@ }) {}; fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fit-frame"; - version = "20170101.946"; + version = "20170222.1754"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fit-frame.el"; - sha256 = "0l48zayzmlpzvqx02g1d2ilwijakwl2ql5svk78w3vx4nj41xxj7"; + sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame"; @@ -22589,12 +22692,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170212.1015"; + version = "20170223.247"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "3943b4cc991eba2d6aff6ef085ab34915dc274ee"; - sha256 = "1n2rl1b7xca5vyk6x60q7v3xn55n7a971xcmzz10yqh28qxn6qlg"; + rev = "da499ef6a7e3c8f4adec732703f34aea2a4e70a2"; + sha256 = "0nyvkgva0qkk7hrsb2h3q22hxvc17r10hff87gv7bj82ia8lxqnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22631,12 +22734,12 @@ flycheck-ats2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ats2"; - version = "20151130.607"; + version = "20170225.836"; src = fetchFromGitHub { owner = "drvink"; repo = "flycheck-ats2"; - rev = "431e46d5bbd20941c26270c7ba6872c86451348b"; - sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c"; + rev = "9f77add8408462af35bdddf87e37a661880255e3"; + sha256 = "1fv3r49i8dgszaq5rs8dwnwcj6rgx922ww01ikrq3b4c9y17srpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3605bdc402e6b13f53910eafb7f1428a5f749f/recipes/flycheck-ats2"; @@ -22733,6 +22836,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-clang-tidy"; + version = "20170222.512"; + src = fetchFromGitHub { + owner = "ch1bo"; + repo = "flycheck-clang-tidy"; + rev = "fe49836f30b37eae308e2255acbdcb0195d3a2ba"; + sha256 = "14i8f5gid9pnrgsvhibwclv4m53j86i05wbfjfj15aprhbf2ii94"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy"; + sha256 = "0lhf5byydmd380y7qx5x34r0sq7gzrj286pcaxhl388p6j58cb4p"; + name = "flycheck-clang-tidy"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-clang-tidy"; + license = lib.licenses.free; + }; + }) {}; flycheck-clangcheck = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-clangcheck"; @@ -22757,12 +22881,12 @@ flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-clojure"; - version = "20161231.836"; + version = "20170221.1354"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "254bd6a65a262896a4cc4f2061a6bbce51a5b73f"; - sha256 = "0315x1j55wkff0fizqvalfmxjiy1rl9fjk6hl7xziiw3rdvb943a"; + rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44"; + sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; @@ -23618,12 +23742,12 @@ flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }: melpaBuild { pname = "flycheck-scala-sbt"; - version = "20170217.934"; + version = "20170226.1127"; src = fetchFromGitHub { owner = "rjmac"; repo = "flycheck-scala-sbt"; - rev = "872a8f4e22d625149fb523dd75e69587773c2591"; - sha256 = "0zdnh4rfrg3wrr7jkbhq4p4g3cbcl4dzr4i4zkdzsda8g7y3gz7n"; + rev = "2d063d42628baf4cd4f38224013ece5b027db046"; + sha256 = "0ch63mm24ljpz1kd6w2qs4218ifir6aah7dnxipi2q2yz24frg6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt"; @@ -23769,8 +23893,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "386f6101fec6975000ad724f117816c01ab55f16"; - sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; + rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; + sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -24772,10 +24896,10 @@ }) {}; font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-plus"; - version = "20170101.947"; + version = "20170222.1755"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; - sha256 = "0ffs2c7gyhfa2mskdh7a1yp0na99kk282zm4zn56ljp55rrnnnh0"; + sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+"; @@ -24851,22 +24975,22 @@ license = lib.licenses.free; }; }) {}; - fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fontawesome"; - version = "20161219.312"; + version = "20170226.2039"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-fontawesome"; - rev = "72b4f2f83c7fdacd225aee58f93acefc53166626"; - sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d"; + rev = "c0ec46b7d7d9d194a09b572c55980f32a08c29a1"; + sha256 = "10dszqwb8sxhka4dv0xkd1pkd566z006xhq9d75qz29v3b7krbnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome"; sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3"; name = "fontawesome"; }; - packageRequires = [ emacs helm-core ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/fontawesome"; license = lib.licenses.free; @@ -24875,12 +24999,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170202.1427"; + version = "20170221.1327"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "975bf79f16f2c653466315669f4a26f85be0eaa3"; - sha256 = "0vq0fafll0j2k0f9b0rbzbyg6jxp3sba0nq5bqx0l3mjfvlg0x4d"; + rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94"; + sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -25106,10 +25230,10 @@ frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; - version = "20170207.1045"; + version = "20170222.1758"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-cmds.el"; - sha256 = "05mdds242vcav9gy15phvlk9q8iy29wnc8bp0c7i6z6bblairfzj"; + sha256 = "1r2hyl7f1rgw20mh8nj0lzf491p5pl4pfprv0yj0jls5jaqds4xc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds"; @@ -25124,10 +25248,10 @@ }) {}; frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-fns"; - version = "20170101.951"; + version = "20170222.1759"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-fns.el"; - sha256 = "00b2bb3rfraps47mcv0vb51ygjx0f311i95g0b7dh1jqi6nxdfb1"; + sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns"; @@ -25337,12 +25461,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20170210.1336"; + version = "20170224.912"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "26ac5bb8fe1cafbf2bd09ef8a528af506c2caf8a"; - sha256 = "0gbcwj36ns34xqgjp6pxml6zn8kza080gyyf383vhqqfqp640vqj"; + rev = "f7b982007e26e34e43debd8759346874966e6924"; + sha256 = "1mh1qv8vxipxyi060xzniq3y8h7b0as9j5si4ql6hs742fhpd2zk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -25361,8 +25485,8 @@ version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "55834faba7e5f7096f9ce53613333137ab20ad07"; - sha256 = "15vn4bw0qzgg3y5ak703c4jqds8zjc758fnrq2xsdi84d4r67c91"; + rev = "890be490748f1b8cdd79919e169600f5e8c0e8d7"; + sha256 = "0ygn4kvv8ypr55db0jgpqx0z2gynsn53wqgca4pjb1cbxqbkwi0g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25487,8 +25611,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "b66b691c56b128ee03541a7e0e777ceb78811f16"; - sha256 = "1ya49xakc30ljy3g6bfb1kikdhrgsq6rg2z63gvkzxhpqx63wjr5"; + rev = "2da9d1fc29dd9aaf2381ada1d5eeda4bed0a26cd"; + sha256 = "16c00vikjdq3hd8wv54y8nf7yj84311n9m06v4iwn8smh94ydzg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -25542,10 +25666,10 @@ }) {}; fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuzzy-match"; - version = "20170101.952"; + version = "20170222.1800"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el"; - sha256 = "130rx8x0d64pb5sz9xq3qvgq698xlkvlb76fk9xfq7n895kxf1bp"; + sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00737be152e9082d0f0c9076cac7fcd08bd4e7b/recipes/fuzzy-match"; @@ -25752,8 +25876,8 @@ src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "cf0a28c1f43c2d01f4b4a408de4f7a915b11076e"; - sha256 = "1hkdch2pj6vbj3j4hfazn2dvfhsgilqqn5r8m7ipj8sw1598rv0r"; + rev = "7639411604552fcb6352afe88522a9ff1c8132fc"; + sha256 = "02pic12kfa9794sz7qj57ca5ld8x1pk0apfr3h2xzr6zdsmsdday"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -26004,8 +26128,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "084688bb357d42e2459fdd381da2fea17ffc96ea"; - sha256 = "1n3rcmrv7mbi5h0s0b527kx358k7wl2s0rgnrvavbv392jf08890"; + rev = "53df9d228fb0bd1e89b74c9e86f773abd697540d"; + sha256 = "0rcw0wjql50qs5mi0m1516nsmhh0pj9xy0clr23fx2dxlflbhwr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -26298,8 +26422,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "35566abd2d21e6576dc2e33311c15977f5ba5667"; - sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f"; + rev = "1093e5b41a8c665b5026ebdec22874f9220926cd"; + sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26459,22 +26583,22 @@ license = lib.licenses.free; }; }) {}; - git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20170218.1541"; + version = "20170228.1957"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "4bb6dacc8e3faf781415e9fab44ebd45aa002fb4"; - sha256 = "0l0irmjl44kj4ghvr7jrbyi84q5ggyr36g3jpmvy3pag2fk3pc5n"; + rev = "891cfbcb4ea3a7d05b49495b4b01ce9ce417b9bb"; + sha256 = "18fxg5vr5m782np8957mk3c8d00z793k1qzpays5lv1v8ijkhzj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7"; name = "git-link"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/git-link"; license = lib.licenses.free; @@ -26525,12 +26649,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20161125.142"; + version = "20170226.24"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "d67901fd3f87f4836386d85a4a7df8a300d47147"; - sha256 = "0rgcr26snphimiigs3krzb577zd6xpzzhw1mcvmq2cjbc6hi6sdn"; + rev = "efa6752397101739c6abb53a0ca7a904d1c7898d"; + sha256 = "1v85cci8rm82wgss53ia1dqvq2q17hf2vayx6pi34h0hvj7ihzlx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -26777,12 +26901,12 @@ github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; - version = "20170220.1038"; + version = "20170221.804"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-github-theme"; - rev = "a424395262b2215866a02bf42bf8d93667979c13"; - sha256 = "017p4l68gw4gyfd2yr5yr3di407f50fs7ki6bqa0z74hc661n1g5"; + rev = "a7bce12f914c09c6c58db2d33390e890cb685537"; + sha256 = "1isskh364klkvx7krxngx9fapf0qr41mzfl581admcl64b70x315"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; @@ -27261,8 +27385,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc"; - sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks"; + rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b"; + sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -27408,8 +27532,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; - sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; + rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; + sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -27446,12 +27570,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20170206.1507"; + version = "20170228.916"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; - sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; + rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; + sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -27467,12 +27591,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20170211.2"; + version = "20170226.43"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "70437bc4348ef252e4788f867c86622aff670f91"; - sha256 = "1mvldim8igbrnff80h0x7570bhhxa0pli84888wfylks30r9kg5x"; + rev = "559d53bbc507394aaca3683325d17286637bf4f0"; + sha256 = "04hxgi27cyhs07mb0wz21q11b1nxmfsx56gynxjc2gqj2wb5i086"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -27534,8 +27658,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; - sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; + rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; + sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -27719,12 +27843,12 @@ golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "golden-ratio-scroll-screen"; - version = "20151211.230"; + version = "20170223.1829"; src = fetchFromGitHub { owner = "jixiuf"; repo = "golden-ratio-scroll-screen"; - rev = "585ca16851ac543da75d6ff61872565fb851a118"; - sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm"; + rev = "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791"; + sha256 = "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af044c4a28149362347c2477f0d8d0f8d1dc8c0d/recipes/golden-ratio-scroll-screen"; @@ -27744,8 +27868,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "b8599f7d71e7fead76b25aeb919c0e2558672f4a"; - sha256 = "0dlai5893607dirgwiw39zfmmp3iaswayym4gc1m4p7v9pvl7hx9"; + rev = "cb00e5669539f047b2f4c53a421a01b0c8e172c6"; + sha256 = "1wav8y5yps407znh0wspvcripbp2xjigqhzhgbv0adqsm9nyn70p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -27807,8 +27931,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "b282a74fea1455f4648d7f3098c954cce46e3a8d"; - sha256 = "0q2vkzr2vvkvnb3zw3mzcggpa897adv1hq4sk1mcfav2s4zri9jk"; + rev = "594d91bfbb8dfcbcac0f148af8175f2b7ec9857b"; + sha256 = "14g48ml7qfj2kyw5id0gmfigkw5k3xbr7fm55wrh2m3v1hq3cnfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -28052,12 +28176,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170214.1211"; + version = "20170227.1257"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "93064c0677521a409cfc701a9b6739ca2ee0a1f4"; - sha256 = "1r28da357iggz6mw7cvizf41pap6wy76ma883zxa8cwpb7g5qfhb"; + rev = "f4a3ffe52df6113f08a3c68e473ab6ff7dad28cf"; + sha256 = "001fh4z65f75s22rchdkffv71jwwfcfsc3sclcf3h77cj66h9ma0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28094,12 +28218,12 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "20170211.619"; + version = "20170228.1039"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "e47faf9c190d694b8b19b99bc919db98e51e67d8"; - sha256 = "1hkyd8mr2rrvkrm2rqmi2yb2way05jkxj3l6z3d8026l88rwiddy"; + rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2"; + sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -28461,10 +28585,10 @@ }) {}; grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-plus"; - version = "20170101.953"; + version = "20170223.728"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/grep+.el"; - sha256 = "13ivcicjdg3ig1jfgl2n39acmrwif5h7hwvb5677i7p8i69w3nds"; + sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+"; @@ -28692,8 +28816,8 @@ src = fetchFromGitHub { owner = "tmalsburg"; repo = "guess-language.el"; - rev = "89537dca05a72c0ad501856bbd3d12355d14a93d"; - sha256 = "08r7bknp602zsjhq7zzm021xlf686zdnabgzshrnrpiiwfgqv7wy"; + rev = "52e7623953dc1a76a24d1b8d261a7a1143fca903"; + sha256 = "00bkpxfn60sq0vz3xh60fylhvx4ijj9l34qmy55z024f1plzmvwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; @@ -28751,12 +28875,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170215.241"; + version = "20170227.656"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "092ea5a157621c6ef3236dd00dc1230a0c7ffc05"; - sha256 = "05ya8jny9j4amsmvgsnzpscbx8k7j016li5aikny7c12z4lf1n5d"; + rev = "c11094293d250bd6299c4eeb4dc64af223124aa9"; + sha256 = "0ya4zacfrv3hl317l78jrj491hag36i4ishh0gcrz602qqdgw531"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -29234,12 +29358,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170210.1038"; + version = "20170228.730"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "0f8eabf8c633df2539a158108a7c9083f894970f"; - sha256 = "0a3iqsq6pdsifylydk1wqrf45y5j9r86imh5pac15r2p0xqg6p46"; + rev = "74351e8a14e6e8e1cdb77a4b677065ab81d98d8b"; + sha256 = "0h6xrng4qmfkafd77pg1svzcsz5law6rcif95050c03w3fvy4syn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29462,10 +29586,10 @@ }) {}; header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "header2"; - version = "20170101.954"; + version = "20170223.729"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/header2.el"; - sha256 = "124cqzhhkaplq3nxlmy2dizpbllcazqbpv9k2yjxj5zk50s8dzxr"; + sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d16829cb4dea98908735be13aa632bc13d308acb/recipes/header2"; @@ -29502,12 +29626,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170216.738"; + version = "20170228.412"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e991087781e17de415ead3dec0d3e67897b637f7"; - sha256 = "0rar882mpaw48nvg6xdv69z3q5hd79y8dqqby65rrb6vh7hvjz77"; + rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0"; + sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29712,12 +29836,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170124.940"; + version = "20170227.608"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "6a6cef0668b86c88e629a817e1d13c4be45ad62a"; - sha256 = "0wsh8b0m094di1bxm2vdnrdqhix1a1wcd5nj2crra678d70ad9g9"; + rev = "c4fd39864d0c9f770426a93319b492942c81b1e6"; + sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30069,12 +30193,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170215.2338"; + version = "20170301.12"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e991087781e17de415ead3dec0d3e67897b637f7"; - sha256 = "0rar882mpaw48nvg6xdv69z3q5hd79y8dqqby65rrb6vh7hvjz77"; + rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0"; + sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30153,12 +30277,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20161207.1232"; + version = "20170221.638"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "b649ca44481e874146df8b88cc8750589dbdc232"; - sha256 = "0wchzxfd16g7idlvfa1idqivv7m2nvnil94b2fx39q9zcs0qzw4f"; + rev = "f07a77bd6ae6d8c933753f25526cbf3b71903e77"; + sha256 = "0az1j68g0svynvag7p3x7l1rv4n6y1knkmfcjhcli4jwrkn720xr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; @@ -30888,12 +31012,12 @@ helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hunks"; - version = "20161229.657"; + version = "20170225.602"; src = fetchFromGitHub { owner = "torgeir"; repo = "helm-hunks.el"; - rev = "aa266c87d5ac08f8a4021627d104972679bba21c"; - sha256 = "1g7mr04mhf0cx68ww28zfppigjp9m4b11sc037gn770n1vm0xvcm"; + rev = "1ea40753244ec843f38481b0889bb7d0e8db6619"; + sha256 = "0lhzzm5z50zfhfvg7chrflgnjnmpr9k9w40s6yczpsfanqm96qp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; @@ -31265,12 +31389,12 @@ helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: melpaBuild { pname = "helm-notmuch"; - version = "20161127.2308"; + version = "20170221.1208"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-notmuch"; - rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf"; - sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360"; + rev = "aac6b3ee2142515dc3f4b59f242cdfa2b012118c"; + sha256 = "10d2r9bksiq2v03fw6f44i30dk0hai12d1baygkci850m5n67irz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; @@ -31433,12 +31557,12 @@ helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }: melpaBuild { pname = "helm-perspeen"; - version = "20170219.812"; + version = "20170228.545"; src = fetchFromGitHub { owner = "jimo1001"; repo = "helm-perspeen"; - rev = "aec145d5196aed1689563d138a2aa37b139e1759"; - sha256 = "1wv13mvm9149nl9p93znl3d2yfnq4rph440ja07w804cd61qjhq9"; + rev = "7fe2922d85608bfa9e18269fc44181428b8849ff"; + sha256 = "1m89c95vzmhsvrg5g7ixz5a5ckw2n983x58cwh8rkmaklavacgsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen"; @@ -32230,10 +32354,10 @@ }) {}; help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-fns-plus"; - version = "20170101.959"; + version = "20170223.733"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; - sha256 = "14i48b139m7kp2qmmm8vfv359i74zmbjw1mck2n67xdxrh8bsk0k"; + sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+"; @@ -32248,10 +32372,10 @@ }) {}; help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-mode-plus"; - version = "20170101.1004"; + version = "20170223.737"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-mode+.el"; - sha256 = "1aj53ihdhrxsncw14v4npgfsbpjnzmz481nx8xmzlcxs16xayyqv"; + sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+"; @@ -32266,10 +32390,10 @@ }) {}; help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-plus"; - version = "20170101.956"; + version = "20170223.731"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help+.el"; - sha256 = "1k772rdakq2br8ahlk5l84s534wnb8jarlfhv4nbfaip6hidfqgk"; + sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+"; @@ -32348,12 +32472,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20160815.2246"; + version = "20170228.615"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "1ef35c70692e58b9c5d0ae52b00c058df99397ba"; - sha256 = "0xvzbbsqdx6lqkcydc67iv56y0s7536574m2pnj7q52hbfidazf8"; + rev = "fcc713565189eae4dc9f39ffd1944f4c192b512a"; + sha256 = "0338j0wf5h3vxdrhsgdiqiczg97md3gapghabswpsk8r9k4nsjn1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -32368,10 +32492,10 @@ }) {}; hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexrgb"; - version = "20170101.1007"; + version = "20170223.738"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hexrgb.el"; - sha256 = "1cpf5kj49iam5bfw2mddv4c5vr8d4j0sipbzjry3s8jvcxw2lzbi"; + sha256 = "0aijifwk7z9sl7wyl3qw649y2k8nk9qsv7dfaca0k42idh6ihswl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb"; @@ -32470,10 +32594,10 @@ }) {}; hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-comnt"; - version = "20170116.1012"; + version = "20170223.739"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hide-comnt.el"; - sha256 = "1g58gvbh5qrfc5r1af2plxdc1ygd6rxspmhhdz9z8hbf172b8j62"; + sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt"; @@ -32545,10 +32669,10 @@ }) {}; hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hideshowvis"; - version = "20130824.500"; + version = "20170227.1250"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hideshowvis.el"; - sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6"; + sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis"; @@ -32563,10 +32687,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20170101.1010"; + version = "20170223.743"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; - sha256 = "19mj1fw9hwqz5kybjbmac6l4gh8g52s1lgd01x34452zy69qdcnp"; + sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -32602,10 +32726,10 @@ }) {}; highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-chars"; - version = "20170101.1008"; + version = "20170223.740"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight-chars.el"; - sha256 = "0hkspc6skyra2lhrlg8wm008llmp4asxvxxkk6xbvlx3p0ajihjv"; + sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars"; @@ -33178,10 +33302,10 @@ }) {}; hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-defined"; - version = "20170101.1011"; + version = "20170223.744"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-defined.el"; - sha256 = "1m21l7hlk46pkpbzmglpkpigynsf8121dx8swslpbn0lck9wrg21"; + sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined"; @@ -33217,10 +33341,10 @@ }) {}; hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-line-plus"; - version = "20170101.1012"; + version = "20170223.745"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "16mv6h2mx1z47nds4q2crym8idj9i6y9jbdsqbafxmzwp54hfl3p"; + sha256 = "1dhrfbmh98y18xgsp42rx1qqcs296mpqqzzp3nr9rcqv4gvpllgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d5d1cf2f29d46e8abd821095da86f137650a2ff/recipes/hl-line+"; @@ -33277,10 +33401,10 @@ }) {}; hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-spotlight"; - version = "20170101.1013"; + version = "20170223.746"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el"; - sha256 = "0f16nalmz7pdrxmmxznqgbb8m7kkwfpf8a31r0b98wqrw8n5nnwg"; + sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight"; @@ -33317,12 +33441,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170219.532"; + version = "20170227.1018"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "6c1d1cd47ffa003c7b6fac9a0130f2401cab5dcb"; - sha256 = "1idsw6hvrs5cjaz0sx4nfikv8md9mc4010245lpfhx4hn559c5k3"; + rev = "c9d602b8d4947db2b759ecfe0a8b7bf81acec3bb"; + sha256 = "14c1alab62y2d5qwzhp48dhcilwklph7597rgkpqniccd41b8wav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -35145,14 +35269,14 @@ pname = "import-js"; version = "20161220.508"; src = fetchFromGitHub { - owner = "galooshi"; + owner = "Galooshi"; repo = "emacs-import-js"; rev = "15d395126f57408d770a72db2e5f43271f90fa52"; sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; - sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; + sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn"; name = "import-js"; }; packageRequires = [ emacs grizzl ]; @@ -35206,12 +35330,12 @@ indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-guide"; - version = "20170220.57"; + version = "20170221.327"; src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "92dd919f70b4d7398ae528123d035936c0ad9d05"; - sha256 = "1jmb53kcl3x94raba8g5w0ys3dgrnam6a540i5jmxpc5z1vanskc"; + rev = "d64f43011c72068e008621e620009ec592b35913"; + sha256 = "1zjxfwbbmg95llpkvgbwdgk6cx7g9x48y3i4v75r8d4iy2xndgq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -35436,10 +35560,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20170109.1240"; + version = "20170227.1101"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "087svwy5s8pkvfmg5s1qk4vfg315fsvhqkdjq0pa3zavly3vm1kq"; + sha256 = "1nh8l0ah2gqg3p8lg9z7zf2fzbzalrbrjkqgn30l48rkk58bmf4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -35790,12 +35914,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170220.440"; + version = "20170228.441"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "9d183b6eeeef274092127385b8e4075bde87ba78"; - sha256 = "171as5lssfy1ccpn6hzvqbjs72cl62nifs45909df9782l3d0608"; + rev = "e1c2c47e4ca6219c76b0ab3ee41dda27d3126d4a"; + sha256 = "026i5wrg7gs9h9nw79fzmi0q9w9hrjbrl1h26569la15fqjvfs22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -36060,12 +36184,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170217.136"; + version = "20170223.515"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "284ca00b48d8261106efc6c6ac128ebec608c86f"; - sha256 = "0clpnv6byy8zxw0qlxmljbsx9zf4qag9i1lmzianczdpiba4pq9a"; + rev = "75b356b357e63a03c04e194e85f1925f198363dc"; + sha256 = "0fsg79ww3aqy0m46xjdr3783zwc6vnxknh4k2yrizmm44zvy925z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -36348,12 +36472,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170217.605"; + version = "20170225.351"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2"; - sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq"; + rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309"; + sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -36369,12 +36493,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170124.940"; + version = "20170227.608"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "6a6cef0668b86c88e629a817e1d13c4be45ad62a"; - sha256 = "0wsh8b0m094di1bxm2vdnrdqhix1a1wcd5nj2crra678d70ad9g9"; + rev = "c4fd39864d0c9f770426a93319b492942c81b1e6"; + sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -36436,8 +36560,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2"; - sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq"; + rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309"; + sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -36495,12 +36619,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20170210.409"; + version = "20170227.1745"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "4517ca22b462f5202d3959a11acbcd4b64d883b3"; - sha256 = "0zy7scakd2hj0zggb41r3c9lh9y437121yjlha5mmlbd4zszdyxl"; + rev = "ba15a2fb46a63f0aaf5e5b4dae026c2e1228ec1a"; + sha256 = "1hkydyrcqv3qn605kjm8lhv2hpjmrjp7qvfxwyjbr878nhbm6jn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -36682,12 +36806,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161210.804"; + version = "20170224.922"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "2bacd4da0b190547d2d767adfea1b3c4501710c0"; - sha256 = "18r8rkcqrcizg884axf3d2zi9a6d5nlh1syn68l17yf2fi4mkkzw"; + rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; + sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -37018,12 +37142,12 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20160406.1257"; + version = "20170227.1420"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; - rev = "b2ecf9bfad26a15afc75bfae1db097baa5c29f03"; - sha256 = "1gns0y05kyxl2fcyiawgdx2hi0vslz97kvirbckg19id50cv9ac1"; + rev = "3c5959de68117f5ebc622ba0a79caf7116c5b863"; + sha256 = "09bmk1dw6h4cidrmfn6nmzj6lrfk39phngc11v7h0cwvxcbq6kpl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; @@ -37039,12 +37163,12 @@ jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jdecomp"; - version = "20170212.2147"; + version = "20170224.1400"; src = fetchFromGitHub { owner = "xiongtx"; repo = "jdecomp"; - rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7"; - sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii"; + rev = "692866abc83deedce62be8d6040cf24dda7fb7a8"; + sha256 = "00l6mc643na97jrb0k595kwmfg8wc7m5iqjd9l9vvf3dal6389b8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp"; @@ -37561,12 +37685,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170202.1422"; + version = "20170221.1636"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "faf73e8b6cfa9b896abde60cedd4cc69c9dfae19"; - sha256 = "12las04bxp74w0pp1w8ri4mqv7kl48sz6dzqvq9xb50nz8y9bijy"; + rev = "4787b5f2b8dbc1a8f8620c374402aa347e311527"; + sha256 = "0zlmadvmyl9q8qlzs1i880slr4h800qq6zgqisa45nzychx8b07k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -38121,6 +38245,27 @@ license = lib.licenses.free; }; }) {}; + kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "kaolin-theme"; + version = "20170226.839"; + src = fetchFromGitHub { + owner = "0rdy"; + repo = "kaolin-theme"; + rev = "697d437510ff38c22913f232a051a3620be68db5"; + sha256 = "0c9l7pdklk8l7qfi6xvmmbj2cjaj2dwzfgzvblh0dc4hv32g4r9v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; + sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c"; + name = "kaolin-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/kaolin-theme"; + license = lib.licenses.free; + }; + }) {}; kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "kaomoji"; @@ -38608,8 +38753,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "bf1da4672ca848eee59ccf486e68f74157e45af1"; - sha256 = "064nak7bkpzip03k81cz3fzjf1kn7vq2azcazhspn4i6f8xgfzb5"; + rev = "b449bae54e4508f42f28cf1cba20e3ad849b1210"; + sha256 = "1vr65dcyjisq61nq90qpxww0spz558ny7l2yis3hk9qg4zic58ky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -38688,12 +38833,12 @@ kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20170206.1833"; + version = "20170226.1627"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "f028d330e0220d7719f1504ad3b25bab9c1b8e4a"; - sha256 = "0pmchrsw59ng8vilgml7ba5b17bwh0ac4b31s55nhy3f59l7y0d1"; + rev = "60141505ca027231866f7032c557afd7d085b35f"; + sha256 = "1c47p9zan4cifiaz097sc3sxq04inh5rqqc22p105x0jm0hykd93"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -39482,12 +39627,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170218.357"; + version = "20170226.131"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "f2778f661ebfe1159aa632c987db7f46673aac14"; - sha256 = "08p4nlh5f4bw65p75rlf6nxrbs5fv84l6fwvcl5frs6lng3a2s0s"; + rev = "51ca421f52839c62c6b4ed4cc70d55701ca2afdb"; + sha256 = "08v2mx80ihcs4v2ydf4ksb5yhbsp222wwzzx26xw70icahsx67y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -39546,8 +39691,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "640ef0f7251ae23b43f6824bd4f116fa2ee16b9b"; - sha256 = "067n6i4vvjldwrm2xif7qskbxy59aqz8jrkjniq4kv8jgpab9iwc"; + rev = "69a2d1d410220a688ad169366d0d20e138e264f6"; + sha256 = "0ky6dcvqprmaww5503q2y42vz5qls844xvb7yx2sl3czlm47riy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -40172,12 +40317,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170218.2328"; + version = "20170225.2207"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "6e413e5692b38e5b7e3713cf0216b143c765cfc2"; - sha256 = "0zsi0y2fhynj0qdvyds1vihzli4nw9ii0i5mksqki0v02jmaaygh"; + rev = "0c253d6547008202c20eba2cb5649dd1f44b3126"; + sha256 = "02wrf9mih1dx2xgzwc5465gb8ylm4i3y84x0y0bv1pk420y4iiav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -40259,8 +40404,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "3abe103b2e7d593974f7dff008d09139e1e5e030"; - sha256 = "104qhhbgd68wrxyrlrywb7rsh095lg9hviyv3w8p6wymzfa9j2ms"; + rev = "8d23745f59b90c6229cb58fb65ef8cf2725826ea"; + sha256 = "184ir75pald2g3fkyhnrgff58n617fxj7q5qwjqcn759r59qhxma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -40485,12 +40630,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170127.1107"; + version = "20170226.1206"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "bbed5a7651042594340de7e15ac96150097f1555"; - sha256 = "0iks3451x6nf2hhhw6nvnh4y9gigjp3rd38sp7m60vsz9ggmninh"; + rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3"; + sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -40629,12 +40774,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170118.2007"; + version = "20170222.747"; src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-lsp"; - rev = "7f43aa9c669832f1c2f22a3f785f3cd05aacfe02"; - sha256 = "0dfyyjvzh55cnm33w6gq841cbldki8yfzqpz37gs98zxy0wkc6kw"; + rev = "81e58d62c5f480a876a06f67427150233c5c9d14"; + sha256 = "0m0ly7ysp1wvy50jv4cykjgskd1wjm1sfqjpf75rhij6fq6cb87r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode"; @@ -40920,12 +41065,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170219.906"; + version = "20170228.1717"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "35566abd2d21e6576dc2e33311c15977f5ba5667"; - sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f"; + rev = "1093e5b41a8c665b5026ebdec22874f9220926cd"; + sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -41099,8 +41244,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "35566abd2d21e6576dc2e33311c15977f5ba5667"; - sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f"; + rev = "1093e5b41a8c665b5026ebdec22874f9220926cd"; + sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -41302,22 +41447,22 @@ license = lib.licenses.free; }; }) {}; - major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: + major-mode-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "major-mode-icons"; - version = "20170208.40"; + version = "20170228.2314"; src = fetchFromGitHub { owner = "stardiviner"; repo = "major-mode-icons"; - rev = "8773a4d01a77f0562373633692c8ded0305aa374"; - sha256 = "1pqbqybv21j4a9h5spyv780khky80n5bwvh1dg9sqia47kf3z5ak"; + rev = "e6117a236b2ad52e948576550b183053321dfc91"; + sha256 = "0gpp9x23qz7ll8d7hlbvynv891hw907k38i7v0b08s8zh1ilvnwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons"; sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95"; name = "major-mode-icons"; }; - packageRequires = [ emacs powerline ]; + packageRequires = [ all-the-icons emacs powerline ]; meta = { homepage = "https://melpa.org/#/major-mode-icons"; license = lib.licenses.free; @@ -41347,12 +41492,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20170206.741"; + version = "20170225.1000"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "c674b25e6b3eb7c848a62727e69bdafdc92a37be"; - sha256 = "1qjcwvqbxl0iqlbwcisqmq2m3giwkm2sq5i2a5crrwhzxjasbbsj"; + rev = "2df57246b6cf32b3af2d44ddd16b4a711eb49abd"; + sha256 = "091lh50gf7xd2l737qb9mypbfabrjy7f0ry4d3rcb8ar2sqj58gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -41774,12 +41919,12 @@ markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: melpaBuild { pname = "markdown-toc"; - version = "20161214.1011"; + version = "20170224.2350"; src = fetchFromGitHub { owner = "ardumont"; repo = "markdown-toc"; - rev = "c7a526c0cd2c3b2ecc7b36458c762e0a0b55909e"; - sha256 = "1j35pmm9rk7zk5j6x0fzglx09hbm8csf07f0pc9fkvvyh1nqskxf"; + rev = "0edc303871517da67483119f2b1969055e6e0608"; + sha256 = "0fnb2qw7p5mmv9nbkjy2iw3whi40gxwxbdfwgadbypzk0yvh6a3v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; @@ -41942,12 +42087,12 @@ math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "math-symbol-lists"; - version = "20160302.1431"; + version = "20170221.553"; src = fetchFromGitHub { owner = "vspinu"; repo = "math-symbol-lists"; - rev = "b540f67201e6e13e0e1dd97ceba3070a83e5649c"; - sha256 = "0k1ayv0a9g778b50jni3hh70pg6axmq34wl8x3zgphadgms1w9dd"; + rev = "1af8fdcab7941a62287c2d04b8876e1538f39c60"; + sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists"; @@ -42252,12 +42397,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170219.1656"; + version = "20170226.2008"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "bcbd1701745c2dc0b161fdf428f3db3887dfa48a"; - sha256 = "1zs9b8ijwj7b61m3az4k5ch89siz4hy74adz9k4amaab9s6chzcf"; + rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8"; + sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -42438,12 +42583,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "20161103.821"; + version = "20170204.628"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019"; - sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; + rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805"; + sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -42481,8 +42626,8 @@ src = fetchFromGitHub { owner = "legoscia"; repo = "messages-are-flowing"; - rev = "649061753b67b24c54a2eaadc8b3218cafae7376"; - sha256 = "01y9cx5d5sqgvg97dzrnyi7m3yp0q3hm2yqcgknkp111afcgiwm7"; + rev = "17a0d91658390ba8d38f325b3ece380e07e3cb49"; + sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/275d537d9dab56e21d0d6d25a287ae9cbcc26d98/recipes/messages-are-flowing"; @@ -42940,14 +43085,14 @@ pname = "minimal-theme"; version = "20160608.322"; src = fetchFromGitHub { - owner = "ikame"; + owner = "anler"; repo = "minimal-theme"; rev = "430e0d3fc2044c16aa9f10961841febbd60df285"; sha256 = "1rmcvdydgwppma1v2yajz6yzhns8bh3gdb09338jlk0nkp1akpfj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/07609fd557b7e93875ad64488d2c638e48b34d68/recipes/minimal-theme"; - sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/minimal-theme"; + sha256 = "01dar95l7wjjqhbsknvsfbpvv41ka7iqd1fssckz18lgfqpb54bs"; name = "minimal-theme"; }; packageRequires = []; @@ -43159,12 +43304,12 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20150828.1716"; + version = "20170220.1548"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; - rev = "c9a857a638701482931ffaaee262b61ce53489f3"; - sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9"; + rev = "631e7f12d1641cb40e650134f35f2680a1a310a1"; + sha256 = "0lwvh7f6hmjfdgidshqz25pihyd5bg87y23mbhkjb7qkdjas07wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; @@ -43407,10 +43552,10 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20170219.757"; + version = "20170227.1124"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "1f3qdf2drdx0sv1rgcg87n4zhjlg8d9iaxzqgfz4qdjxhi1swg0z"; + sha256 = "0glwnfgch9li5z6051ia3f61csl3f6aa1cwkwmw9w7saw4d6q3m1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -43426,12 +43571,12 @@ modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; - version = "20160622.1321"; + version = "20170224.114"; src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; - rev = "3e9c18b5a2ade485565f5191f12a724f1969dbb0"; - sha256 = "0jg5yix4c18gvy5n4wsi7zg2sb7r0bw0xlmq0w15g3z63nhy69vc"; + rev = "f1a4413c40e933b8b5b380860656b1ef5663f121"; + sha256 = "0hb40cp33fpgfs4c5g8phhvv9mbykygybidh73pbrcacyiz4g6jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; @@ -43552,12 +43697,12 @@ monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monky"; - version = "20160315.2051"; + version = "20170224.921"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "monky"; - rev = "988571711a350d0cedff8ff394c6ffa0e0042cc5"; - sha256 = "1p9p0yp68wb7f1qf0c02fk7ayb7dw6gv57368ksa6nw76w58hhfm"; + rev = "190079ea4d22a4e875a3b2892e58737344cb2b26"; + sha256 = "01d7mbpkkb36lk6g9gkxlj3b58c23nqfmh7m5qq7xz90kd42316g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky"; @@ -44134,12 +44279,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20160909.918"; + version = "20170220.2245"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "839cb7a9b9db150460d1e1b40fc7abcd61679011"; - sha256 = "1kl0f9m3zs9nkkmzpbf4kddjmbvvg7psmv1hanlw5h3z3yy1m9x0"; + rev = "38452683b2cb4448de13062d47264f9e9d35e7c8"; + sha256 = "0mazixn55g0wcg541vj1wg2madczcy9r3ka38zfxnvj3jbf18cij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; @@ -44257,11 +44402,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20170212.1130"; + version = "20170221.232"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "7465189ae9ac"; - sha256 = "1zgvg3gx283jgclqyl141p2nbrc21x775d4nnz9fp8bxz3gci7nk"; + rev = "c04d5bdeb213"; + sha256 = "1m4sjmbrc8rln8817b4nybbh1akphbl58i0pfl1ic515xn1g3by2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -45255,8 +45400,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "2f76c26353062ba6578914113ca26c53f5abcdb7"; - sha256 = "1nn6kfg84g5aplis76q7r6wx74rj6r3n6kcdghvsyih77r4r32jl"; + rev = "07683fa4850bba450d7853aacd181c44a9b57ea8"; + sha256 = "1571sp3abdwzny3zph1alyam0a0vvi4h97g017r8bm2rj16r01fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -45293,12 +45438,12 @@ neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20170206.804"; + version = "20170227.1731"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "ab9a1559d01857252b85d787666ea24a103003b4"; - sha256 = "04473ay2hcpw696x9k2gh1dvj2h4nb898q4g3nf3b0rdg2cpb250"; + rev = "75d8e8686ae479490a0e60d4ea96f989d7a18725"; + sha256 = "10xc3hmm468rvjwmgyfg6zwwmki2bzlnnj61ch33m0hqrr8q6nl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -45591,8 +45736,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5789b692d4b0a74f5804a1dfdb4b1f429ab877ea"; - sha256 = "1ri76jwvnh533ylnqh96dhqcpinj2r90b9vysyzm62ppzny7lkxp"; + rev = "07808052461e9534dc42f7f98e83a7b58565fd13"; + sha256 = "0ss34q1xmwbg5sswf3yfhi6h3pxpfbr3yvvcsz7w24brfd0zllkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -45713,12 +45858,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170206.33"; + version = "20170226.1130"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "1a6ca91e4a2cb48cccc989b6473191f42b606ab6"; - sha256 = "1kd65x4bg9xrqp7241yxs352p2hiwa5hnggi2sw4718wcfbim1zw"; + rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b"; + sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -45878,11 +46023,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170127.1808"; + version = "20170226.355"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "0e037c34dd4b7eb9be96e62e0ee18260291de1b2"; - sha256 = "1vafbkmyk7gf7jnk70nypah1y2r0x43v9ki00bxdg51rh61fyhqx"; + rev = "508b5c20fa38b17fa527af075857061f4ed81e2a"; + sha256 = "0bjb539mqmjq9s2ks8pvq0ync9b19af48kx60vwgg4k0c7n03sab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -46126,12 +46271,12 @@ nv-delete-back = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nv-delete-back"; - version = "20170213.1355"; + version = "20170224.449"; src = fetchFromGitHub { owner = "nivaca"; repo = "nv-delete-back"; - rev = "a977d0446a94aed12f7d01abe339fe01d55085cf"; - sha256 = "1jfliyrp8wl9xz76lfpqgpcgxfhvf6cbrp2hf7ry5mk6iqwwnmd2"; + rev = "44d506105989873dc1725e0cfc675925b35c9c98"; + sha256 = "0lgz0sknnrxmc7iy4lniday1nwpz4q841c3w2hm72aiwn5z21h22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7bdc83e14be56f5848d3066686f5d24c2ed4a3c/recipes/nv-delete-back"; @@ -46270,6 +46415,27 @@ license = lib.licenses.free; }; }) {}; + ob-async = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ob-async"; + version = "20170216.2011"; + src = fetchFromGitHub { + owner = "astahlman"; + repo = "ob-async"; + rev = "6bdb5b63ff4a8853d03805d7a7042213003a3dee"; + sha256 = "1n4zc4nfv7hzilnb0qng6vh19dj4kq12gwsillj6c3i89gjz73wr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1b0ca3a2da727e2f521dacd2fa9fa79ca03f7e2/recipes/ob-async"; + sha256 = "0pra4lvvkdyn7agcgdjsk5dhis78pnvdfk3s5ivbaki70yi71aia"; + name = "ob-async"; + }; + packageRequires = [ async org ]; + meta = { + homepage = "https://melpa.org/#/ob-async"; + license = lib.licenses.free; + }; + }) {}; ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-axiom"; @@ -47767,12 +47933,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20170214.734"; + version = "20170228.1156"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "3854459ba0356be7385cfc707eb33fab7d1baf41"; - sha256 = "1k30djkyah6qpkb09a9pid091agkvq97vf5idscjjxxpdjyglcj6"; + rev = "346140fcd727964dbac623dde856addb08d9ddd3"; + sha256 = "04ax2c6rg197i6is24gfm7cwdgkr98ic5r8x5h4dlqkr36f43f9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -48417,12 +48583,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20170207.2145"; + version = "20170224.1951"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "e665315fc041851e19c759e51173f9ddc0445512"; - sha256 = "0fgir67cm6gmwj80gmhblg9j7pp6qvkksm9qnsdj2r5q1c9s33kc"; + rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da"; + sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -48438,12 +48604,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170126.234"; + version = "20170221.612"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "3f29a64655cd03c662fa24ff687e5ed29d6bdd9e"; - sha256 = "1a5z726hfaimjhidxskw7fr89hc3i0wl5hmpk8x64q87an0mkcmi"; + rev = "30ca909d50737d32b3790c57fd2e13915fccfe97"; + sha256 = "0j60ka5klx97swa20ldcm1y8rs5ib0jc0zz3vavhgdg0nhc7w69p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -48504,8 +48670,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "f5722944575dc83b1e12c730b2887c584fd523d7"; - sha256 = "16sdfzlk522yiz45brnk7kzkrnp4b9cwknl7q4nhpa5awz22ny15"; + rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee"; + sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -48524,8 +48690,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "f5722944575dc83b1e12c730b2887c584fd523d7"; - sha256 = "16sdfzlk522yiz45brnk7kzkrnp4b9cwknl7q4nhpa5awz22ny15"; + rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee"; + sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -48911,12 +49077,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170217.1354"; + version = "20170228.1517"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "6a13b566b1272773921b76bc6142fb2cf243bc7e"; - sha256 = "1n125f2r3g5lkypk02cz5mfyhywlm8q5cnlh4h2rs5vdx39kpji8"; + rev = "4977d1d519cfb9cfcdb1f72010097188de5766c8"; + sha256 = "17nxsa5yzkawnff1ibfn21qwd3w5awvky0ywjdwh3mm2jg3r7sfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -49068,12 +49234,12 @@ org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-table-sticky-header"; - version = "20170216.2216"; + version = "20170227.1242"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org-table-sticky-header"; - rev = "a47f67927cdd66a0bd44bd45d41bd74c97c5d873"; - sha256 = "1wxqlccbfywik5fj79clv781g41aialpi3xwbibx8m6p4h51rlrl"; + rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043"; + sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; @@ -49233,29 +49399,22 @@ license = lib.licenses.free; }; }) {}; - org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: + org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: melpaBuild { pname = "org-trello"; - version = "20160604.645"; + version = "20170225.1247"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; - rev = "dfb98150207b13c7771d0c0b8209e0503cd99cd6"; - sha256 = "1d2bi29m8kxhp46slg904frgmlc6ajqagxjrhxlbdmlxrp18s44g"; + rev = "32dd866e830836a72a3b96b96e0d00d044d0eaf7"; + sha256 = "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i"; name = "org-trello"; }; - packageRequires = [ - dash - dash-functional - deferred - emacs - request-deferred - s - ]; + packageRequires = [ dash dash-functional deferred request-deferred s ]; meta = { homepage = "https://melpa.org/#/org-trello"; license = lib.licenses.free; @@ -49411,12 +49570,12 @@ org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }: melpaBuild { pname = "org2jekyll"; - version = "20160519.1004"; + version = "20170225.115"; src = fetchFromGitHub { owner = "ardumont"; repo = "org2jekyll"; - rev = "991c995715ecad0454d0402f43a5161a3954b7f7"; - sha256 = "1gdv1dwmwhmpcpcvf8fmsjg3mli3l27inlql13m98h7vpv7rzqvb"; + rev = "52a19a5d372116262b9d613f4ec8490a3b49e329"; + sha256 = "14ld8ip487282if2sil96lfg5wx7632kg71sxhafygphbdl9vxd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48a1e5bd5e338bd3593f004f95b6fbb12595bfb7/recipes/org2jekyll"; @@ -50045,8 +50204,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "b3d9d6310a411ada0212c702a75f32dc2f7743a1"; - sha256 = "1hllqlh89y4cn7jx72bxljvvys6avgnq2qb2543q8iabh1jj4q2m"; + rev = "6a642cdc7e98cc8f0e80474ac7172cea4f8889f3"; + sha256 = "11304vs5wvi0p5v3yvqn463ablm4cc5zk6xli37m08yd8ifgh2q9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -50605,22 +50764,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-utils"; - version = "20161125.930"; + version = "20170222.2352"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "1ad19f3a9de68ae68e6dd2d4dad31532b4de1700"; - sha256 = "04ckdz80paj1dz1q659cgm7hkdh828ckxlch6iq18abr1ijzl8vm"; + rev = "4ee0d996d4c1a6fed0689361bd9524661339ebdd"; + sha256 = "0a1wvjlr176dbkqgf44f0iwvx865wl2isns36gllcq5fsh4g1q1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = [ async ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -51236,8 +51395,8 @@ version = "20151027.1449"; src = fetchgit { url = "http://git.zx2c4.com/password-store"; - rev = "77f1384a6321eef06265ea5e5b11eabdc53ab720"; - sha256 = "0b4qlbrz6g39x1p89lx3xk4h7159jj14rf6mgsyv1fasc7yyxxiz"; + rev = "20081b546f371dcaee9ea2769f46e513bb39c275"; + sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; @@ -51693,12 +51852,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170130.300"; + version = "20170228.2312"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "3a32d2420cc40ed864215f75aae4f6d868dc1cd2"; - sha256 = "15j8ll2rna5f0a4zq2bflbn888c6yp852i405qlcxcjvs3jalxcy"; + rev = "7cca03bd2fc534a6b42eafc2afef20099bf83dbf"; + sha256 = "05m282b4n2pgj3qgmdms8i8yxb2h2sdlvd7r9xlfp3j5xb35pk27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -51965,12 +52124,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170123.1056"; + version = "20170209.658"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "70290b60fd20850c728a63d763037fac69fd1874"; - sha256 = "1dw17m0dczry3chyw3yks33jqzr7zgccx3xdjv0lziwfxdnwkaji"; + rev = "cd1ecbddf42542a3f5e161c954439c6dba70f53c"; + sha256 = "0q3lhppwr0515qq6l08ypxffpp4jf3y2v1giyxwpmfcnbiwxicnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -52028,12 +52187,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170205.300"; + version = "20170221.1910"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "8fc32cf57fe8f38bf47e8bce99058ba3cc2561ad"; - sha256 = "1n69jshs35cafx6p7ibdr1mqzbp2k1gdknb1k9f9nfzasr0nma56"; + rev = "cca16ec338454acbad26f4d1d57a463a034bdd44"; + sha256 = "078mfmky682hbjkdxkawimxddzc2laz6xqrcpi1dli1vzgpkx7p9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; @@ -52427,12 +52586,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170201.1842"; + version = "20170220.1707"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "2a335398928a4fdab24335ed7aceed95c1bd0871"; - sha256 = "0i8ns9jncih3s33wv66gkd45brixlc4smbssb3j47dqp3drpn0nw"; + rev = "aa69d062ea91e03ad84a378ed4f71c63846027d9"; + sha256 = "0xpdzv2vigidnqv2pl9g614cqd8xykyln84pksifx2ldjbcs9xsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -53773,6 +53932,27 @@ license = lib.licenses.free; }; }) {}; + prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prassee-theme"; + version = "20170228.618"; + src = fetchFromGitHub { + owner = "prassee"; + repo = "prassee-emacs-theme"; + rev = "5c95639cf397b6cae5b0b37e462bd370296f84b2"; + sha256 = "0qyzfw7qxy6jb1qv93a6dvylji62yi06wvi8bqaxjsqf0a3zhb32"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; + sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs"; + name = "prassee-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/prassee-theme"; + license = lib.licenses.free; + }; + }) {}; preproc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preproc-font-lock"; @@ -54211,12 +54391,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170106.606"; + version = "20170225.2320"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "cdf9c228ccdcb57b73184f10ea3f1e2e4e03d320"; - sha256 = "02md2hmf21w03xc8imqmcbhildnkj9s69pig1zd9nbs1svgqbycp"; + rev = "d9cc453b9e11c9b2f03413e3075e063a6143af69"; + sha256 = "1zam1avzb5dcv0icjd8vs1p7k24szqx1n4b7qr17pikyvjz4g0xs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -54614,8 +54794,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "a9ab38c17178fcedd9b46c09fa33f94d1a6335c3"; - sha256 = "0rhwxpbb328ivndnck5dcgwi8g4a8lrdvbsc4vcjhxc2yrfm93q8"; + rev = "5274d6ee314a237f6626b5b4633c9f87574ad46d"; + sha256 = "0rjxp15xnj8hd39z6nzjdxypj7fgi6rpmfcbjmx5xqah4gbcbpnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -54895,14 +55075,14 @@ pname = "purple-haze-theme"; version = "20141014.1929"; src = fetchFromGitHub { - owner = "jasonm23"; + owner = "emacsfodder"; repo = "emacs-purple-haze-theme"; rev = "3e245cbef7cd09e6b3ee124963e372a04e9a6485"; sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1bacdfc5c14c16f60da5f57f41eb3859345d9f62/recipes/purple-haze-theme"; - sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/purple-haze-theme"; + sha256 = "1rvfpm3zkhdv3ikc8pqqngf9pi0niwyi52pg8dq8i056nwc5bk9z"; name = "purple-haze-theme"; }; packageRequires = [ emacs ]; @@ -55357,8 +55537,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "0d3b4a72b585b34cc12cb95eaf62ca3d13173a9e"; - sha256 = "1nrz534rb8lkrb1ch7804i8r0gxrjbwim90j7pzsinqfl21xg5p2"; + rev = "56daa5c3a0d2d6592c673c2932c354b68679997f"; + sha256 = "0h1d069hd6kk0z05x8454km3sx4bwab3gv860v5a7cf79ahx2k5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -55588,8 +55768,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "0279cbc8e7fba8900060da0d1be4fae7404109b8"; - sha256 = "16sp3mg5jzx89lgr3kr61fqw1p9gc5zxq2mi9rpgqi5hkkcpnpgj"; + rev = "87475def246b84339f464e80c76c7e7fcc2e780a"; + sha256 = "1j93c4rx7llyfvfvvvcrcpsj47zb56kkdii1lnyzay4n5zakhjhf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; @@ -55605,12 +55785,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20170211.456"; + version = "20170224.538"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "3fd0fad48cfdc978b3cbc2da56b26af0e33dd94c"; - sha256 = "09mqkqdp615c689qz71q94ynyysiz4qc280cvznp6k4w28nskbwf"; + rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55"; + sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -55815,12 +55995,12 @@ quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20170129.650"; + version = "20170222.1715"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "572869b70f8987306f4d938badf37bbf5c08b518"; - sha256 = "0zw3hyydqs616r96snns5mwxcn2il5hldiy8jpbyqh32mlam8w8f"; + rev = "55bbe5d54b80206ea5a60bf2f58eb6368b2c8201"; + sha256 = "1skbd5q99d9rwfi954r9p7b7nhwcfijq30z0fpdhbi1iiabf7vqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; @@ -55899,12 +56079,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170203.1014"; + version = "20170226.1906"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "d010a865355e9014f1a897de587cacbb6cf23aa4"; - sha256 = "1n15vnq21kym4ani61pf35a80kmp3i17hfn1dj7ayx5q2ifi0qi7"; + rev = "c50cd48edc74348bd89b09661ea325dac12fcb48"; + sha256 = "1vxplnnp751lp4nm2vqdysr9b1ksqykrn6l02dn2priyy5hh29k4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -57161,8 +57341,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "relative-buffers"; - rev = "88c24259ed62b85adff6850e34bbbe844caddccf"; - sha256 = "0100maanb1v0hl4pj8ykzlqpr3cvs6ldak5japndm5yngzp6m8ks"; + rev = "2547475084244d266b507e563c9b4034705cfeca"; + sha256 = "16m4qyjg0ca1j944ra1qhhg9ks3sk0rv5ax59rqga20l8wf6k0jq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab22cea99fbee937bbd6e8fbc8bd27967aeaa8a5/recipes/relative-buffers"; @@ -57283,12 +57463,12 @@ replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-from-region"; - version = "20161203.1306"; + version = "20170227.1516"; src = fetchFromGitHub { owner = "rubikitch"; repo = "replace-from-region"; - rev = "959ab7b2e2f19f3b559fd1228597530ce0694d7c"; - sha256 = "0xmslc7r0lsi7566ajrr9sqvzmfp7qjgfg13pf6n63rb3rsk72ny"; + rev = "dc9318b9b2822da7b00ecc34d1dc965c8f96c9bb"; + sha256 = "05l0wn1gqw2sbl65s1m7afmg3b1ps2qgqqrjkl9r2i26p95kqlq3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/replace-from-region"; @@ -57511,12 +57691,12 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20161108.2239"; + version = "20170220.2245"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "dc28874f47fe47e6891803fd3a483f9577b65ee9"; - sha256 = "029y18bzk9ld2ig9666idsrig1wmnswavcj8rilxw5f8wkrh38wg"; + rev = "56f877fe86373df3eb048ac96d6deef7b9f60892"; + sha256 = "1v4yvkp4f3rg8gi01y1gsfn7sikx4c3w0gisc3kdb3rs9kf1p8dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -57929,8 +58109,8 @@ src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0"; - sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a"; + rev = "276be756cdf3cbaf23198e5f19ce7daa7bc2b6e8"; + sha256 = "0lhwkgk3n36kd6rzvnj6h5xcp5wwa4yczri0274a7ch5gz2jdhhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -58135,12 +58315,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20170125.732"; + version = "20170225.12"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "2096d8c7c98aeb19eeb028082d4c9374168971d1"; - sha256 = "1xlxpnhs9k2pch6abkgblr18j8k41wbzyn1k86jl3ka72vmv4wlm"; + rev = "159afaf630be5fb13b3b0762f4c42ae6699dd143"; + sha256 = "0pm0zzk7sdzvk3zwlqpkq5pg6p3kkny9a8104fpyszvd3f2ygsk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -58156,12 +58336,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170121.2345"; + version = "20170228.842"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "37eef2838ea78b7e457e7236af93cd1581a63492"; - sha256 = "097niszwri76g5sbwh4hnsv27wk1nfqd7gpx974rh1bwfk735jxg"; + rev = "3adf4a22eb4eeede241dd5a7389254f9c8a755fa"; + sha256 = "1g9h9d5x8pcm2m66dljwr4l6gqm013ll1fwy4yjhmy5mkmavn5hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -58222,7 +58402,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57668"; + rev = "57752"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -58302,7 +58482,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57668"; + rev = "57752"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -58844,12 +59024,12 @@ save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "save-visited-files"; - version = "20170215.1537"; + version = "20170228.2250"; src = fetchFromGitHub { owner = "nflath"; repo = "save-visited-files"; - rev = "fd5f53256a81e57f438f37a6088862d7555a8aaa"; - sha256 = "0vf1b3x7s4w0szvf9vkgj9dqivfvzgx3pwznvd9s1n7fxk70ghsn"; + rev = "33e8d223f622001f5792c52d8b36661e46b5834c"; + sha256 = "1lf03fhmgjz1pixfahdm3cbqs5vbp6bk4qgm2xkm51vzmp39hfim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f5979e2c2dbfc4e8e3b4d2881cf860c26f63db5/recipes/save-visited-files"; @@ -58932,8 +59112,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "56d73a422a61dae4bb18fc0c89b53647cfe90e81"; - sha256 = "1f8labhw1a224hmh71b1lv0i2m6ynga4lqwali83a0214hnksyh7"; + rev = "7d205e730d3f1d00058203111b0f016a2371879d"; + sha256 = "04l27yz2n88hmqifxpjl181wc13d39ybx31zb9xci0s7mvhkfkak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -59613,12 +59793,12 @@ selected = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selected"; - version = "20170217.1106"; + version = "20170222.34"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "selected.el"; - rev = "478dc7a8b04819f9a7ba809b3ee6080450e32bb4"; - sha256 = "0xr7vgm7yr86vrx75z4q3az7npn8n5ar4wr5w27m8cij0mvaw831"; + rev = "03edaeac90bc6000d263f03be3d889b4685e1bf7"; + sha256 = "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/selected"; @@ -59924,12 +60104,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "20160915.353"; + version = "20170225.346"; src = fetchFromGitHub { owner = "nuncostans"; repo = "sexy-monochrome-theme"; - rev = "87bea99be5fe4f2395bec1c6ee7f81794c3f6695"; - sha256 = "0gyh9kfj76wxajrbdi3q0cii9giyn2gbfdsgnrgvh1cv96cqbm6i"; + rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1"; + sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; @@ -60125,22 +60305,22 @@ license = lib.licenses.free; }; }) {}; - shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-pop"; - version = "20161127.623"; + version = "20170223.222"; src = fetchFromGitHub { owner = "kyagi"; repo = "shell-pop-el"; - rev = "788250f22a4e652407eef117f19d6f4b56d7f919"; - sha256 = "0dd4hxbw6q9fazdjqdlfvv2g7fggmfhfmmy9ncipy4v8yd2d74pn"; + rev = "9429e538121c2613177848dc97b73d08f6fb4a42"; + sha256 = "0zfbsg0vgkc9bpzm3mlkqz4gpjlai81c49g0m55zwkmvqshlsrch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop"; sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8"; name = "shell-pop"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/shell-pop"; license = lib.licenses.free; @@ -60316,11 +60496,11 @@ }) {}; shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20170203.647"; + version = "20170301.255"; src = fetchcvs { cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; module = "emacs-w3m"; - sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453"; + sha256 = "b861237e76035df9e806681dee0f58680d9e68e773cc5e3c65dd513e127f4240"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; @@ -61021,12 +61201,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170218.2336"; + version = "20170228.602"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "0927080970374a1f8591fa412ae2b3201f5a7d18"; - sha256 = "0zcchsanjggdlczl9wrq6lb809rsx0iwlnb5qn3aplp7178imrxb"; + rev = "3bd88ab8cb9d8deae4ad965156de87245538f29e"; + sha256 = "15d0g3d3nj7q7qadm0blfnhaagxzd20a6lhsy6wv788qvq4fcq4j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -61752,12 +61932,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170209.246"; + version = "20170227.318"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "290ce9f63b9fa07e1a7514ccb9abb6aaf98ab045"; - sha256 = "02cchakanr8zlvahdrrgm9rnqa49wqfvc4g90g7nwwqifdhr5njs"; + rev = "67b1a1dbdfd2285f8a04a50a0fb006978e21727c"; + sha256 = "121wa1capjhrssqp2vaaf359jjsm23si3m4shmsi7n1hdvdjirrw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -62108,12 +62288,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20161123.2130"; + version = "20170226.1852"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "e4a0916d3b60dc4b7e98db59a2c2e2db4bb71fea"; - sha256 = "1463949imwyg3kd4988fz38i472lppvphga0qinn27ddwkrf0v0s"; + rev = "6f2c034f1ec557c9e7e624cfd53e8ebb997376ab"; + sha256 = "0255lh2r73h84kks3h7pfr8242q86kb8qrv8sm6dwv9jcbjp094n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -62341,14 +62521,14 @@ pname = "soothe-theme"; version = "20141027.741"; src = fetchFromGitHub { - owner = "jasonm23"; + owner = "emacsfodder"; repo = "emacs-soothe-theme"; rev = "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b"; sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a63de796e73d255b89b7f311e4ad51645eeb39fc/recipes/soothe-theme"; - sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/soothe-theme"; + sha256 = "124akv3a4q4vrmprdcjmq7rq6x73mz4wqxvnlczglh9vjl39ndbk"; name = "soothe-theme"; }; packageRequires = [ emacs ]; @@ -62640,12 +62820,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170217.1753"; + version = "20170226.405"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "dbe5eb19a1b3267b87b59f7082b3a618df6024f2"; - sha256 = "03cgx82kpdl0g193wi38gb5k6y28dllrz6wln910555s3rymym29"; + rev = "c45aa258dcc7427082f1bb253964d82967c24072"; + sha256 = "1blpg7d8bkpgagxbqkb9sm0jcdrba7l1dmm0z2h1nlrx4n66p4vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -63281,12 +63461,12 @@ srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; - version = "20161130.2112"; + version = "20170223.540"; src = fetchFromGitHub { owner = "tuhdo"; repo = "semantic-refactor"; - rev = "8707d93ede4b45c6173641d3482b0d8ffbbeb860"; - sha256 = "1k4jsklaqmzg6lmrb1sgkwrqpl3qvycqxqdfc129vrg4gybhsavz"; + rev = "531753fdc24570a1341c169f36b9fa0d4c09ff42"; + sha256 = "1rn89sznfyzjn3gpk18h8qassc7d1cchk8b7lz7rhc9zrdl6qsha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor"; @@ -63640,8 +63820,8 @@ version = "20140213.348"; src = fetchgit { url = "git://repo.or.cz/stgit.git"; - rev = "0accbea79b9cae8dae68ff64d35fd342792c15dc"; - sha256 = "13ab7k0c5az712ph2a879da84mwijvb1mxzn59cv3xkriabndk4p"; + rev = "90d50ad4a78c06f99fbf185aeb3322d1502a016e"; + sha256 = "0gh15q04dl0cgnabxjr3sgzkm31m9ls3r0d9ha7vs710wiffpbqx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; @@ -64031,8 +64211,8 @@ src = fetchFromGitHub { owner = "zk-phi"; repo = "sublimity"; - rev = "02a477004b8807984b5f752fa225f1e7bb6f90ab"; - sha256 = "1dc3kkq931nwa7p26dgrdgqhi110h6ilmch00300gh0m0wx9031d"; + rev = "033c7c04e47e7666afd125a72467c3eb657732d9"; + sha256 = "073c4bbxkmq7cifzwn933qxkqvklcbg3gh9vm5hr3af9j7vpx2ac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity"; @@ -64339,13 +64519,13 @@ version = "20161109.1215"; src = fetchFromGitHub { owner = "TheSuspiciousWombat"; - repo = "suscolors-emacs"; + repo = "SusColors-emacs"; rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889"; sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/100c3244cfce8691240b11bc8a1d95ede3aae4fe/recipes/suscolors-theme"; - sha256 = "08sh20lmhqzpxb55nmqwsfv4xd6sjirh592in7s6vl52r3hl0jkh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme"; + sha256 = "0j8yfl3yglp9kfdpbmfj3jw7npc6nlqw48cchiczh4biry204lbw"; name = "suscolors-theme"; }; packageRequires = []; @@ -64501,12 +64681,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20170205.348"; + version = "20170224.1825"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "75cbae223fbf84d19e14a7f7734ded4f46078654"; - sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny"; + rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a"; + sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -64543,12 +64723,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170217.57"; + version = "20170225.356"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2"; - sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq"; + rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309"; + sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -64690,12 +64870,12 @@ symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; - version = "20160514.1904"; + version = "20170224.33"; src = fetchFromGitHub { owner = "zk-phi"; repo = "symon"; - rev = "7beeedd70dc37f5904c781fb697c8df056196ee9"; - sha256 = "1q7di9s8k710nx98wnqnbkkhdimrn0jf6z4xkm4c78l6s5idjwlz"; + rev = "8dd8b6df49b03cd7d31b85aedbe9dd08fb922335"; + sha256 = "1bbblz9qzc84h08010y48mjyciavl6lnxk2m19mwbc6b5y58vwpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0/recipes/symon"; @@ -65382,8 +65562,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "tco.el"; - rev = "722eef5591303f118c1e79be6993ef4c90de7b46"; - sha256 = "0vf29cgbc7wirj077hr2fvzps5vq3cr888ksa5il74xlz4vk1yb3"; + rev = "97529ed7a0939c51ce0084c0aa8b12b313654735"; + sha256 = "1s8lw38d43c06w6q88h1kf480zvxzjzxmb426zb9rral61m1f0dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca33f97f0394585c8ccb31cab0ee776d1655907c/recipes/tco"; @@ -65781,8 +65961,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "tern-django"; - rev = "b6a884609047ba49976d5bb6b150f17d3d956d5b"; - sha256 = "00nv6j18s6983raajfcrxfg5rfz68cgf88zrdp7fhf9l0iicim1q"; + rev = "46f2cd5e96bc804069f18455a828b8e4c5ec358a"; + sha256 = "0b1279i05qmk85zgdd1qy0r823ajg7fxzi62qlhd7l03wivlbkc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django"; @@ -66211,8 +66391,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "bc0082e02357de2f30b997188bdfa94d703331f4"; - sha256 = "02g4pl8vsrgzcc6p934lsq1qqxlmgck1dw387il17gwmbz467zb0"; + rev = "c89e172289129a0a700a20f11f4a157b7da789d2"; + sha256 = "1dmvi4919b5x3j22vxbpp4pyfmx7iz34xra0ai003dv2crb2qb2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -66268,12 +66448,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170220.157"; + version = "20170301.418"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "35686d79a2603693d855a55c56f9486b8af89b20"; - sha256 = "1srcrr9bzvngkp0hy5cbiv34gip55c3f4nzfi0l5l1jam96bczs8"; + rev = "624406228042ded6cf427a179eccbdb8ce1392d6"; + sha256 = "0xb7nxy8pkvc4p2wcps26hs04pv35qdizfc1bqv59527gqpixd57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -67000,8 +67180,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902"; - sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c"; + rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961"; + sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -67242,12 +67422,12 @@ trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "trr"; - version = "20160620.1505"; + version = "20170221.42"; src = fetchFromGitHub { owner = "kawabata"; repo = "emacs-trr"; - rev = "8c63eaae802066bdce9976fe195a445051f2dda9"; - sha256 = "0pcny9rfzvsn82n0ryhfpc9gn4jy1cg0nb467xcckgv6pcxzsf2g"; + rev = "83660d8343ef3367837354dc684dfdde2f95826a"; + sha256 = "0h12szq1cww3bpsk09m7d2bk9bfjxrmzlw9ccviwhnric40nh67k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56fa3c0b65e4e300f01804df7779ba6f1cb18cec/recipes/trr"; @@ -67284,12 +67464,12 @@ try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "try"; - version = "20160226.730"; + version = "20170226.805"; src = fetchFromGitHub { owner = "larstvei"; repo = "Try"; - rev = "f5a930105e81826682cd71ff3f23e5fcb5502e30"; - sha256 = "0gvwavsq9s4a75qz7xq9wl219fnzz085zjqpnrxxgmaqbi9m8l7a"; + rev = "271b0a362cadf44d0694628b9e213f54516ef913"; + sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try"; @@ -67387,12 +67567,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170212.139"; + version = "20170221.1141"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "0148e6d3c780e3914a5732fdd0201100394a2dbf"; - sha256 = "1wmfnjkmxf0z7hadzgmv1s3fpk49rc9h1vxkj2c8s2xpz8ymck42"; + rev = "f242fe45dc47aab8fe69392304ebc2c779c411e0"; + sha256 = "07lz7s7z913h0mvmjnvvg9m36pc5r9nrg1a6z2wxszbccjvkz95b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -67643,8 +67823,8 @@ src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "f72826e564dc9d7b60dd9df3c6337f33b02560bf"; - sha256 = "1mhsznkg7hnhb7ypbx0ljg3scawz6dsa5l2vaapb51akaf87a267"; + rev = "3b0ace2a710cbe0a47617a2e4650f593c7282385"; + sha256 = "15rghh1k657hiahaqb6isrxs1bwys220r0fzk7fxhv8jfbmb2a12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -67843,12 +68023,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170220.116"; + version = "20170227.23"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "b8a3c13978ba6d0043b263f8efe829bb87145e25"; - sha256 = "16v6m9q1hw7wkp9si43h4chjabygqpx90ds45lq9k0r3lx9vsmd6"; + rev = "c066af10ac41d2c459e113c5932ef6844193e7e5"; + sha256 = "0jlcyrmmrg5nchcr91lc6x0hl7wlip0nfyy9qbda4nalkv5xgphy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -68817,8 +68997,8 @@ src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "c32fe46ad8362b4d918e194cca5ef84dd09981bf"; - sha256 = "16xw159pydkqiki21axv3vhf56yqn8jgg9n97xws2swfkh4drafm"; + rev = "d243767ed4b1ac68515c9276f53cc3ea407456a3"; + sha256 = "1xg4jxz1nxsmfwdqwzz35mkvd3afa28dlxgd5rw19m0wqsb0miim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -68838,8 +69018,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; - rev = "4232676e93ca5ace8e51f6605bec223c3205beea"; - sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30"; + rev = "1f071902d4e2aea49e7e96a327e09712565cb39c"; + sha256 = "0qkb7wx1qaa85g0dwmkyh4r65fg1j441f0b4hgg7qjq1yxrlkkhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel"; @@ -69254,12 +69434,12 @@ visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-regexp"; - version = "20161017.1713"; + version = "20170228.1716"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp.el"; - rev = "4ab9426a831cf0620f49ba227fd10b9c71672274"; - sha256 = "0c8z1brxsxz175fd887nmpyclswv3yablkscfcjpc8f66a7k53qp"; + rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85"; + sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; @@ -69275,12 +69455,12 @@ visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }: melpaBuild { pname = "visual-regexp-steroids"; - version = "20160516.1238"; + version = "20170221.1853"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp-steroids.el"; - rev = "6fe4e504ae7a532d67aead6089d68bb2406e4c25"; - sha256 = "0bc44z8y1jmw7jlz785bisy36v08jichj53nwhmp2wjyv40xy321"; + rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e"; + sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids"; @@ -69437,6 +69617,27 @@ license = lib.licenses.free; }; }) {}; + vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "vue-html-mode"; + version = "20170225.2301"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "vue-html-mode"; + rev = "e9708b80a319af14266562d8bf920747e94f1cf8"; + sha256 = "073vygm04x4gf150ibarz2qxbl37k6jzd907ydbq8nyq6hm1z1wj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; + sha256 = "1f4pjfp4298jkvhacxygddg557hhyivgnm5x3yhjipfv6fjkgl2s"; + name = "vue-html-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/vue-html-mode"; + license = lib.licenses.free; + }; + }) {}; vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "vue-mode"; @@ -69497,11 +69698,11 @@ }) {}; w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20170203.647"; + version = "20170301.254"; src = fetchcvs { cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; module = "emacs-w3m"; - sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453"; + sha256 = "b861237e76035df9e806681dee0f58680d9e68e773cc5e3c65dd513e127f4240"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; @@ -69605,8 +69806,8 @@ src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; - rev = "490eed2ac5f3cc375bace345f1060583d166a385"; - sha256 = "06jqlvy2078fd8py59z5rraf2ymlkv6wizmw91vq63f87vpw71zg"; + rev = "c5c4f1279f48e7871407d0fca2409512f427107e"; + sha256 = "0xzwflvj0mq0h9qr62aq473jz71jggnq2dlf1x2vy0a7rh8qw445"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; @@ -69850,22 +70051,22 @@ license = lib.licenses.free; }; }) {}; - web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170219.1202"; + version = "20170225.1206"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "dafb6c0b4d6de9475ba2adfaa117157f881d880c"; - sha256 = "0bh9z3kd3y7f78hdgnrzwgggmkw807a175xabx66pjacqwm9laia"; + rev = "6e4d7e96f2a699c2df3056609584e586f4667b39"; + sha256 = "10iwzjc697niwj0sqvazpi779ipsncpmn2pfy58lgglriq88ss8r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i"; name = "web-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/web-mode"; license = lib.licenses.free; @@ -70400,8 +70601,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "0afc3a524ec4c900f7ac1291e37b4f7da19e9ae6"; - sha256 = "15rjaxzwq7wh6zmyh8nzkbr4c75z8qjlbhpi8yjmf9bik3srr14d"; + rev = "83bce5f49e49e526a66e528445f54889cd57dbb6"; + sha256 = "02dmmw20jqcx1ij2kj3aam9fhwqcb52sjhcx7k4faryzdbx6zvwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -70887,22 +71088,22 @@ license = lib.licenses.free; }; }) {}; - wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + wolfram-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wolfram-mode"; - version = "20140118.757"; + version = "20170221.120"; src = fetchFromGitHub { owner = "kawabata"; repo = "wolfram-mode"; - rev = "72cb36975816a9a7b677269e19b9ff431f597ed7"; - sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w"; + rev = "d27a0f23791abde2bdda22e50108b99f11c13ed7"; + sha256 = "0r82h3x1ggirgd0a03qr71pdcxgkc4s3307ggwy86j4asd308m79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/299fe35d0a5a11d20f0b917bc8f406bd0f011c93/recipes/wolfram-mode"; sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf"; name = "wolfram-mode"; }; - packageRequires = [ emacs ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/wolfram-mode"; license = lib.licenses.free; @@ -70995,12 +71196,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20170211.402"; + version = "20170225.405"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "cba75ae94e6c233f92fcdde005d023107495df7b"; - sha256 = "1sxs89mqns9n847m0gqpv43b9gr15zicjhcnavk5n8g7gnssjmj4"; + rev = "d543680243046f5f62d36f9e56debcfe414ba40a"; + sha256 = "0hdd5yi6cnf7ry088wrq2xdm7f2hirhwrds56wvi0bdm9rizm6gs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -71121,12 +71322,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "20160830.616"; + version = "20170228.1521"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "425ab2bd4f37165a6cf85b58e0dec8105bd2bd35"; - sha256 = "0b6rr78aid7h006k77i6gm82par48l5d5w7xhhkbv109cdra1qlh"; + rev = "f853350da848d0814f822587ae310e52d895f523"; + sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -71415,12 +71616,12 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20170209.342"; + version = "20170227.1044"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "55e4e539f65e260418ead77c138bc2af2bdfa638"; - sha256 = "0b9q2y42v73c49l4s7z8qgsj02g2yvn2vbf4kv5m26k8x7547cja"; + rev = "4843663678db42827d12f2514f8ad4e2f4abcfb9"; + sha256 = "1hr4m5lrwhx1jf8zlwpx60w9528vq49j0q8kzydlsb895nivnn3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -71478,12 +71679,12 @@ xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20170111.652"; + version = "20170221.2112"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "fb1b37f482ae2082d0a26214b2160760324d3fce"; - sha256 = "1am9zyszav8mr1g60g7jdmxd1hnvm2p7zpdrzv3awmr92y3psn1i"; + rev = "b5bd1ff843063f6eba32ab71f33f0ebde57d5e41"; + sha256 = "1m5yd9kwsjy37f2czqhjpj5dkqf62pgj40a4ziy65mch4niw0slz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -71545,8 +71746,8 @@ src = fetchFromGitHub { owner = "nicklanasa"; repo = "xcode-mode"; - rev = "5b5f0a4f505d44840a4924b24e3ef73b8528d98b"; - sha256 = "0g2vc13rc9vk20m9l1a1rxkdsc099k33pya3z10sg9pa09a4a2a2"; + rev = "2ae4f512d6c601ea39d5ab785c2b5288eac24b59"; + sha256 = "0pi85ylxvjj63cmibgvi493d4ybcp2blhlwgrwzn2hjz31jldh0y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/845c731bed7dbe9c41c09e47e219299f17d0d489/recipes/xcode-mode"; @@ -71734,8 +71935,8 @@ src = fetchFromGitHub { owner = "xquery-mode"; repo = "xquery-mode"; - rev = "19e6f9553ce05380843582b879712de00679e4ab"; - sha256 = "0q04p75qkcbij7cqvhwnfx2729f1v4si05xjv433v7f6dfxxkhhl"; + rev = "1b655ccf83d02a7bd473d2cf02359ed60bdf7369"; + sha256 = "1iprgfjrbx3fmqhkgjxdxnlzz2s6h895q270lhjrhkwgpphgna2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ea1c9e26963f290d912df21b81afd689543658/recipes/xquery-mode"; @@ -72314,11 +72515,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170117.1449"; + version = "20170225.1836"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "8871fe9f563b"; - sha256 = "0bfhf0fhx8znq7xsqwms3n178qpxds93wcznj26k3ypqgwkkcx5x"; + rev = "bf2497be3ec5"; + sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -72376,12 +72577,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170114.445"; + version = "20170227.2341"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "386f6101fec6975000ad724f117816c01ab55f16"; - sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; + rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; + sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -72467,22 +72668,22 @@ license = lib.licenses.free; }; }) {}; - youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }: + youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup, pos-tip }: melpaBuild { pname = "youdao-dictionary"; - version = "20161017.829"; + version = "20170226.49"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "youdao-dictionary.el"; - rev = "30cf46170168f8fec95a5504861a4d9aad314883"; - sha256 = "06q0xdxl5wcm8pza42vc8k64fyms32x976mwiy2sl9qvvynfa2k3"; + rev = "44548f56a1c736e6a7fae4546657bff0a94bf3cb"; + sha256 = "1bazpqibydns36d4m6spvhk7vh6l4xz3w4d3jj78xrvcvi2z2rg2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary"; sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym"; name = "youdao-dictionary"; }; - packageRequires = [ chinese-word-at-point emacs names popup ]; + packageRequires = [ chinese-word-at-point emacs names popup pos-tip ]; meta = { homepage = "https://melpa.org/#/youdao-dictionary"; license = lib.licenses.free; @@ -73009,11 +73210,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170216.2206"; + version = "20170223.2227"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "50aeab07a53a"; - sha256 = "1qzxmnvhl39a4vzbdb9a3rh1mzkxdckvd1b3960py9xcnba23ikn"; + rev = "772da5ae125e"; + sha256 = "0zqa0jplra23hq6iv5538x7f24yfx8j8fzq5d4csr7hbndya4nqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -73029,12 +73230,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20170208.4"; + version = "20170223.1014"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "bf343665c9d97a5cb370572364865e42074af95c"; - sha256 = "1hpyymmg5mxrcmj0pngnj8fxyalfxzdqgpghk7lba2r35da05ph5"; + rev = "febc2d02373312ce69f56c9dbe54cabea3e0813c"; + sha256 = "0sj30f87gvxbqwi1k7xxqc1h0w7n53630d04csqayiwvc6a2z2sz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; @@ -73110,4 +73311,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } From 60d1915b616571ab6ca2652703bb4aca6eed9b5d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 1 Mar 2017 08:43:53 -0600 Subject: [PATCH 236/274] melpa-stable-packages: 2017-03-01 --- .../emacs-modes/melpa-stable-generated.nix | 394 ++++++++++++------ 1 file changed, 267 insertions(+), 127 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index b9d306d6a0a..b43f8822910 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -506,12 +506,12 @@ ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-octave"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "eb6463631a69dfd06fe750c1c155594d11de0590"; - sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf"; + rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c"; + sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; @@ -3586,12 +3586,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4"; - sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as"; + rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1"; + sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -3754,12 +3754,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9a4f3c9a554f99de0eb9e5f2b3e545b3e6390918"; - sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq"; + rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961"; + sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -4103,14 +4103,14 @@ pname = "clues-theme"; version = "1.0.1"; src = fetchFromGitHub { - owner = "jasonm23"; + owner = "emacsfodder"; repo = "emacs-clues-theme"; rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7"; sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme"; - sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme"; + sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr"; name = "clues-theme"; }; packageRequires = [ emacs ]; @@ -4731,12 +4731,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "2e24a088d660d0bf37585a664eddbbb6c4a8e20d"; - sha256 = "0k6bx4i3d2x6kmkzififc8r7vid74bxsvgxp19z7bv1fh6m1f3aa"; + rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81"; + sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -5346,12 +5346,12 @@ creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f"; - sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi"; + rev = "32fa3f4e461da92700523b1b20e7b28974c19a26"; + sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; @@ -6352,16 +6352,16 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "0.4"; + version = "0.5"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "bd10690402aa451e65cbadb192356386cd855abd"; - sha256 = "1millrv2rgiswnh9hrprqx2lmbi9h8fasgin5clhixafhmp9l6sf"; + rev = "dbace8d2250f84487d31b39050fcdc260fcde804"; + sha256 = "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; - sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon"; + sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1"; name = "dired-icon"; }; packageRequires = [ emacs ]; @@ -6755,6 +6755,27 @@ license = lib.licenses.free; }; }) {}; + dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dokuwiki-mode"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "kai2nenobu"; + repo = "emacs-dokuwiki-mode"; + rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1"; + sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode"; + sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v"; + name = "dokuwiki-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dokuwiki-mode"; + license = lib.licenses.free; + }; + }) {}; doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom"; @@ -7387,12 +7408,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "0.4.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "c6896c648fbc90f4d083f511353d6b165836d0e8"; - sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a"; + rev = "2a8988d845d5acf9d49d8177a68c3c8863916d25"; + sha256 = "19i746dyshcm2bih82n1m39sf18zx8gi1xaxc9q3pxm4hvn4s8mm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -7405,6 +7426,48 @@ license = lib.licenses.free; }; }) {}; + ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "ede-php-autoload-composer-installers"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "xendk"; + repo = "ede-php-autoload-composer-installers"; + rev = "f9942e07d0773444040084ac84652e69f0fd46d5"; + sha256 = "04gw8ma5c898ai7haxvdagmxx8zw9ncc9v0cv8a5ddg6arvzkl1z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers"; + sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268"; + name = "ede-php-autoload-composer-installers"; + }; + packageRequires = [ ede-php-autoload f s ]; + meta = { + homepage = "https://melpa.org/#/ede-php-autoload-composer-installers"; + license = lib.licenses.free; + }; + }) {}; + ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "ede-php-autoload-drupal"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "xendk"; + repo = "ede-php-autoload-drupal"; + rev = "6b62ffa7a69f52aab79067eaed80b2720f7e3fc2"; + sha256 = "001yhxngr6h7v1sjz0wskd5dv6fiby7m1mbc8vdz1h93150wzahp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal"; + sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964"; + name = "ede-php-autoload-drupal"; + }; + packageRequires = [ ede-php-autoload f s ]; + meta = { + homepage = "https://melpa.org/#/ede-php-autoload-drupal"; + license = lib.licenses.free; + }; + }) {}; edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; @@ -7471,12 +7534,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "442f23637ec50274c5e47c20827c946f51cfb8fb"; - sha256 = "1cwd2b72wm5rdbydv12qb64jz0a383j13vbzpy20z091ixkpmrj7"; + rev = "b86a4b3a696328faaa37a808abeed54561d19385"; + sha256 = "0ak5rw3y9cqggyclf9qddqrg9kzl50r5ynk9f99xjmsn2mpw6dwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -7763,12 +7826,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c"; - sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46"; + rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b"; + sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -8944,8 +9007,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "dbb74dd91c5a"; - sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj"; + rev = "2b93fb7103f5"; + sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -10532,6 +10595,27 @@ license = lib.licenses.free; }; }) {}; + faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faust-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "emacs-faust-mode"; + rev = "41379dd52a8be01cdfac06996ea1593877fdaf58"; + sha256 = "0q624nm9wfyg95wybi542bx8pdpqk9vibyb6b9fin4mw102nah9j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; + sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc"; + name = "faust-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/faust-mode"; + license = lib.licenses.free; + }; + }) {}; fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; @@ -12138,12 +12222,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "1bae400e5154d7494fd989b1be47450565810e23"; - sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2"; + rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94"; + sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -13929,12 +14013,12 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "e5a720d6aa173939c35cab836a31651b184c11e6"; - sha256 = "0pas60sib23vv1gkprp10jzksgchl5caqj565akg358a0iay7ax4"; + rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2"; + sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -14421,12 +14505,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.2.2"; + version = "0.3"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c"; - sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl"; + rev = "9cc6dba6ac9ede2855a1a95a22bc7353949f4362"; + sha256 = "0yyq2z3vsgib9r8paaj7ls4f8rwxmnhi5jsydzdmwqw1hrpkclv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -17530,14 +17614,14 @@ pname = "import-js"; version = "1.0.0"; src = fetchFromGitHub { - owner = "galooshi"; + owner = "Galooshi"; repo = "emacs-import-js"; rev = "15d395126f57408d770a72db2e5f43271f90fa52"; sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; - sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; + sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn"; name = "import-js"; }; packageRequires = [ emacs grizzl ]; @@ -18239,12 +18323,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.26"; + version = "0.28"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6"; - sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd"; + rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; + sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -19842,12 +19926,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.5.4"; + version = "0.7"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; - sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; + rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3"; + sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -20612,12 +20696,12 @@ math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "math-symbol-lists"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "vspinu"; repo = "math-symbol-lists"; - rev = "d11f74fef06d93637e28f32e16edfb5b0ccd064d"; - sha256 = "127q9xp015j28gjcna988dnrkadznn0xw8sdfvi943nhhqy4yvri"; + rev = "328f792599e4e298d164e3c6331a2426d82ebf64"; + sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists"; @@ -20759,12 +20843,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.6.2"; + version = "0.6.5"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "bcbd1701745c2dc0b161fdf428f3db3887dfa48a"; - sha256 = "1zs9b8ijwj7b61m3az4k5ch89siz4hy74adz9k4amaab9s6chzcf"; + rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8"; + sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -20826,8 +20910,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019"; - sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; + rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805"; + sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -22144,12 +22228,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.6"; + version = "1.11.7"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1fa2c86db50af806916d72e76f10bef39dd65e7d"; - sha256 = "1l4xfv38famawrxs6lg9k7gxghgmlgbpp2dbchnqln21d32b6a8h"; + rev = "13fe83dc8e28a32bdd454d04908fe1514ec50d51"; + sha256 = "1mddzphb0xbsa5ma83h3hmama77fvxxhwp5qbcrnwpihz1g1l5dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -22186,12 +22270,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "87fffa1973376bd1837fcf84277cd16db9c96957"; - sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573"; + rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b"; + sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -22267,11 +22351,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.23.5"; + version = "0.23.7"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "cff1e0673a7ca91d9b9907072c501a8bdcf0e3f8"; - sha256 = "1vxxksq4w6gl3wnh77jcpmjyph0x9r3ibqp9dvgmzxlwig495vfk"; + rev = "770d00a8955b2ad8be9daf2923e31221c4847043"; + sha256 = "1919kj6k8avkgji6r9ngd2a2qj8xpnjiwjx4brcvwrgkbryffq21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -23262,12 +23346,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "2.6.0"; + version = "2.6.3"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "0ff62665231df2be5d5bc84c4748c272664eeff3"; - sha256 = "0qn203bw0v7g8kmpkqp9vwh7m8cjjhklvwbhgmr8szaz1i1m9d0i"; + rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da"; + sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -23687,6 +23771,27 @@ license = lib.licenses.free; }; }) {}; + org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-table-sticky-header"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "org-table-sticky-header"; + rev = "1fca19fbccbb21159086970b82af56a81f78e247"; + sha256 = "1swhsspa5yz68hl2449l9hk1d6r9c32z19z4mrdxw4nimdxhxmqp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; + sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m"; + name = "org-table-sticky-header"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://melpa.org/#/org-table-sticky-header"; + license = lib.licenses.free; + }; + }) {}; org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; @@ -23834,29 +23939,22 @@ license = lib.licenses.free; }; }) {}; - org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: + org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: melpaBuild { pname = "org-trello"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; - rev = "dfb98150207b13c7771d0c0b8209e0503cd99cd6"; - sha256 = "1d2bi29m8kxhp46slg904frgmlc6ajqagxjrhxlbdmlxrp18s44g"; + rev = "32dd866e830836a72a3b96b96e0d00d044d0eaf7"; + sha256 = "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i"; name = "org-trello"; }; - packageRequires = [ - dash - dash-functional - deferred - emacs - request-deferred - s - ]; + packageRequires = [ dash dash-functional deferred request-deferred s ]; meta = { homepage = "https://melpa.org/#/org-trello"; license = lib.licenses.free; @@ -24408,22 +24506,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-utils"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "e37d38b3c94ac39443f0e449f4112b654b6a8fd1"; - sha256 = "1spdffw1pi4sp70w46v1njmzgjldcn9cir74imr23fw4n00hb4fa"; + rev = "e00df8a85fb3d0cfe9dde5a683d81e1a89570e29"; + sha256 = "14zcg9rc2nif8kv8pfmv9arbq0i8glviyvxgxr0lfiif2n4cfg9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = [ async ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -24805,21 +24903,21 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ dash, f, fetchgit, fetchurl, lib, melpaBuild, s }: + password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "password-store"; - version = "1.6.5"; + version = "1.7"; src = fetchgit { url = "http://git.zx2c4.com/password-store"; - rev = "1aac79d9617431bbaf218f9a9d270929762d2816"; - sha256 = "0zlhiqhx19dpmxvcczhif5c8acj911p61plsp0gdmamkpbxmkbjv"; + rev = "20081b546f371dcaee9ea2769f46e513bb39c275"; + sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss"; name = "password-store"; }; - packageRequires = [ dash f s ]; + packageRequires = [ f s ]; meta = { homepage = "https://melpa.org/#/password-store"; license = lib.licenses.free; @@ -25935,6 +26033,27 @@ license = lib.licenses.free; }; }) {}; + prassee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prassee-theme"; + version = "1.0"; + src = fetchFromGitHub { + owner = "prassee"; + repo = "prassee-emacs-theme"; + rev = "9850c806d39acffdef8e91e1a31b54a7620cbae3"; + sha256 = "1agghimrmh4kh71y51l6lzampjl15ac6jxrrhdviw95c3rxfll4x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; + sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs"; + name = "prassee-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/prassee-theme"; + license = lib.licenses.free; + }; + }) {}; pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-mode"; @@ -26690,6 +26809,27 @@ license = lib.licenses.free; }; }) {}; + python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "python-mode"; + version = "6.2.3"; + src = fetchFromGitLab { + owner = "python-mode-devs"; + repo = "python-mode"; + rev = "a0a534639bc6142c2c2f44bd7ca5878ad5f79518"; + sha256 = "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; + sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k"; + name = "python-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/python-mode"; + license = lib.licenses.free; + }; + }) {}; python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; @@ -26735,12 +26875,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "5c48de2419ddf10c00e38f5940ed97a84c43f1ce"; - sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z"; + rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55"; + sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -28602,12 +28742,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "1.5.2"; + version = "2.0"; src = fetchFromGitHub { owner = "nuncostans"; repo = "sexy-monochrome-theme"; - rev = "dd582a45a4e13891935ab68f030d8c2d755fa6a5"; - sha256 = "01jv7raxjyd37lipl05kl1892lz28ig292icik8l30y0p5gp8qgy"; + rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1"; + sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; @@ -29883,12 +30023,12 @@ speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speed-type"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "d9d98b9744e21d5e12a695096efcde288bdb5c18"; - sha256 = "043ydcik23ykphbh89haagxbdn11s1b44wkziwibnb7d3r9hd8p7"; + rev = "5d691f57743304db63b6afdc5bd79dabd282d390"; + sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; @@ -30615,12 +30755,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "75cbae223fbf84d19e14a7f7734ded4f46078654"; - sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny"; + rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a"; + sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -31621,12 +31761,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9a4f3c9a554f99de0eb9e5f2b3e545b3e6390918"; - sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq"; + rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961"; + sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -32551,12 +32691,12 @@ visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-regexp"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp.el"; - rev = "2cf4dc5a2dff0736eb2e2da95997d7274bbb5766"; - sha256 = "0zz83l97xkna2yqiiywxyhj2zwil2a0xqzdsdxw0ai951jql1j5r"; + rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85"; + sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; @@ -32572,12 +32712,12 @@ visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }: melpaBuild { pname = "visual-regexp-steroids"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp-steroids.el"; - rev = "6fe4e504ae7a532d67aead6089d68bb2406e4c25"; - sha256 = "0bc44z8y1jmw7jlz785bisy36v08jichj53nwhmp2wjyv40xy321"; + rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e"; + sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids"; @@ -32824,12 +32964,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "14"; + version = "14.1"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "9bd7a7ebcbe67ae8f14d585d04b93569fa496ec7"; - sha256 = "1cs9ldj2qckyynwxzvbd5fmniis6mhprdz1wvvvpjs900bbc843s"; + rev = "44de4e0198051b52110d50d860db26ed770219f3"; + sha256 = "0pbim6aw0w9z5bb0hl98bda1a19pjmfki6jr1mxcfi5yismk2863"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -33516,12 +33656,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "3.5"; + version = "3.6.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "2e15db8e26a05618da7a1f97e19ff68f7359e8f6"; - sha256 = "1695vr25jr6m6fqjxyjns8vcbfixgjpkpqj1lk9k75k8n38x4ibw"; + rev = "f853350da848d0814f822587ae310e52d895f523"; + sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -33980,8 +34120,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "8871fe9f563b"; - sha256 = "0bfhf0fhx8znq7xsqwms3n178qpxds93wcznj26k3ypqgwkkcx5x"; + rev = "bf2497be3ec5"; + sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -34112,12 +34252,12 @@ youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }: melpaBuild { pname = "youdao-dictionary"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "youdao-dictionary.el"; - rev = "5b4f716ca41fa0cdb18a4949ac5cdcd470182c57"; - sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr"; + rev = "a6e44e4fb93cc1b9f1067f10cf854b0bfc3fe732"; + sha256 = "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary"; @@ -34340,4 +34480,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } From 5ce06263a35da4b99589227f3553093d381c24c9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 2 Mar 2017 08:25:35 -0500 Subject: [PATCH 237/274] kdeFrameworks.kio: patch for insecure URL passing --- .../libraries/kde-frameworks/kio/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index cb67c845903..1d37c794674 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -4,7 +4,7 @@ , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet , kwidgetsaddons, kwindowsystem, kxmlgui -, qtscript, qtx11extras, solid +, qtscript, qtx11extras, solid, fetchpatch }: kdeFramework { @@ -17,5 +17,12 @@ kdeFramework { ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript qtx11extras ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)) + ++ [ + (fetchpatch { + name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch"; + url = "https://cgit.kde.org/kio.git/patch/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4"; + sha256 = "1s6rcp8rrlhc6rgy3b303y0qq0s8371n12r5lk9zbkw14wjvbix0"; + }) + ]; } From 7abda54bbbe9e43fe3ed4712d875701837e31d3f Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 2 Mar 2017 08:34:17 -0500 Subject: [PATCH 238/274] kdeApplications.kdelibs: patch for insecure URL passing --- pkgs/applications/kde/kdelibs/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix index 0292b51a48d..e7b7b0a0ec4 100644 --- a/pkgs/applications/kde/kdelibs/default.nix +++ b/pkgs/applications/kde/kdelibs/default.nix @@ -3,7 +3,7 @@ automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info, attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase, libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4, - shared_desktop_ontologies, soprano, strigi, udev, xz, pcre + shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch }: kdeApp { @@ -28,6 +28,11 @@ kdeApp { ./0001-old-kde4-cmake-policies.patch ./0002-polkit-install-path.patch ./0003-remove_xdg_impurities.patch + (fetchpatch { + name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch"; + url = "https://cgit.kde.org/kdelibs.git/patch/?id=1804c2fde7bf4e432c6cf5bb8cce5701c7010559"; + sha256 = "1y9951wgx35yf24i6gjz219fhspyqri1jvbw4fybd8nwwjb6ciz1"; + }) ]; # cmake does not detect path to `ilmbase` From 441ad3a8048b5e380bed6d82e776f34991de034a Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 13:45:13 -0600 Subject: [PATCH 239/274] amtterm: 1.4 -> 1.6-1 --- pkgs/tools/system/amtterm/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 3fe85be35f7..222cbde19e3 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -1,15 +1,16 @@ { fetchurl, stdenv, makeWrapper, perl, perlPackages }: -let version = "1.4"; in -stdenv.mkDerivation { - name = "amtterm-"+version; +stdenv.mkDerivation rec { + name = "amtterm-${version}"; + version = "1.6-1"; + buildInputs = with perlPackages; [ perl SOAPLite ]; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { - url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-a75e48e010e92dc5540e2142efc445ccb0ab1a42.tar.gz"; - sha256 = "0i4ny5dyf3fy3sd65zw9v4xxw3rc3qyn8r8y8gwwgankj6iqkqp4"; + url = "https://www.kraxel.org/cgit/amtterm/snapshot/${name}.tar.gz"; + sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc"; }; makeFlags = [ "prefix=$(out)" ]; From 7f31a8e359b1a9a4a325e043ab41278f34331072 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 2 Mar 2017 15:52:17 +0100 Subject: [PATCH 240/274] cryptodev: mark as broken for kernels >4.4 All builds for kernels above 4.4 fail; there is no newer upstream version. --- pkgs/os-specific/linux/cryptodev/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index f3c26223122..46b5fcb0bf9 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -19,5 +19,7 @@ stdenv.mkDerivation rec { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = http://home.gna.org/cryptodev-linux/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + broken = !stdenv.lib.versionOlder kernel.version "4.9"; }; } From 499f813ae8eba9fc8909a4aafa6b861e740d9181 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 2 Mar 2017 16:10:23 +0100 Subject: [PATCH 241/274] nvidiabl: 0.85 -> 0.87 --- pkgs/os-specific/linux/nvidiabl/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index 881c29c1ce0..1c1ea1d11d8 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchFromGitHub, kernel }: -stdenv.mkDerivation { - name = "nvidiabl-0.85-${kernel.version}"; +stdenv.mkDerivation rec { + name = "nvidiabl-${version}-${kernel.version}"; + version = "0.87"; - src = fetchurl { - url = "https://github.com/guillaumezin/nvidiabl/archive/v0.85.tar.gz"; - sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj"; + src = fetchFromGitHub { + owner = "guillaumezin"; + repo = "nvidiabl"; + rev = "v${version}"; + sha256 = "1hs61dxn84vsyvrd2s899dhgg342mhfkbdn1nkhcvly45hdp2nca"; }; hardeningDisable = [ "pic" ]; From c5785dc3eb7c11f1aecb786834d6de9ca77de568 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 2 Mar 2017 16:10:57 +0100 Subject: [PATCH 242/274] nvidiabl: mark as broken on kernels >4.4 All builds on kernels >4.4 fail. --- pkgs/os-specific/linux/nvidiabl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index 1c1ea1d11d8..6f9af040b8a 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -29,5 +29,7 @@ stdenv.mkDerivation rec { description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU"; homepage = https://github.com/guillaumezin/nvidiabl; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + broken = !stdenv.lib.versionOlder kernel.version "4.9"; }; } From 1b9875220fd8785d8c059c39e3ea2cc35c303b5d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 2 Mar 2017 16:35:33 +0100 Subject: [PATCH 243/274] gitfs: 0.2.5 -> 0.4.5.1 --- pkgs/tools/filesystems/gitfs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index bb652c28580..ec734e52f73 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "gitfs-0.2.5"; + name = "gitfs-${version}"; + version = "0.4.5.1"; src = fetchFromGitHub { owner = "PressLabs"; repo = "gitfs"; - rev = "495c6c52ec3573294ba7b8426ed794eb466cbb82"; - sha256 = "04yh6b5ivbviqy5k2768ag75cd5kr8k70ar0d801yvc8hnijvphk"; + rev = version; + sha256 = "1s9ml2ryqxvzzq9mxa9y3xmzr742qxcpw9kzzbr7vm3bxgkyi074"; }; patchPhase = '' @@ -18,9 +19,8 @@ python2Packages.buildPythonApplication rec { buildInputs = with python2Packages; [ pytest pytestcov mock ]; propagatedBuildInputs = with python2Packages; [ atomiclong fusepy pygit2 ]; - checkPhase = '' - py.test - ''; + checkPhase = "py.test"; + doCheck = false; meta = { description = "A FUSE filesystem that fully integrates with git"; From 98523861f67992a603e503c19b9642253fd7bfca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Mar 2017 16:37:48 +0100 Subject: [PATCH 244/274] highlight: disable darwin build https://hydra.nixos.org/build/49668465/nixlog/1 --- pkgs/tools/text/highlight/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 3d8bfbf03f8..6f2a2df82f8 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code highlighting tool"; homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = maintainers.ndowens; }; } From 75e85cae42f4ae2f8ffd237009701aeb45da1dcf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 13 Nov 2016 16:20:29 +0100 Subject: [PATCH 245/274] linux: enable FOU tunnels and VRF interfaces --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 40c49509fd0..189560c28ac 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -129,6 +129,7 @@ with stdenv.lib; IPV6_MROUTE y IPV6_MROUTE_MULTIPLE_TABLES y IPV6_PIMSM_V2 y + IPV6_FOU_TUNNEL m CLS_U32_PERF y CLS_U32_MARK y ${optionalString (stdenv.system == "x86_64-linux") '' @@ -143,6 +144,8 @@ with stdenv.lib; L2TP_ETH m BRIDGE_VLAN_FILTERING y BONDING m + NET_L3_MASTER_DEV y + NET_FOU_IP_TUNNELS y # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build From 49bdf9803a9c481948e980e5b11db86bb23ddc4c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Nov 2016 07:48:44 +0100 Subject: [PATCH 246/274] linux: IPV6_FOU_TUNNEL is available since 4.7 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 189560c28ac..9b0cd003072 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -129,7 +129,9 @@ with stdenv.lib; IPV6_MROUTE y IPV6_MROUTE_MULTIPLE_TABLES y IPV6_PIMSM_V2 y - IPV6_FOU_TUNNEL m + ${optionalString (versionAtLeast version "4.7") '' + IPV6_FOU_TUNNEL m + ''} CLS_U32_PERF y CLS_U32_MARK y ${optionalString (stdenv.system == "x86_64-linux") '' From 7d356ff69646e78c5f9a362ff8b5912fa9ecec7c Mon Sep 17 00:00:00 2001 From: 3noch Date: Sat, 25 Feb 2017 17:44:04 -0500 Subject: [PATCH 247/274] Disable large address space in GHC iOS X compiler Original: https://github.com/NixOS/nixpkgs-channels/commit/17cea33d1aa55fdc8beff1001882efa7cc142da1 --- pkgs/development/compilers/ghc/head.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0ca8e8c299e..3ae7d9c61e4 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils , autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform , selfPkgs, cross ? null @@ -105,7 +105,7 @@ in stdenv.mkDerivation (rec { "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib" "--target=${cross.config}" "--enable-bootstrap-with-devel-snapshot" - ]; + ] ++ (lib.optional ("${cross.config}" == "aarch64-apple-darwin14") "--disable-large-address-space"); buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; From 4b77d425aa5970f39f0637894075d2df8c1575c8 Mon Sep 17 00:00:00 2001 From: 3noch Date: Sat, 25 Feb 2017 17:45:40 -0500 Subject: [PATCH 248/274] Fix GHCJS HEAD patch; support GHCJS libdir link; use full ghcEnv for GHCJS Original: https://github.com/NixOS/nixpkgs-channels/commit/f3110651c81cc3fd4f6d342f0c30d363ea8cd0b0 (With some tweaks from @cstrahan) closes #23199 --- pkgs/development/compilers/ghc/8.0.2.nix | 7 +++++-- pkgs/development/compilers/ghc/head.nix | 4 +++- pkgs/development/compilers/ghcjs/base.nix | 10 ++++++++- .../haskell-modules/generic-builder.nix | 4 +++- .../haskell-modules/with-packages-wrapper.nix | 21 ++++++++++--------- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 5f687aca63a..605458e7185 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils , hscolour, patchutils, sphinx # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. , enableIntegerSimple ? false, gmp +, cross ? null }: let @@ -44,7 +45,9 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ]; + ] ++ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 3ae7d9c61e4..ed6f4717446 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -105,7 +105,9 @@ in stdenv.mkDerivation (rec { "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib" "--target=${cross.config}" "--enable-bootstrap-with-devel-snapshot" - ] ++ (lib.optional ("${cross.config}" == "aarch64-apple-darwin14") "--disable-large-address-space"); + ] ++ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 5ffc6e2720e..ac9419d662e 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -1,4 +1,5 @@ { mkDerivation +, lib , broken ? false , test-framework , test-framework-hunit @@ -94,6 +95,11 @@ ] , stage2 ? import ./stage2.nix + +, patches ? [ ./ghcjs.patch ] + +# used for resolving compiler plugins +, ghcLibdir ? null }: let inherit (bootPkgs) ghc; @@ -122,7 +128,7 @@ in mkDerivation (rec { testDepends = [ HUnit test-framework test-framework-hunit ]; - patches = [ ./ghcjs.patch ]; + inherit patches; postPatch = '' substituteInPlace Setup.hs \ --replace "/usr/bin/env" "${coreutils}/bin/env" @@ -165,6 +171,8 @@ in mkDerivation (rec { --with-cabal ${cabal-install}/bin/cabal \ --with-gmp-includes ${gmp.dev}/include \ --with-gmp-libraries ${gmp.out}/lib + '' + lib.optionalString (ghcLibdir != null) '' + printf '%s' '${ghcLibdir}' > "$out/lib/ghcjs-${version}/ghc_libdir" ''; passthru = { inherit bootPkgs; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 42ea03693ec..e47375e71c7 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -193,11 +193,13 @@ stdenv.mkDerivation ({ ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + postPatch; + # for ghcjs, we want to put ghcEnv on PATH so compiler plugins will be available. + # TODO(cstrahan): would the same be of benefit to native ghc? setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment echo "Build with ${ghc}." - export PATH="${ghc}/bin:$PATH" + export PATH="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index c49b81762e7..e04cbe08c2c 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,9 +1,12 @@ -{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper +{ stdenv, lib, ghc, llvmPackages, packages, symlinkJoin, makeWrapper , ignoreCollisions ? false, withLLVM ? false , postBuild ? "" , haskellPackages +, ghcLibdir ? null # only used by ghcjs, when resolving plugins }: +assert ghcLibdir != null -> (ghc.isGhcjs or false); + # This wrapper works only with GHC 6.12 or later. assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; @@ -48,7 +51,7 @@ let ++ lib.optional stdenv.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else -buildEnv { +symlinkJoin { # this makes computing paths from the name attribute impossible; # if such a feature is needed, the real compiler name should be saved # as a dedicated drv attribute, like `compiler-name` @@ -59,14 +62,6 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook - # Work around buildEnv sometimes deciding to make bin a symlink - if test -L "$out/bin"; then - binTarget="$(readlink -f "$out/bin")" - rm "$out/bin" - cp -r "$binTarget" "$out/bin" - chmod u+w "$out/bin" - fi - # wrap compiler executables with correct env variables for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do @@ -102,6 +97,12 @@ buildEnv { done ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + ${# ghcjs will read the ghc_libdir file when resolving plugins. + lib.optionalString (isGhcjs && ghcLibdir != null) '' + mkdir -p "${libDir}" + rm -f "${libDir}/ghc_libdir" + printf '%s' '${ghcLibdir}' > "${libDir}/ghc_libdir" + ''} $out/bin/${ghcCommand}-pkg check '' + postBuild; passthru = { From b0ae3c14fbdd6a85b31d58fe4bc977551446ddb5 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 2 Mar 2017 19:20:26 +0100 Subject: [PATCH 249/274] httping 2.5: fetch over https + license --- pkgs/tools/networking/httping/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 36627b4e7a4..ce58da880d6 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.5"; src = fetchurl { - url = "http://www.vanheusden.com/httping/${name}.tgz"; + url = "https://www.vanheusden.com/httping/${name}.tgz"; sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { the transmission across the network also takes time! So it measures the latency of the webserver + network. It supports IPv6. ''; + license = licenses.agpl3; maintainers = with maintainers; [ nckx rickynils ]; platforms = platforms.linux; }; From 53b059ade536f7e9b238abb4d68eaa5bee2c31f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Mar 2017 19:27:10 +0100 Subject: [PATCH 250/274] miniupnpc: switch to old version by default miniupnpc 2.0.20161216 change its api --- pkgs/tools/networking/miniupnpc/default.nix | 45 +++++++++++++-------- pkgs/top-level/all-packages.nix | 9 ++++- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 42fe2db7a4e..575bac3e9d1 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,23 +1,34 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "miniupnpc-${version}"; - version = "2.0.20161216"; +let + generic = { version, sha256 }: + stdenv.mkDerivation rec { + name = "miniupnpc-${version}"; + src = fetchurl { + name = "${name}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + inherit sha256; + }; - src = fetchurl { - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; + + doCheck = !stdenv.isFreeBSD; + + installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + + meta = { + homepage = http://miniupnp.free.fr/; + description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; + platforms = with stdenv.lib.platforms; linux ++ freebsd; + }; + }; +in { + miniupnpc_2 = generic { + version = "2.0.20161216"; sha256 = "0gpxva9jkjvqwawff5y51r6bmsmdhixl3i5bmzlqsqpwsq449q81"; - }; - - patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; - - doCheck = !stdenv.isFreeBSD; - - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; - - meta = { - homepage = http://miniupnp.free.fr/; - description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; - platforms = with stdenv.lib.platforms; linux ++ freebsd; + }; + miniupnpc_1 = generic { + version = "1.9.20150430"; + sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5230fd8290..4f1968ebf40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2883,7 +2883,9 @@ with pkgs; minissdpd = callPackage ../tools/networking/minissdpd { }; - miniupnpc = callPackage ../tools/networking/miniupnpc { }; + inherit (callPackage ../tools/networking/miniupnpc { }) + miniupnpc_1 miniupnpc_2; + miniupnpc = miniupnpc_1; miniupnpd = callPackage ../tools/networking/miniupnpd { }; @@ -14932,7 +14934,10 @@ with pkgs; libtorrentRasterbar = libtorrentRasterbar_1_0; }; - eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; + eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { + lua5 = lua5_1; + miniupnpc = miniupnpc_1; + }; qemu = callPackage ../applications/virtualization/qemu { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa; From 86a0a1ecedcb851fbee4c0e26e453e6c17c5ab12 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 2 Mar 2017 21:41:25 +0300 Subject: [PATCH 251/274] haskellPackages.lambdabot-haskell-plugins: remove overrides --- .../haskell-modules/configuration-common.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0c62c187ac0..db9a8d57398 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -700,20 +700,6 @@ self: super: { # The latest Hoogle needs versions not yet in LTS Haskell 7.x. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; - # To be in sync with Hoogle. - lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: { - patches = [ - (pkgs.fetchpatch { - url = "https://github.com/lambdabot/lambdabot/commit/78a2361024724acb70bc1c12c42f3a16015bb373.patch"; - sha256 = "0aw0jpw07idkrg8pdn3y3qzhjfrxsvmx3plg51m1aqgbzs000yxf"; - stripLen = 2; - addPrefixes = true; - }) - ]; - - jailbreak = true; - })); - # Needs new version. haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; From 197236af88eb448ad4501175e1d0a0345b20db64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Mar 2017 12:22:20 +0100 Subject: [PATCH 252/274] hackage2nix: disable broken builds --- .../configuration-hackage2nix.yaml | 336 ++++++++++++++++++ 1 file changed, 336 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a30a2fd4463..47fb3f7f87f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2396,6 +2396,7 @@ dont-distribute-packages: AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] ActionKid: [ i686-linux, x86_64-linux, x86_64-darwin ] + activehs-base: [ i686-linux, x86_64-linux, x86_64-darwin ] activehs: [ i686-linux, x86_64-linux, x86_64-darwin ] activitystreams-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] actor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2405,9 +2406,11 @@ dont-distribute-packages: Adaptive: [ i686-linux, x86_64-linux, x86_64-darwin ] adaptive-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] adb: [ i686-linux, x86_64-linux, x86_64-darwin ] + adblock2privoxy: [ i686-linux, x86_64-linux, x86_64-darwin ] adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] adict: [ i686-linux, x86_64-linux, x86_64-darwin ] adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2424,8 +2427,10 @@ dont-distribute-packages: aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-filthy: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-flat: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-injector: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-quick: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2448,6 +2453,7 @@ dont-distribute-packages: AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] + alga: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2501,10 +2507,12 @@ dont-distribute-packages: android: [ i686-linux, x86_64-linux, x86_64-darwin ] android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ] AndroidViewHierarchyImporter: [ i686-linux, x86_64-linux, x86_64-darwin ] + angel: [ i686-linux, x86_64-linux, x86_64-darwin ] angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] annah: [ i686-linux, x86_64-linux, x86_64-darwin ] Annotations: [ i686-linux, x86_64-linux, x86_64-darwin ] + anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2529,6 +2537,7 @@ dont-distribute-packages: apiary-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-session: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] + api-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] apis: [ i686-linux, x86_64-linux, x86_64-darwin ] api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] apotiki: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2539,6 +2548,7 @@ dont-distribute-packages: applicative-fail: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] + applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2587,10 +2597,12 @@ dont-distribute-packages: aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] + attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2604,6 +2616,7 @@ dont-distribute-packages: audiovisual: [ i686-linux, x86_64-linux, x86_64-darwin ] augeas: [ i686-linux, x86_64-linux, x86_64-darwin ] augur: [ i686-linux, x86_64-linux, x86_64-darwin ] + aur-api: [ i686-linux, x86_64-linux, x86_64-darwin ] aur: [ i686-linux, x86_64-linux, x86_64-darwin ] Aurochs: [ i686-linux, x86_64-linux, x86_64-darwin ] authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2634,6 +2647,7 @@ dont-distribute-packages: aws-kinesis-reshard: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2687,6 +2701,7 @@ dont-distribute-packages: bed-and-breakfast: [ i686-linux, x86_64-linux, x86_64-darwin ] Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] bein: [ i686-linux, x86_64-linux, x86_64-darwin ] + bench: [ i686-linux, x86_64-linux, x86_64-darwin ] BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2709,6 +2724,7 @@ dont-distribute-packages: billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-pane: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-services: [ i686-linux, x86_64-linux, x86_64-darwin ] + bimaps: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-communicator: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2738,6 +2754,7 @@ dont-distribute-packages: bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sane: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2782,6 +2799,7 @@ dont-distribute-packages: bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitwise: [ i686-linux, x86_64-linux, x86_64-darwin ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] blacktip: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2793,6 +2811,7 @@ dont-distribute-packages: blas: [ i686-linux, x86_64-linux, x86_64-darwin ] blatex: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-builder-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2801,9 +2820,11 @@ dont-distribute-packages: blip: [ i686-linux, x86_64-linux, x86_64-darwin ] bliplib: [ i686-linux, x86_64-linux, x86_64-darwin ] Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ] + blockhash: [ i686-linux, x86_64-linux, x86_64-darwin ] blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] BlogLiterately-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ] + bloodhound-amazonka-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2820,8 +2841,10 @@ dont-distribute-packages: bond: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] + Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-list: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] + boomange: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] bot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2847,6 +2870,7 @@ dont-distribute-packages: buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] bugzilla: [ i686-linux, x86_64-linux, x86_64-darwin ] buildable: [ i686-linux, x86_64-linux, x86_64-darwin ] + buildbox: [ i686-linux, x86_64-linux, x86_64-darwin ] buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2873,7 +2897,10 @@ dont-distribute-packages: cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-bounds: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2887,6 +2914,7 @@ dont-distribute-packages: cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-progdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2894,7 +2922,9 @@ dont-distribute-packages: cabalrpmdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] CabalSearch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-test-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2902,6 +2932,7 @@ dont-distribute-packages: cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] + cake: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2913,6 +2944,7 @@ dont-distribute-packages: call: [ i686-linux, x86_64-linux, x86_64-darwin ] campfire: [ i686-linux, x86_64-linux, x86_64-darwin ] canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] + canteven-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2951,6 +2983,8 @@ dont-distribute-packages: categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] + cautious-file: [ i686-linux, x86_64-linux, x86_64-darwin ] cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2971,7 +3005,9 @@ dont-distribute-packages: cereal-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] + cereal-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + cereal-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] certificate: [ i686-linux, x86_64-linux, x86_64-darwin ] cf: [ i686-linux, x86_64-linux, x86_64-darwin ] cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2980,6 +3016,7 @@ dont-distribute-packages: cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] cg: [ i686-linux, x86_64-linux, x86_64-darwin ] cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + cgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2996,6 +3033,7 @@ dont-distribute-packages: Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] + chell-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3018,6 +3056,7 @@ dont-distribute-packages: cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cio: [ i686-linux, x86_64-linux, x86_64-darwin ] + circlehs: [ i686-linux, x86_64-linux, x86_64-darwin ] citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3045,6 +3084,7 @@ dont-distribute-packages: classy-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] + clay: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3060,6 +3100,7 @@ dont-distribute-packages: clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] cless: [ i686-linux, x86_64-linux, x86_64-darwin ] clevercss: [ i686-linux, x86_64-linux, x86_64-darwin ] + cli-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] clif: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3068,6 +3109,7 @@ dont-distribute-packages: clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] clist: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloben: [ i686-linux, x86_64-linux, x86_64-darwin ] clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3098,6 +3140,7 @@ dont-distribute-packages: codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] codeworld-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + codex: [ i686-linux, x86_64-linux, x86_64-darwin ] cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] coin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3127,13 +3170,17 @@ dont-distribute-packages: commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] + commutative: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + compact-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-automata: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-dags: [ i686-linux, x86_64-linux, x86_64-darwin ] + compdata: [ i686-linux, x86_64-linux, x86_64-darwin ] + compdata-param: [ i686-linux, x86_64-linux, x86_64-darwin ] compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] competition: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3180,6 +3227,7 @@ dont-distribute-packages: console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] + constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructible: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3259,6 +3307,8 @@ dont-distribute-packages: crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] crc: [ i686-linux, x86_64-linux, x86_64-darwin ] creatur: [ i686-linux, x86_64-linux, x86_64-darwin ] + credentials-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + credential-store: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain1-constrained: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain1: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3266,6 +3316,8 @@ dont-distribute-packages: cr: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-to-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + criu-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + criu-rpc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] crocodile: [ i686-linux, x86_64-linux, x86_64-darwin ] cron-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] cruncher-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3312,6 +3364,7 @@ dont-distribute-packages: d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] + damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3355,6 +3408,7 @@ dont-distribute-packages: data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3396,11 +3450,18 @@ dont-distribute-packages: dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-salt: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-simpl: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-source-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3429,6 +3490,7 @@ dont-distribute-packages: delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] delta-h: [ i686-linux, x86_64-linux, x86_64-darwin ] delta: [ i686-linux, x86_64-linux, x86_64-darwin ] + Delta-Lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] demarcate: [ i686-linux, x86_64-linux, x86_64-darwin ] denominate: [ i686-linux, x86_64-linux, x86_64-darwin ] dependent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3509,6 +3571,7 @@ dont-distribute-packages: DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] Dish: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] + distance-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3522,6 +3585,7 @@ dont-distribute-packages: distributed-process-simplelocalnet: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dixi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3530,10 +3594,12 @@ dont-distribute-packages: DMuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] DnaProteinAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] dnscache: [ i686-linux, x86_64-linux, x86_64-darwin ] + dnsrbl: [ i686-linux, x86_64-linux, x86_64-darwin ] dnssd: [ i686-linux, x86_64-linux, x86_64-darwin ] doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ] docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] + docker: [ i686-linux, x86_64-linux, x86_64-darwin ] doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3594,6 +3660,7 @@ dont-distribute-packages: dvi-processing: [ i686-linux, x86_64-linux, x86_64-darwin ] dwarfadt: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynamic-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-linker-template: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-mvector: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3606,12 +3673,14 @@ dont-distribute-packages: DysFRP-Craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] dywapitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] eager-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] + earclipper: [ i686-linux, x86_64-linux, x86_64-darwin ] easy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] easyjson: [ i686-linux, x86_64-linux, x86_64-darwin ] easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] ebeats: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] + ec2-unikernel: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3708,6 +3777,7 @@ dont-distribute-packages: eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] eventsource-geteventstore-store: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3719,6 +3789,7 @@ dont-distribute-packages: exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] execs: [ i686-linux, x86_64-linux, x86_64-darwin ] + exference: [ i686-linux, x86_64-linux, x86_64-darwin ] exhaustive: [ i686-linux, x86_64-linux, x86_64-darwin ] exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3744,7 +3815,9 @@ dont-distribute-packages: extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] + extended-reals: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + extensible-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3753,6 +3826,7 @@ dont-distribute-packages: Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] factual-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] + fadno-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] fake-type: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3767,6 +3841,7 @@ dont-distribute-packages: fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] + fb: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3806,6 +3881,7 @@ dont-distribute-packages: filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + filesystem-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] filtrable: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3832,6 +3908,7 @@ dont-distribute-packages: flac: [ i686-linux, x86_64-linux, x86_64-darwin ] flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] + flamingra: [ i686-linux, x86_64-linux, x86_64-darwin ] flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] flexible-time: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3844,6 +3921,7 @@ dont-distribute-packages: flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] + flow-er: [ i686-linux, x86_64-linux, x86_64-darwin ] flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3863,11 +3941,13 @@ dont-distribute-packages: foo: [ i686-linux, x86_64-linux, x86_64-darwin ] forbidden-fruit: [ i686-linux, x86_64-linux, x86_64-darwin ] fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] + forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] ForestStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ] FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] formal: [ i686-linux, x86_64-linux, x86_64-darwin ] format: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3912,6 +3992,7 @@ dont-distribute-packages: FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] + fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] friday: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3920,6 +4001,7 @@ dont-distribute-packages: fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] FTGL-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3953,10 +4035,12 @@ dont-distribute-packages: gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] + Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + gcodehs: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3993,8 +4077,10 @@ dont-distribute-packages: genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-time: [ i686-linux, x86_64-linux, x86_64-darwin ] GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4035,10 +4121,12 @@ dont-distribute-packages: ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] + Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4062,18 +4150,22 @@ dont-distribute-packages: git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-fmt: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-freq: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] github: [ i686-linux, x86_64-linux, x86_64-darwin ] github-release: [ i686-linux, x86_64-linux, x86_64-darwin ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] git-jump: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] git-mediate: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] git-object: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] git-sanity: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4093,6 +4185,7 @@ dont-distribute-packages: GLFW-task: [ i686-linux, x86_64-linux, x86_64-darwin ] glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] + gli: [ i686-linux, x86_64-linux, x86_64-darwin ] glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] gll: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4121,21 +4214,27 @@ dont-distribute-packages: gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] gnss-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] + gnuidn: [ i686-linux, x86_64-linux, x86_64-darwin ] goa: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-core: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-simulation: [ i686-linux, x86_64-linux, x86_64-darwin ] + goatee-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] goat: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-language: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-manufacturers: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-runtimeconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-slides: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4151,8 +4250,10 @@ dont-distribute-packages: GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] GotoT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] gpah: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4204,6 +4305,7 @@ dont-distribute-packages: greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] gremlin-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] + gridbounds: [ i686-linux, x86_64-linux, x86_64-darwin ] gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] grid: [ i686-linux, x86_64-linux, x86_64-darwin ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4227,6 +4329,7 @@ dont-distribute-packages: gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4256,6 +4359,7 @@ dont-distribute-packages: h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] habit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hablog: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4264,11 +4368,14 @@ dont-distribute-packages: hack2-interface-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-sparks: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-whatsnew: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4282,12 +4389,14 @@ dont-distribute-packages: hack-handler-kibro: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-simpleserver: [ i686-linux, x86_64-linux, x86_64-darwin ] HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-cleanpath: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-jsonp: [ i686-linux, x86_64-linux, x86_64-darwin ] hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] hactors: [ i686-linux, x86_64-linux, x86_64-darwin ] haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4323,6 +4432,7 @@ dont-distribute-packages: hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] + handa-gdata: [ i686-linux, x86_64-linux, x86_64-darwin ] handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] Hangman: [ i686-linux, x86_64-linux, x86_64-darwin ] hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4388,6 +4498,7 @@ dont-distribute-packages: hascat-system: [ i686-linux, x86_64-linux, x86_64-darwin ] Haschoo: [ i686-linux, x86_64-linux, x86_64-darwin ] HasGP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashable-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hashable-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4457,6 +4568,7 @@ dont-distribute-packages: haskellscrabble: [ i686-linux, x86_64-linux, x86_64-darwin ] haskellscript: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-prisms: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-src-exts-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4503,6 +4615,7 @@ dont-distribute-packages: HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasmin: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4530,6 +4643,7 @@ dont-distribute-packages: HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ] hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ] Hawk: [ i686-linux, x86_64-linux, x86_64-darwin ] + hax: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4541,6 +4655,7 @@ dont-distribute-packages: hayoo-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] Hayoo: [ i686-linux, x86_64-linux, x86_64-darwin ] hback: [ i686-linux, x86_64-linux, x86_64-darwin ] + hbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] hbb: [ i686-linux, x86_64-linux, x86_64-darwin ] hBDD-CMUBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] hBDD-CUDD: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4672,6 +4787,7 @@ dont-distribute-packages: hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeos: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgettext: [ i686-linux, x86_64-linux, x86_64-darwin ] hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4726,6 +4842,7 @@ dont-distribute-packages: HJScript: [ i686-linux, x86_64-linux, x86_64-darwin ] hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlatex: [ i686-linux, x86_64-linux, x86_64-darwin ] hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] hlcm: [ i686-linux, x86_64-linux, x86_64-darwin ] hleap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4744,6 +4861,7 @@ dont-distribute-packages: HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] HMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4756,6 +4874,7 @@ dont-distribute-packages: hmatrix-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-svdlibc: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4792,6 +4911,7 @@ dont-distribute-packages: Holumbus-Storage: [ i686-linux, x86_64-linux, x86_64-darwin ] homeomorphic: [ i686-linux, x86_64-linux, x86_64-darwin ] hommage: [ i686-linux, x86_64-linux, x86_64-darwin ] + homplexity: [ i686-linux, x86_64-linux, x86_64-darwin ] HongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] honi: [ i686-linux, x86_64-linux, x86_64-darwin ] hoobuddy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4813,6 +4933,7 @@ dont-distribute-packages: hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ] hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] + ho-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hothasktags: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4843,6 +4964,7 @@ dont-distribute-packages: hpqtypes-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hpqtypes: [ i686-linux, x86_64-linux, x86_64-darwin ] hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + hprotoc: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4851,6 +4973,7 @@ dont-distribute-packages: hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] + hreader-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4873,6 +4996,7 @@ dont-distribute-packages: hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4881,8 +5005,10 @@ dont-distribute-packages: hsc3-lisp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-rw: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4890,6 +5016,7 @@ dont-distribute-packages: hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] hscd: [ i686-linux, x86_64-linux, x86_64-darwin ] hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] + hscope: [ i686-linux, x86_64-linux, x86_64-darwin ] hScraper: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdif: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4947,6 +5074,7 @@ dont-distribute-packages: HsOpenSSL-x509-system: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoptions: [ i686-linux, x86_64-linux, x86_64-darwin ] HSoundFile: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsoz: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4955,6 +5083,7 @@ dont-distribute-packages: hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-jenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4971,6 +5100,7 @@ dont-distribute-packages: hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-demo-manic: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-notes: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4979,6 +5109,8 @@ dont-distribute-packages: hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hssqlppp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5001,11 +5133,13 @@ dont-distribute-packages: hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] hsyscall: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsyslog-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] hszephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] htar: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] hts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5021,6 +5155,7 @@ dont-distribute-packages: http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-pony: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5039,6 +5174,7 @@ dont-distribute-packages: hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] HulkImport: [ i686-linux, x86_64-linux, x86_64-darwin ] hums: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunch: [ i686-linux, x86_64-linux, x86_64-darwin ] HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] HUnit-Plus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5061,6 +5197,8 @@ dont-distribute-packages: hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-kafka-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5100,6 +5238,7 @@ dont-distribute-packages: hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyper-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperloglog: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperloglogplus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5178,6 +5317,7 @@ dont-distribute-packages: InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] infix: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] + influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5196,10 +5336,12 @@ dont-distribute-packages: intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + interlude-l: [ i686-linux, x86_64-linux, x86_64-darwin ] internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolation: [ i686-linux, x86_64-linux, x86_64-darwin ] + interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] intro: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5222,6 +5364,8 @@ dont-distribute-packages: iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] + ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + irc-core: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-dcc: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5281,6 +5425,7 @@ dont-distribute-packages: javav: [ i686-linux, x86_64-linux, x86_64-darwin ] Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] + Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] jni: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5305,6 +5450,7 @@ dont-distribute-packages: json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] json-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-autotype: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5364,6 +5510,7 @@ dont-distribute-packages: kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-environment-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5384,6 +5531,7 @@ dont-distribute-packages: keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] keysafe: [ i686-linux, x86_64-linux, x86_64-darwin ] keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] + keyvaluehash: [ i686-linux, x86_64-linux, x86_64-darwin ] keyword-args: [ i686-linux, x86_64-linux, x86_64-darwin ] khph: [ i686-linux, x86_64-linux, x86_64-darwin ] kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5417,7 +5565,9 @@ dont-distribute-packages: laika: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5448,6 +5598,7 @@ dont-distribute-packages: lambdaya-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] Lambdaya: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] + lame: [ i686-linux, x86_64-linux, x86_64-darwin ] lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] language-boogie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5460,6 +5611,7 @@ dont-distribute-packages: language-guess: [ i686-linux, x86_64-linux, x86_64-darwin ] language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] language-kort: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-lua2: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5481,6 +5633,7 @@ dont-distribute-packages: lat: [ i686-linux, x86_64-linux, x86_64-darwin ] LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5498,6 +5651,7 @@ dont-distribute-packages: learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] + legion-discovery-client: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] legion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5557,6 +5711,7 @@ dont-distribute-packages: libzfs: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] + lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] lighttpd-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] lighttpd-conf-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] lilypond: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5632,6 +5787,7 @@ dont-distribute-packages: located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] + lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5649,6 +5805,7 @@ dont-distribute-packages: log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] logsink: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanXiragan: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5675,6 +5832,7 @@ dont-distribute-packages: LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + ltext: [ i686-linux, x86_64-linux, x86_64-darwin ] ltiv1p1: [ i686-linux, x86_64-linux, x86_64-darwin ] ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5691,13 +5849,17 @@ dont-distribute-packages: lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] + lz4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] macbeth-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] machinecell: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + maclight: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5737,11 +5899,13 @@ dont-distribute-packages: manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] + map-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-pap: [ i686-linux, x86_64-linux, x86_64-darwin ] markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] + markup: [ i686-linux, x86_64-linux, x86_64-darwin ] markup-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5786,13 +5950,17 @@ dont-distribute-packages: mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mega-sdist: [ i686-linux, x86_64-linux, x86_64-darwin ] + mellon-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + mellon-gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-web: [ i686-linux, x86_64-linux, x86_64-darwin ] melody: [ i686-linux, x86_64-linux, x86_64-darwin ] memcached-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] memcached: [ i686-linux, x86_64-linux, x86_64-darwin ] + memis: [ i686-linux, x86_64-linux, x86_64-darwin ] memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ] messente: [ i686-linux, x86_64-linux, x86_64-darwin ] metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5814,6 +5982,7 @@ dont-distribute-packages: microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] + mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midair: [ i686-linux, x86_64-linux, x86_64-darwin ] midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5831,6 +6000,7 @@ dont-distribute-packages: miniforth: [ i686-linux, x86_64-linux, x86_64-darwin ] minilens: [ i686-linux, x86_64-linux, x86_64-darwin ] minimung: [ i686-linux, x86_64-linux, x86_64-darwin ] + minio-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] minions: [ i686-linux, x86_64-linux, x86_64-darwin ] minioperational: [ i686-linux, x86_64-linux, x86_64-darwin ] miniplex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5861,6 +6031,7 @@ dont-distribute-packages: modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] moesocks: [ i686-linux, x86_64-linux, x86_64-darwin ] + mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] mole: [ i686-linux, x86_64-linux, x86_64-darwin ] mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5896,6 +6067,7 @@ dont-distribute-packages: MonadStack: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-ste: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-st: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5907,6 +6079,7 @@ dont-distribute-packages: Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ] Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] mondo: [ i686-linux, x86_64-linux, x86_64-darwin ] + monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] money: [ i686-linux, x86_64-linux, x86_64-darwin ] mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5950,7 +6123,13 @@ dont-distribute-packages: mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] mtp: [ i686-linux, x86_64-linux, x86_64-darwin ] + MuCheck-Hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] + MuCheck-HUnit: [ i686-linux, x86_64-linux, x86_64-darwin ] + MuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + MuCheck-QuickCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + MuCheck-SmallCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] mudbath: [ i686-linux, x86_64-linux, x86_64-darwin ] + mud: [ i686-linux, x86_64-linux, x86_64-darwin ] mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5964,6 +6143,7 @@ dont-distribute-packages: multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec: [ i686-linux, x86_64-linux, x86_64-darwin ] multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + multistate: [ i686-linux, x86_64-linux, x86_64-darwin ] multivariant: [ i686-linux, x86_64-linux, x86_64-darwin ] Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] muon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5973,6 +6153,7 @@ dont-distribute-packages: musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] music-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] music-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-pitch: [ i686-linux, x86_64-linux, x86_64-darwin ] music-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] music-score: [ i686-linux, x86_64-linux, x86_64-darwin ] music-sibelius: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5983,8 +6164,12 @@ dont-distribute-packages: mustache: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] + mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] + mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + mxnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + mxnet-nnvm: [ i686-linux, x86_64-linux, x86_64-darwin ] myo: [ i686-linux, x86_64-linux, x86_64-darwin ] MyPrimes: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6016,6 +6201,7 @@ dont-distribute-packages: nanovg: [ i686-linux, x86_64-linux, x86_64-darwin ] nanq: [ i686-linux, x86_64-linux, x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] + native: [ i686-linux, x86_64-linux, x86_64-darwin ] nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] NaturalLanguageAlphabets: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6067,6 +6253,7 @@ dont-distribute-packages: network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] network-netpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-protocol-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] network-service: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6116,6 +6303,7 @@ dont-distribute-packages: NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] nonfree: [ i686-linux, x86_64-linux, x86_64-darwin ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] + normalization-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6130,7 +6318,9 @@ dont-distribute-packages: nullary: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] nullpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + number-length: [ i686-linux, x86_64-linux, x86_64-darwin ] NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] + NumberTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6167,9 +6357,12 @@ dont-distribute-packages: omega: [ i686-linux, x86_64-linux, x86_64-darwin ] Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] omnicodec: [ i686-linux, x86_64-linux, x86_64-darwin ] + omnifmt: [ i686-linux, x86_64-linux, x86_64-darwin ] on-a-horse: [ i686-linux, x86_64-linux, x86_64-darwin ] + onama: [ i686-linux, x86_64-linux, x86_64-darwin ] one-liner: [ i686-linux, x86_64-linux, x86_64-darwin ] oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] + OnRmt: [ i686-linux, x86_64-linux, x86_64-darwin ] onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6205,6 +6398,7 @@ dont-distribute-packages: open-witness: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] operational-alacarte: [ i686-linux, x86_64-linux, x86_64-darwin ] + opn: [ i686-linux, x86_64-linux, x86_64-darwin ] optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6220,12 +6414,14 @@ dont-distribute-packages: organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] + orgstat: [ i686-linux, x86_64-linux, x86_64-darwin ] origami: [ i686-linux, x86_64-linux, x86_64-darwin ] OrPatterns: [ i686-linux, x86_64-linux, x86_64-darwin ] osc: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] + oso2pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6241,8 +6437,11 @@ dont-distribute-packages: Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-include-code: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6260,6 +6459,7 @@ dont-distribute-packages: parco: [ i686-linux, x86_64-linux, x86_64-darwin ] parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6274,6 +6474,7 @@ dont-distribute-packages: partial: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-isomorphisms: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + partial-order: [ i686-linux, x86_64-linux, x86_64-darwin ] partly: [ i686-linux, x86_64-linux, x86_64-darwin ] passage: [ i686-linux, x86_64-linux, x86_64-darwin ] PasswordGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6288,6 +6489,7 @@ dont-distribute-packages: patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-adaptive-hoops: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + paypal-rest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] pbc4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] pb: [ i686-linux, x86_64-linux, x86_64-darwin ] PBKDF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6295,6 +6497,8 @@ dont-distribute-packages: PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] pcre-light-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + pdf-slave: [ i686-linux, x86_64-linux, x86_64-darwin ] + pdf-slave-template: [ i686-linux, x86_64-linux, x86_64-darwin ] pdfsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6330,6 +6534,7 @@ dont-distribute-packages: persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + persona: [ i686-linux, x86_64-linux, x86_64-darwin ] persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] pesca: [ i686-linux, x86_64-linux, x86_64-darwin ] peyotls-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6360,6 +6565,7 @@ dont-distribute-packages: Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6370,8 +6576,11 @@ dont-distribute-packages: pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-illumina: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-io: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6379,7 +6588,9 @@ dont-distribute-packages: pipes-rt: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-shell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6405,6 +6616,7 @@ dont-distribute-packages: pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] pocket-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] + pocket: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6445,6 +6657,7 @@ dont-distribute-packages: postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-simple-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6452,8 +6665,10 @@ dont-distribute-packages: postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] postmaster: [ i686-linux, x86_64-linux, x86_64-darwin ] potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] + potrace-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] powermate: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6461,6 +6676,7 @@ dont-distribute-packages: pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] + praglude: [ i686-linux, x86_64-linux, x86_64-darwin ] preamble: [ i686-linux, x86_64-linux, x86_64-darwin ] precis: [ i686-linux, x86_64-linux, x86_64-darwin ] prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6477,6 +6693,7 @@ dont-distribute-packages: presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-error: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6498,6 +6715,7 @@ dont-distribute-packages: procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] + prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] progress: [ i686-linux, x86_64-linux, x86_64-darwin ] progression: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6541,9 +6759,12 @@ dont-distribute-packages: punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] + purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6579,6 +6800,7 @@ dont-distribute-packages: QuadTree: [ i686-linux, x86_64-linux, x86_64-darwin ] quantfin: [ i686-linux, x86_64-linux, x86_64-darwin ] quantum-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] + quantum-random: [ i686-linux, x86_64-linux, x86_64-darwin ] qudb: [ i686-linux, x86_64-linux, x86_64-darwin ] Quelea: [ i686-linux, x86_64-linux, x86_64-darwin ] quenya-verb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6586,6 +6808,7 @@ dont-distribute-packages: queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6593,7 +6816,9 @@ dont-distribute-packages: quickcheck-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-report: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-special: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-with-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6606,6 +6831,9 @@ dont-distribute-packages: quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] + quiver-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + quiver-groups: [ i686-linux, x86_64-linux, x86_64-darwin ] + quiver-http: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6623,6 +6851,7 @@ dont-distribute-packages: rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] + raml: [ i686-linux, x86_64-linux, x86_64-darwin ] randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] random-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6639,10 +6868,16 @@ dont-distribute-packages: Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-example-config: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-bufs: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-cmd: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-cursors: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-slate: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-status-bar: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-style: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-views: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6660,6 +6895,7 @@ dont-distribute-packages: reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6673,6 +6909,7 @@ dont-distribute-packages: react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ReadArgs: [ i686-linux, x86_64-linux, x86_64-darwin ] read-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] + read-io: [ i686-linux, x86_64-linux, x86_64-darwin ] readline-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] readme-lhs: [ i686-linux, x86_64-linux, x86_64-darwin ] readpyc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6687,6 +6924,8 @@ dont-distribute-packages: records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] + recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] + reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6710,6 +6949,7 @@ dont-distribute-packages: reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] refty: [ i686-linux, x86_64-linux, x86_64-darwin ] regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6755,12 +6995,14 @@ dont-distribute-packages: remote-json-client: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-json: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-json-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + remote-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-array: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-linear-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6795,7 +7037,9 @@ dont-distribute-packages: resumable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-client-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-model: [ i686-linux, x86_64-linux, x86_64-darwin ] + rethinkdb-wereHamster: [ i686-linux, x86_64-linux, x86_64-darwin ] retryer: [ i686-linux, x86_64-linux, x86_64-darwin ] + reverse-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] ReviewBoard: [ i686-linux, x86_64-linux, x86_64-darwin ] rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6826,6 +7070,7 @@ dont-distribute-packages: RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAlien: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAwolf: [ i686-linux, x86_64-linux, x86_64-darwin ] + rncryptor: [ i686-linux, x86_64-linux, x86_64-darwin ] robot: [ i686-linux, x86_64-linux, x86_64-darwin ] robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6835,6 +7080,7 @@ dont-distribute-packages: roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + rose-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6860,9 +7106,11 @@ dont-distribute-packages: rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + rts-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] ruff: [ i686-linux, x86_64-linux, x86_64-darwin ] + ruin: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6873,8 +7121,10 @@ dont-distribute-packages: safe-access: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] + safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-length: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6922,6 +7172,7 @@ dont-distribute-packages: scholdoc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants: [ i686-linux, x86_64-linux, x86_64-darwin ] + SciFlow: [ i686-linux, x86_64-linux, x86_64-darwin ] scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] scons2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6942,6 +7193,8 @@ dont-distribute-packages: scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6987,19 +7240,25 @@ dont-distribute-packages: servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-multipart: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7007,6 +7266,7 @@ dont-distribute-packages: servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7018,6 +7278,7 @@ dont-distribute-packages: sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] + sets: [ i686-linux, x86_64-linux, x86_64-darwin ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7027,6 +7288,7 @@ dont-distribute-packages: SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] sfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] + sfnt2woff: [ i686-linux, x86_64-linux, x86_64-darwin ] SFont: [ i686-linux, x86_64-linux, x86_64-darwin ] SGdemo: [ i686-linux, x86_64-linux, x86_64-darwin ] sgd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7054,6 +7316,7 @@ dont-distribute-packages: Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + shellmate: [ i686-linux, x86_64-linux, x86_64-darwin ] shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7095,8 +7358,10 @@ dont-distribute-packages: simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleServer: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-sql-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] simplessh: [ i686-linux, x86_64-linux, x86_64-darwin ] simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + SimpleTableGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7111,13 +7376,17 @@ dont-distribute-packages: skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] skell: [ i686-linux, x86_64-linux, x86_64-darwin ] skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ] + skylark-client: [ i686-linux, x86_64-linux, x86_64-darwin ] skylighting: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] slack-api: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] + slack-web: [ i686-linux, x86_64-linux, x86_64-darwin ] slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] + sloane: [ i686-linux, x86_64-linux, x86_64-darwin ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] + slot-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7189,6 +7458,7 @@ dont-distribute-packages: snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] snappy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + snappy-framing: [ i686-linux, x86_64-linux, x86_64-darwin ] snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7215,6 +7485,7 @@ dont-distribute-packages: socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] + socket-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] solga-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7285,17 +7556,23 @@ dont-distribute-packages: stable-marriage: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] starling: [ i686-linux, x86_64-linux, x86_64-darwin ] starrover2: [ i686-linux, x86_64-linux, x86_64-darwin ] + stash: [ i686-linux, x86_64-linux, x86_64-darwin ] Stasis: [ i686-linux, x86_64-linux, x86_64-darwin ] + state-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] state: [ i686-linux, x86_64-linux, x86_64-darwin ] + state-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7303,6 +7580,7 @@ dont-distribute-packages: statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] stats: [ i686-linux, x86_64-linux, x86_64-darwin ] + staversion: [ i686-linux, x86_64-linux, x86_64-darwin ] stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7349,10 +7627,12 @@ dont-distribute-packages: stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] structs: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] + structural-traversal: [ i686-linux, x86_64-linux, x86_64-darwin ] structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] + styx: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7371,6 +7651,7 @@ dont-distribute-packages: supero: [ i686-linux, x86_64-linux, x86_64-darwin ] super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] + supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7415,6 +7696,7 @@ dont-distribute-packages: sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] + system-locale: [ i686-linux, x86_64-linux, x86_64-darwin ] system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] systemstats: [ i686-linux, x86_64-linux, x86_64-darwin ] t3-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7425,6 +7707,7 @@ dont-distribute-packages: Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] table-tennis: [ i686-linux, x86_64-linux, x86_64-darwin ] + tablize: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7435,6 +7718,7 @@ dont-distribute-packages: tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] + Tahin: [ i686-linux, x86_64-linux, x86_64-darwin ] ta: [ i686-linux, x86_64-linux, x86_64-darwin ] tailfile-hinotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7471,6 +7755,7 @@ dont-distribute-packages: telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] + teleport: [ i686-linux, x86_64-linux, x86_64-darwin ] tellbot: [ i686-linux, x86_64-linux, x86_64-darwin ] template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7491,10 +7776,12 @@ dont-distribute-packages: terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] + TestExplode: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-skip: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-framework-th-prime: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7506,6 +7793,7 @@ dont-distribute-packages: test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7514,6 +7802,10 @@ dont-distribute-packages: text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-lips: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] textocat-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7548,6 +7840,7 @@ dont-distribute-packages: thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] threads-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + threepenny-gui-flexbox: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7659,6 +7952,7 @@ dont-distribute-packages: trhsx: [ i686-linux, x86_64-linux, x86_64-darwin ] triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + tries: [ i686-linux, x86_64-linux, x86_64-darwin ] trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ] tropical: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7671,6 +7965,7 @@ dont-distribute-packages: tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] + tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7681,6 +7976,7 @@ dont-distribute-packages: tweak: [ i686-linux, x86_64-linux, x86_64-darwin ] twee: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-rosetree: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7695,8 +7991,11 @@ dont-distribute-packages: twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7740,8 +8039,10 @@ dont-distribute-packages: uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] udbus: [ i686-linux, x86_64-linux, x86_64-darwin ] udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] + udp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] uhexdump: [ i686-linux, x86_64-linux, x86_64-darwin ] + uhttpc: [ i686-linux, x86_64-linux, x86_64-darwin ] ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] uid: [ i686-linux, x86_64-linux, x86_64-darwin ] UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7751,6 +8052,7 @@ dont-distribute-packages: unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] unicoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + unicode-show: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7771,6 +8073,7 @@ dont-distribute-packages: unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] unsequential: [ i686-linux, x86_64-linux, x86_64-darwin ] unused: [ i686-linux, x86_64-linux, x86_64-darwin ] + update-nix-fetchgit: [ i686-linux, x86_64-linux, x86_64-darwin ] up: [ i686-linux, x86_64-linux, x86_64-darwin ] uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] upskirt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7818,6 +8121,7 @@ dont-distribute-packages: variables: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7862,6 +8166,7 @@ dont-distribute-packages: vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] vte: [ i686-linux, x86_64-linux, x86_64-darwin ] + vty-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7884,6 +8189,7 @@ dont-distribute-packages: wai-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7934,6 +8240,7 @@ dont-distribute-packages: webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] + webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7943,6 +8250,7 @@ dont-distribute-packages: webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-page: [ i686-linux, x86_64-linux, x86_64-darwin ] web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7953,12 +8261,17 @@ dont-distribute-packages: websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] websockets-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] + wedged: [ i686-linux, x86_64-linux, x86_64-darwin ] + weighted: [ i686-linux, x86_64-linux, x86_64-darwin ] weighted-regexp: [ i686-linux, x86_64-linux, x86_64-darwin ] welshy: [ i686-linux, x86_64-linux, x86_64-darwin ] + werewolf: [ i686-linux, x86_64-linux, x86_64-darwin ] + werewolf-slack: [ i686-linux, x86_64-linux, x86_64-darwin ] Wheb: [ i686-linux, x86_64-linux, x86_64-darwin ] wheb-mongo: [ i686-linux, x86_64-linux, x86_64-darwin ] wheb-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wheb-strapped: [ i686-linux, x86_64-linux, x86_64-darwin ] + while-lang-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] whim: [ i686-linux, x86_64-linux, x86_64-darwin ] whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7987,11 +8300,13 @@ dont-distribute-packages: WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + workdays: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-windows: [ i686-linux, x86_64-linux, x86_64-darwin ] wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ] wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] + wreq-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] wright: [ i686-linux, x86_64-linux, x86_64-darwin ] writer-cps-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8057,12 +8372,16 @@ dont-distribute-packages: xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-to-json: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmonad-contrib-gpl: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmonad-vanessa: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmonad-wallpaper: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-windownames: [ i686-linux, x86_64-linux, x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8070,6 +8389,7 @@ dont-distribute-packages: xournal-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-render: [ i686-linux, x86_64-linux, x86_64-darwin ] + xpathdsv: [ i686-linux, x86_64-linux, x86_64-darwin ] xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8080,6 +8400,7 @@ dont-distribute-packages: yabi-muno: [ i686-linux, x86_64-linux, x86_64-darwin ] Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] YACPong: [ i686-linux, x86_64-linux, x86_64-darwin ] + yahoo-finance-api: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-finance-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8097,6 +8418,7 @@ dont-distribute-packages: YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ] yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] yap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] yarr-image-io: [ i686-linux, x86_64-linux, x86_64-darwin ] yate: [ i686-linux, x86_64-linux, x86_64-darwin ] yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8105,6 +8427,7 @@ dont-distribute-packages: yeshql: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8112,6 +8435,8 @@ dont-distribute-packages: yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-oauth: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8124,20 +8449,24 @@ dont-distribute-packages: yesod-csp: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-job-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginator: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-paypal-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8147,6 +8476,7 @@ dont-distribute-packages: yesod-session-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-tableview: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-test-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-text-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-vend: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8154,12 +8484,15 @@ dont-distribute-packages: yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-keymap-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-misc-modes: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-mode-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-mode-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8170,6 +8503,7 @@ dont-distribute-packages: yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] yql: [ i686-linux, x86_64-linux, x86_64-darwin ] + yst: [ i686-linux, x86_64-linux, x86_64-darwin ] yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8199,5 +8533,7 @@ dont-distribute-packages: zoom-cache-pcm: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-cache-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + zoom-refs: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] + zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] From 090921fa5f4943e50464b6e7953c2d1935a019f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Mar 2017 09:16:30 +0100 Subject: [PATCH 253/274] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/163561eab9dfab4e48923e6efdcc29b2a5a13861. --- .../haskell-modules/hackage-packages.nix | 832 ++++++++++++++++-- 1 file changed, 746 insertions(+), 86 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a2e477baa15..0c70f42b65f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -269,6 +269,7 @@ self: { homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AERN-Basics" = callPackage @@ -1801,6 +1802,7 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html"; description = "A simple document organizer with some wiki functionality"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Boolean" = callPackage @@ -3816,6 +3818,7 @@ self: { homepage = "https://github.com/listofoptions/delta-lambda"; description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DescriptiveKeys" = callPackage @@ -5376,6 +5379,7 @@ self: { homepage = "https://github.com/exFalso/ForkableT/"; description = "Forkable monad transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FormalGrammars" = callPackage @@ -5919,6 +5923,7 @@ self: { ]; description = "Some kind of game library or set of utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ganymede" = callPackage @@ -6181,6 +6186,7 @@ self: { homepage = "https://github.com/lettier/gifcurry"; description = "Create animated GIFs, overlaid with optional text, from video files"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GiveYouAHead" = callPackage @@ -10064,6 +10070,7 @@ self: { homepage = "https://github.com/brunoczim/Json-Data-for-Haskell"; description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JsContracts" = callPackage @@ -11943,6 +11950,7 @@ self: { homepage = "https://bitbucket.com/osu-testing/mucheck"; description = "Automated Mutation Testing"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MuCheck-HUnit" = callPackage @@ -11958,6 +11966,7 @@ self: { homepage = "https://bitbucket.com/osu-testing/mucheck-hunit"; description = "Automated Mutation Testing for HUnit tests"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MuCheck-Hspec" = callPackage @@ -11973,6 +11982,7 @@ self: { homepage = "https://bitbucket.com/osu-testing/mucheck-hspec"; description = "Automated Mutation Testing for Hspec tests"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MuCheck-QuickCheck" = callPackage @@ -11988,6 +11998,7 @@ self: { homepage = "https://bitbucket.com/osu-testing/mucheck-quickcheck"; description = "Automated Mutation Testing for QuickCheck tests"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MuCheck-SmallCheck" = callPackage @@ -12003,6 +12014,7 @@ self: { homepage = "https://bitbucket.com/osu-testing/mucheck-smallcheck"; description = "Automated Mutation Testing for SmallCheck tests"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Munkres" = callPackage @@ -12615,6 +12627,7 @@ self: { testHaskellDepends = [ base containers HUnit primes ]; description = "A library for number theoretic computations, written in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Numbers" = callPackage @@ -12839,6 +12852,7 @@ self: { ]; description = "Text UI library for performing parallel remote SSH operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OneTuple" = callPackage @@ -13756,6 +13770,7 @@ self: { homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PrimitiveArray-Pretty" = callPackage @@ -15328,6 +15343,7 @@ self: { ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ScratchFs" = callPackage @@ -15682,6 +15698,7 @@ self: { testHaskellDepends = [ base Cabal ]; description = "Simple table generator"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SizeCompare" = callPackage @@ -16591,6 +16608,7 @@ self: { homepage = "http://github.com/mtesseract/Tahin#readme"; description = "Tahin Password Generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Tainted" = callPackage @@ -16727,6 +16745,7 @@ self: { homepage = "https://github.com/testexplode/testexplode"; description = "Generates testcases from program-snippets"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Theora" = callPackage @@ -19874,6 +19893,7 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "activitystreams-aeson" = callPackage @@ -19984,6 +20004,7 @@ self: { homepage = "https://projects.zubr.me/wiki/adblock2privoxy"; description = "Convert adblock config files to privoxy format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "addLicenseInfo" = callPackage @@ -20425,6 +20446,7 @@ self: { homepage = "https://github.com/seanhess/aeson-flat#readme"; description = "Tools for creating flat JSON serializations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-flatten" = callPackage @@ -20656,6 +20678,7 @@ self: { homepage = "https://github.com/libscott/aeson-quick"; description = "Quick JSON extractions with Aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-schema" = callPackage @@ -21127,8 +21150,8 @@ self: { }: mkDerivation { pname = "airtable-api"; - version = "0.2.0.0"; - sha256 = "aeb20ea165849959f6a4463dd85a0c3f4d41012bfd11b4b8eef65942f24f024a"; + version = "0.2.0.1"; + sha256 = "e17565f18a0ecee13f9650a350f4731e20a21df03c350a8aa6bfe30b37233230"; libraryHaskellDepends = [ aeson base bytestring hashable lens text time unordered-containers wreq @@ -21472,6 +21495,7 @@ self: { homepage = "https://github.com/mrkkrp/alga"; description = "Algorithmic automation for various DAWs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algebra" = callPackage @@ -24091,6 +24115,7 @@ self: { homepage = "http://github.com/MichaelXavier/Angel"; description = "Process management and supervision daemon"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "angle" = callPackage @@ -24226,6 +24251,7 @@ self: { homepage = "http://www.github.com/massysett/anonymous-sums"; description = "QuickCheck functions to accompany the anonymous-sums package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansi-pretty" = callPackage @@ -24578,6 +24604,7 @@ self: { homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "api-field-json-th" = callPackage @@ -25171,6 +25198,7 @@ self: { homepage = "https://github.com/takano-akio/applicative-splice"; description = "Write applicative programs in direct style (generalizes idiom brackets)"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apply-refact" = callPackage @@ -26223,6 +26251,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asn1-encoding_0_9_5" = callPackage + ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl + , tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "asn1-encoding"; + version = "0.9.5"; + sha256 = "1e863bfd363f6c3760cc80f2c0d422e17845a9f79fe006030db202ecab5aaf29"; + libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; + testHaskellDepends = [ + asn1-types base bytestring hourglass mtl tasty tasty-quickcheck + text + ]; + homepage = "http://github.com/vincenthz/hs-asn1"; + description = "ASN1 data reader and writer in RAW, BER and DER forms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asn1-parse" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: mkDerivation { @@ -26686,6 +26733,7 @@ self: { homepage = "http://github.com/ynishi/atndapi#readme"; description = "An interface of ATND API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atom" = callPackage @@ -26931,6 +26979,7 @@ self: { homepage = "http://github.com/passy/attic-schedule#readme"; description = "A script I use to run \"attic\" for my backups"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atto-lisp" = callPackage @@ -27303,6 +27352,7 @@ self: { homepage = "https://github.com/wangbj/aur-api"; description = "ArchLinux AUR json v5 API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "authenticate" = callPackage @@ -28177,6 +28227,7 @@ self: { ]; description = "Amazon Route53 DNS service plugin for the aws package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sdk" = callPackage @@ -29644,6 +29695,7 @@ self: { homepage = "http://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "benchmark-function" = callPackage @@ -30223,6 +30275,7 @@ self: { homepage = "https://github.com/choener/bimaps"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary_0_7_6_1" = callPackage @@ -31308,6 +31361,7 @@ self: { libraryPkgconfigDepends = [ monetdb-mapi ]; description = "Low-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {monetdb-mapi = null;}; "bindings-mpdecimal" = callPackage @@ -32381,6 +32435,7 @@ self: { homepage = "http://code.mathr.co.uk/bitwise"; description = "fast multi-dimensional unboxed bit packed Bool arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitx-bitcoin" = callPackage @@ -32756,6 +32811,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using blaze-html with colonnade"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-from-html" = callPackage @@ -33030,8 +33086,8 @@ self: { }: mkDerivation { pname = "ble"; - version = "0.1.3.0"; - sha256 = "adddceeeca53d3ef79dc6e3d8a01f41d3382d8227a794c5df8adbae24ae799fb"; + version = "0.2.0.0"; + sha256 = "c8961033317b333de25d2fa49375b309b17aa1d825bb4030cc0cc990df6655e1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33128,6 +33184,7 @@ self: { homepage = "https://github.com/kseo/blockhash#readme"; description = "Blockhash perceptual image hash algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blocking-transactions" = callPackage @@ -33243,6 +33300,7 @@ self: { homepage = "http://github.com/MichaelXavier/bloodhound-amazonka-auth#readme"; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloomfilter" = callPackage @@ -33784,6 +33842,7 @@ self: { ]; description = "A Bookmarks manager with a HTML generator"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boombox" = callPackage @@ -34632,6 +34691,7 @@ self: { homepage = "http://code.ouroborus.net/buildbox"; description = "Rehackable components for writing buildbots and test harnesses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buildbox-tools" = callPackage @@ -35635,6 +35695,7 @@ self: { ]; description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-cargs" = callPackage @@ -35657,6 +35718,7 @@ self: { testHaskellDepends = [ base filepath tasty tasty-golden ]; description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-constraints" = callPackage @@ -35692,6 +35754,7 @@ self: { homepage = "http://github.com/vincenthz/cabal-db"; description = "query tools for the local cabal database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-debian" = callPackage @@ -36090,6 +36153,7 @@ self: { ]; description = "A monitor for cabal builds"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-nirvana" = callPackage @@ -36222,6 +36286,7 @@ self: { ]; description = "Topologically sort cabal packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-src" = callPackage @@ -36301,6 +36366,7 @@ self: { homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -36762,6 +36828,7 @@ self: { ]; description = "A build-system library and driver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cake3" = callPackage @@ -37113,6 +37180,7 @@ self: { homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-listen-http" = callPackage @@ -38172,6 +38240,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "catnplus" = callPackage + ({ mkDerivation, ansi-terminal, base, directory, either + , optparse-applicative, template-haskell, terminal-size + , transformers, vcs-revision + }: + mkDerivation { + pname = "catnplus"; + version = "0.1.0.0"; + sha256 = "72b17e8a2b104b9d194802b97f5ababd3000635b74b1f6596b9d09b81fa67511"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base directory either optparse-applicative + template-haskell terminal-size transformers vcs-revision + ]; + homepage = "https://github.com/rcook/catnplus#readme"; + description = "Simple tool to display text files with line numbers and paging"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cautious-file" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, unix }: mkDerivation { @@ -38185,6 +38274,7 @@ self: { ]; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-client" = callPackage @@ -38493,6 +38583,7 @@ self: { ]; description = "io-streams support for the cereal binary serialization library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-plus" = callPackage @@ -38540,6 +38631,7 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-text" = callPackage @@ -38775,6 +38867,7 @@ self: { homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chain-codes" = callPackage @@ -39042,13 +39135,13 @@ self: { }: mkDerivation { pname = "chatty"; - version = "0.7.0.0"; - sha256 = "87e2025fab3187c029ffdf221c8280b25dffb4f59fcf57212dcf0235ddba167b"; + version = "0.7.0.1"; + sha256 = "663d7bee8df42287cefa88f8c072981a2475e22d722046cd3ab6e6bdc775ec34"; libraryHaskellDepends = [ ansi-terminal base chatty-utils directory mtl process random setenv template-haskell text time transformers unix ]; - homepage = "http://doomanddarkness.eu/pub/chatty"; + homepage = "http://hub.darcs.net/enum/chatty"; description = "Some monad transformers and typeclasses for abstraction of global dependencies"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -39071,10 +39164,10 @@ self: { ({ mkDerivation, base, mtl, text, transformers }: mkDerivation { pname = "chatty-utils"; - version = "0.7.3.3"; - sha256 = "e966e3c04e31cba118a4dd5a3a695976b4e5aa03cafa8031c7305c1587ebf8ad"; + version = "0.7.3.4"; + sha256 = "dac3ce02d2c0b14258d8de258a3c0d8749d5c8466ed002ffb9df671d8899e1b6"; libraryHaskellDepends = [ base mtl text transformers ]; - homepage = "http://doomanddarkness.eu/pub/chatty"; + homepage = "http://hub.darcs.net/enum/chatty-utils"; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -39172,6 +39265,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {resolv = null;}; + "check-email_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, email-validate, resolv }: + mkDerivation { + pname = "check-email"; + version = "1.0.2"; + sha256 = "1c2615fadba09a5d7aa5c68648d12218a595efb759842fb4f524cf380afa9327"; + libraryHaskellDepends = [ base bytestring email-validate ]; + librarySystemDepends = [ resolv ]; + homepage = "https://github.com/qoelet/check-email#readme"; + description = "Confirm whether an email is valid and probably existant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {resolv = null;}; + "check-pvp" = callPackage ({ mkDerivation, base, Cabal, containers, explicit-exception , filepath, haskell-src-exts, non-empty, transformers, utility-ht @@ -39255,6 +39362,7 @@ self: { homepage = "https://john-millikin.com/software/chell/"; description = "QuickCheck support for the Chell testing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chesshs" = callPackage @@ -39874,6 +39982,7 @@ self: { homepage = "https://github.com/denisshevchenko/circlehs"; description = "The CircleCI REST API for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cirru-parser" = callPackage @@ -40471,6 +40580,7 @@ self: { homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks" = callPackage @@ -40811,6 +40921,7 @@ self: { homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/cli-builder"; description = "Simple project template from stack"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "click-clack" = callPackage @@ -41008,6 +41119,7 @@ self: { homepage = "http://github.com/sgraf812/cloben#readme"; description = "Clone and benchmark Haskell cabal projects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clock" = callPackage @@ -41762,6 +41874,7 @@ self: { homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codo-notation" = callPackage @@ -42476,6 +42589,7 @@ self: { ]; description = "Commutative binary operations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comonad" = callPackage @@ -42596,6 +42710,7 @@ self: { ]; description = "Socket functions for compact normal form"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compact-string" = callPackage @@ -42674,6 +42789,7 @@ self: { ]; description = "Compositional Data Types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-automata" = callPackage @@ -42734,6 +42850,7 @@ self: { ]; description = "Parametric Compositional Data Types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compensated" = callPackage @@ -44343,6 +44460,7 @@ self: { homepage = "https://github.com/oisdk/constrained-monads#readme"; description = "Typeclasses and instances for monads with constraints"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constrained-normal" = callPackage @@ -46384,6 +46502,7 @@ self: { homepage = "https://github.com/rblaze/credential-store#readme"; description = "Library to access secure credential storage providers"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "credentials" = callPackage @@ -46432,6 +46551,7 @@ self: { homepage = "https://github.com/brendanhay/credentials"; description = "Secure Credentials Administration"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crf-chain1" = callPackage @@ -46630,6 +46750,7 @@ self: { ]; description = "CRIU RPC client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criu-rpc-types" = callPackage @@ -46644,6 +46765,7 @@ self: { homepage = "https://github.com/wayofthepie/haskell-criu-rpc-types"; description = "Criu RPC protocol buffer types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "crockford" = callPackage @@ -48114,8 +48236,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2.2"; - sha256 = "baa776233ff1e56d3e4c9ecfc30c0c607e98bb2f4fdb8ef9a057d29d5dabe8f2"; + version = "0.2.3"; + sha256 = "d3f48bd08fea16d270fe5785380ca163ab9ef83d72d3b9418ef5ee74c83b964f"; libraryHaskellDepends = [ base bytestring crypto-api ]; testHaskellDepends = [ base bytestring crypto-api DRBG HUnit QuickCheck tagged @@ -48346,6 +48468,7 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; description = "Parsing dAmn messages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "danibot" = callPackage @@ -49624,6 +49747,7 @@ self: { ]; description = "Interval arithmetic for both open and closed intervals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-inttrie" = callPackage @@ -51052,6 +51176,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler core language and type checker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-core-babel" = callPackage @@ -51066,6 +51191,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler PHP code generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-core-eval" = callPackage @@ -51119,6 +51245,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler LLVM code generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-core-salt" = callPackage @@ -51135,6 +51262,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler C code generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-core-simpl" = callPackage @@ -51151,6 +51279,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler code transformations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-core-tetra" = callPackage @@ -51168,6 +51297,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler intermediate language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-driver" = callPackage @@ -51219,6 +51349,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler source language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-tools" = callPackage @@ -54059,12 +54190,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_0_2" = callPackage + "directory_1_3_1_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.0.2"; - sha256 = "f9ee11de8bbaf7b8e2710d40ca0f1081fd1aaa609faede14a3706d60345c7aa3"; + version = "1.3.1.0"; + sha256 = "94b0d06aba8311e3b9dc8e460d4ad5b25fdfcc361eecb8e7ad68a18f171aa7f2"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -54392,6 +54523,7 @@ self: { homepage = "https://github.com/joshuaclayton/distance-of-time#readme"; description = "Generate readable distances between times"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-closure" = callPackage @@ -54875,6 +55007,7 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests"; description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-zookeeper" = callPackage @@ -55294,6 +55427,7 @@ self: { homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/"; description = "Asynchronous DNS RBL lookup"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnssd" = callPackage @@ -55414,6 +55548,7 @@ self: { homepage = "https://github.com/denibertovic/docker-hs"; description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dockercook" = callPackage @@ -56944,6 +57079,7 @@ self: { homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-linker-template" = callPackage @@ -57213,6 +57349,7 @@ self: { homepage = "https://github.com/zaidan/earclipper#readme"; description = "Ear Clipping Triangulation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easy-api" = callPackage @@ -57396,6 +57533,7 @@ self: { homepage = "http://github.com/GaloisInc/ec2-unikernel"; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eccrypto" = callPackage @@ -59180,8 +59318,8 @@ self: { }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.5"; - sha256 = "80e4737835acbadb0aafa66defc961e32045c66760040456700853e5baf0dab3"; + version = "1.0.6"; + sha256 = "9db83e3a8e5dc42089f7078b6cea87746bd96872516d688292bcf92719de104a"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai @@ -60511,6 +60649,7 @@ self: { homepage = "-"; description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventsource-api" = callPackage @@ -60935,6 +61074,7 @@ self: { homepage = "https://github.com/lspitzner/exference"; description = "Tool to search/generate (haskell) expressions with a given type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exhaustive" = callPackage @@ -61424,6 +61564,7 @@ self: { homepage = "https://github.com/msakai/extended-reals/"; description = "Extension of real numbers with positive/negative infinities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible" = callPackage @@ -61479,6 +61620,7 @@ self: { homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-exceptions" = callPackage @@ -61693,6 +61835,7 @@ self: { homepage = "http://github.com/slpopejoy/fadno-xml"; description = "XML/XSD combinators/schemas/codegen"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fail" = callPackage @@ -62313,6 +62456,7 @@ self: { homepage = "https://github.com/prowdsponsor/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent" = callPackage @@ -63424,6 +63568,7 @@ self: { homepage = "https://github.com/kallisti-dev/filesystem-trees"; description = "Recursively manipulate and traverse filesystems as lazy rose trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filtrable" = callPackage @@ -64192,6 +64337,7 @@ self: { ]; description = "FlameGraphs of profiling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-maybe" = callPackage @@ -64464,6 +64610,7 @@ self: { homepage = "https://github.com/expede/flower#README"; description = "More directional operators"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow2dot" = callPackage @@ -65238,6 +65385,7 @@ self: { homepage = "https://github.com/stormont/forecast-io"; description = "A Haskell library for working with forecast.io data."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foreign-storable-asymmetric" = callPackage @@ -66340,6 +66488,7 @@ self: { homepage = "https://github.com/davidlazar/fresh"; description = "Introduce fresh variables into Haskell source code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday" = callPackage @@ -66691,6 +66840,7 @@ self: { homepage = "http://www.github.com/ehamberg/fswatcher/"; description = "Watch a file/directory and run a command when it's modified"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ftdi" = callPackage @@ -67610,6 +67760,7 @@ self: { homepage = "https://github.com/hackerspace/gcodehs"; description = "GCode processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gconf" = callPackage @@ -67779,8 +67930,8 @@ self: { }: mkDerivation { pname = "gegl"; - version = "0.0.0.4"; - sha256 = "cd938dcc3042980669f01186cc4d0a52d03a5b8cf14553598ef6c04e0748f822"; + version = "0.0.0.5"; + sha256 = "e783b1718f06fea318730ec8f6fb6c7d89e66691fa5dfd779f40ba192b5c5920"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67893,8 +68044,8 @@ self: { }: mkDerivation { pname = "gendocs"; - version = "0.1.2"; - sha256 = "60e9e403012fdf31fd99a7ec1e89034b3cabb32de167af9ad54a1d5da45c7a64"; + version = "0.1.3"; + sha256 = "0e934bfd9dd84f4e069737352e1c3503eef81747564f3dfd51e47a4959522df8"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring safe text ]; @@ -67910,8 +68061,8 @@ self: { }: mkDerivation { pname = "general-games"; - version = "0.4.0"; - sha256 = "ffd2e343716ee1bc73d6abfc810c06528e85eed083878f0c73cdc3510aa30642"; + version = "1.0.1"; + sha256 = "ce6805d308b6aed79de4c55ea6b4d1edd7ce0a536df9131d1aef2f1f7e1221a6"; libraryHaskellDepends = [ base monad-loops MonadRandom random random-shuffle ]; @@ -68507,6 +68658,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -68598,6 +68750,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geo-resolver" = callPackage @@ -69536,6 +69689,7 @@ self: { homepage = "https://github.com/valderman/ghc-simple"; description = "Simplified interface to the GHC API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-srcspan-plugin" = callPackage @@ -70995,8 +71149,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170214"; - sha256 = "d2f5a5bfa8077f417a8c0fee556571f498a9fbdabb99cdeed326df0a1f042e4b"; + version = "6.20170301.1"; + sha256 = "f416c02fabefb28e346b3bb6723141b0ff9785575e78e4d1e9ab5982cf6389de"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -71031,7 +71185,7 @@ self: { ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; - installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; + installPhase = "make PREFIX=$out BUILDER=: install"; checkPhase = "./git-annex test"; enableSharedExecutables = false; homepage = "http://git-annex.branchable.com/"; @@ -71119,6 +71273,7 @@ self: { homepage = "https://github.com/hjwylde/git-fmt"; description = "Custom git command for formatting code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-freq" = callPackage @@ -71142,6 +71297,7 @@ self: { homepage = "https://github.com/fujimura/git-freq"; description = "A Git subcommand to show total addition, deletion per file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-gpush" = callPackage @@ -71221,6 +71377,7 @@ self: { homepage = "http://github.com/jwiegley/gitlib"; description = "Passively snapshots working tree changes efficiently"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-object" = callPackage @@ -71424,8 +71581,8 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20170221"; - sha256 = "2838227d760bb0ea933a84023ec3eeda23ffc0dc870c290dfcd6b9b19d02b869"; + version = "1.20170301"; + sha256 = "5e6215f3feac9dc8871e42e554decf6049df2f18f3d84fb8906fe0c3849378b0"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -71439,7 +71596,7 @@ self: { unix-compat utf8-string vector ]; executableToolDepends = [ git ]; - homepage = "https://github.com/joeyh/github-backup"; + homepage = "https://github-backup.branchable.com/"; description = "backs up everything github knows about a repository, to the repository"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71585,6 +71742,7 @@ self: { homepage = "https://github.com/relrod/gitignore"; description = "Apply GitHub .gitignore templates to already existing repositories."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitit" = callPackage @@ -72117,6 +72275,7 @@ self: { homepage = "https://github.com/goromlagche/gli#readme"; description = "Tiny cli to fetch PR info from gitlab"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glib" = callPackage @@ -72820,6 +72979,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage @@ -72983,6 +73143,7 @@ self: { homepage = "http://khumba.net/projects/goatee"; description = "A monadic take on a 2,500-year-old board game - library"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "goatee-gtk" = callPackage @@ -73004,6 +73165,7 @@ self: { description = "A monadic take on a 2,500-year-old board game - GTK+ UI"; license = stdenv.lib.licenses.agpl3; platforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gofer-prelude" = callPackage @@ -74553,6 +74715,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Natural Language SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-latencytest" = callPackage @@ -74615,6 +74778,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Manufacturer Center SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-maps-coordinate" = callPackage @@ -75267,6 +75431,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Slides SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-spectrum" = callPackage @@ -76020,6 +76185,7 @@ self: { homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme"; description = "Core module for Gore&Ash engine that do something"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-logging" = callPackage @@ -76082,6 +76248,7 @@ self: { homepage = "git@github.com:Teaspot-Studio/gore-and-ash-sdl.git"; description = "Gore&Ash core module for integration with SDL library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-sync" = callPackage @@ -77119,6 +77286,7 @@ self: { homepage = "https://github.com/zaidan/gridbounds#readme"; description = "Collision detection for GridBox"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gridbox" = callPackage @@ -77609,6 +77777,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {gst_plugins_base = null; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -78733,6 +78902,7 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hacanon-light" = callPackage @@ -79197,6 +79367,7 @@ self: { homepage = "https://github.com/blitzcode/hackage-diff"; description = "Compare the public API of different versions of a Hackage library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-mirror" = callPackage @@ -79227,6 +79398,7 @@ self: { homepage = "http://fpcomplete.com"; description = "Simple mirroring utility for Hackage"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-plot" = callPackage @@ -79433,6 +79605,7 @@ self: { homepage = "https://github.com/stepcut/hackage-whatsnew"; description = "Check for differences between working directory and hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage2hwn" = callPackage @@ -79541,6 +79714,7 @@ self: { homepage = "http://github.com/agrafix/hackmanager"; description = "Generate useful files for Haskell projects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackport" = callPackage @@ -79792,6 +79966,7 @@ self: { homepage = "https://github.com/philopon/haddocset"; description = "Generate docset of Dash by Haddock haskell documentation tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hadoop-formats" = callPackage @@ -80811,6 +80986,7 @@ self: { homepage = "http://code.google.com/p/hgdata"; description = "Library and command-line utility for accessing Google services and APIs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "handa-geodata" = callPackage @@ -81034,22 +81210,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hapistrano_0_3_0_1" = callPackage - ({ mkDerivation, aeson, base, directory, filepath, hspec, mtl - , optparse-applicative, path, path-io, process, temporary, time - , transformers, yaml + "hapistrano_0_3_1_0" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath, hspec + , mtl, optparse-applicative, path, path-io, process, stm, temporary + , time, transformers, yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.0.1"; - sha256 = "ab0da599f2b4cb7208b2bdc349844bedb28141937a4aa0b3546f57b98854a6dc"; + version = "0.3.1.0"; + sha256 = "41d680421dad0d83f7c05f7271788955ff332c6acd83cc9aa1a6af776b1c7a6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath mtl path process time transformers ]; executableHaskellDepends = [ - aeson base optparse-applicative path path-io yaml + aeson async base optparse-applicative path path-io stm yaml ]; testHaskellDepends = [ base directory filepath hspec mtl path path-io process temporary @@ -82295,6 +82471,7 @@ self: { homepage = "http://github.com/analytics/hashable-extras/"; description = "Higher-rank Hashable"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashable-generics" = callPackage @@ -83630,6 +83807,7 @@ self: { testHaskellDepends = [ base haskell-src-exts hspec ]; description = "A quasiquoter for haskell-src-exts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-simple" = callPackage @@ -84611,8 +84789,8 @@ self: { }: mkDerivation { pname = "haskelzinc"; - version = "0.2.0.3"; - sha256 = "a7248945f8c53b1a0f36e1c184c236fcb2bea27c970fc0453bcc0e88be767a72"; + version = "0.3.0.9"; + sha256 = "1a047ba85cbddf9a89d51799fb60231b5ca05a340c0baeefbac227637f97e5ed"; libraryHaskellDepends = [ base containers filepath parsec3 pretty process ]; @@ -85168,6 +85346,7 @@ self: { homepage = "https://github.com/contivero/hasmin/"; description = "\"A CSS Minifier\""; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasparql-client" = callPackage @@ -85841,6 +86020,7 @@ self: { homepage = "http://johannesgerer.com/hax"; description = "Haskell cash-flow and tax simulation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxl" = callPackage @@ -86077,6 +86257,7 @@ self: { homepage = "http://www.alpheccar.org"; description = "Bayesian Networks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hbb" = callPackage @@ -88645,6 +88826,7 @@ self: { homepage = "https://github.com/vasylp/hgettext"; description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgithub" = callPackage @@ -90113,6 +90295,7 @@ self: { ]; description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlbfgsb" = callPackage @@ -90634,6 +90817,7 @@ self: { homepage = "https://github.com/hpdeifel/hlwm-haskell"; description = "Bindings to the herbstluftwm window manager"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hly" = callPackage @@ -90874,6 +91058,7 @@ self: { homepage = "http://github.com/bgamari/hmatrix-svdlibc"; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmatrix-syntax" = callPackage @@ -91241,6 +91426,7 @@ self: { homepage = "https://github.com/emilaxelsson/ho-rewriting"; description = "Generic rewrite rules with safe treatment of variables and binders"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoauth" = callPackage @@ -91661,6 +91847,7 @@ self: { homepage = "https://github.com/mgajda/homplexity"; description = "Haskell code quality tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "honi" = callPackage @@ -92219,12 +92406,12 @@ self: { ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: mkDerivation { pname = "hopfli"; - version = "0.2.1.0"; - sha256 = "c3af486ae287728d01662cc13f552a80a9cc3274c9a20f58c5a37ecbd49ea5e7"; + version = "0.2.1.1"; + sha256 = "6cc5b278396c2c6d24bb3cca9458366d1444208b32e49f658e75efbd803b1fdf"; libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; homepage = "https://github.com/ananthakumaran/hopfli"; - description = "zlib compatible compression using Zopfli Compression Algorithm"; + description = "Bidings to Google's Zopfli compression library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -93161,6 +93348,7 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hprotoc-fork" = callPackage @@ -93391,6 +93579,7 @@ self: { homepage = "http://github.com/dredozubov/hreader-lens"; description = "Optics for hreader package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hricket" = callPackage @@ -93588,8 +93777,8 @@ self: { }: mkDerivation { pname = "hs-duktape"; - version = "0.1.3"; - sha256 = "7c7a1b80b066c1436509d19a1e688ce506a31e30481100878411f89b5be33719"; + version = "0.1.5"; + sha256 = "716ea1f8a7414c64d03d2b7adcf47d1f29c0e2f916d8d550da63c834640683f4"; libraryHaskellDepends = [ aeson base bytestring text transformers unordered-containers vector ]; @@ -94259,6 +94448,7 @@ self: { ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3" = callPackage @@ -94502,6 +94692,7 @@ self: { homepage = "http://rd.slavepianos.org/?t=hsc3-rw"; description = "hsc3 re-writing"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-server" = callPackage @@ -94592,6 +94783,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-utils"; description = "Haskell SuperCollider Utilities"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscaffold" = callPackage @@ -94722,6 +94914,7 @@ self: { homepage = "https://github.com/bosu/hscope"; description = "cscope like browser for Haskell code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscrtmpl" = callPackage @@ -95654,6 +95847,7 @@ self: { homepage = "https://github.com/rvl/hsoz"; description = "Iron, Hawk, Oz: Web auth protocols"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsp" = callPackage @@ -95982,6 +96176,7 @@ self: { homepage = "https://github.com/worksap-ate/hspec-jenkins"; description = "Jenkins-friendly XML formatter for Hspec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-laws" = callPackage @@ -96545,6 +96740,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "HsQML-based clone of Pipe Mania"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-morris" = callPackage @@ -96720,6 +96916,7 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "SQL parser and type checker"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hssqlppp-th" = callPackage @@ -96739,6 +96936,7 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "hssqlppp extras which need template-haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstatistics" = callPackage @@ -97095,6 +97293,7 @@ self: { homepage = "https://github.com/ThoughtLeadr/hsyslog-udp"; description = "Log to syslog over a network via UDP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hszephyr" = callPackage @@ -97303,6 +97502,7 @@ self: { homepage = "https://github.com/nikita-volkov/html-entities"; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-kure" = callPackage @@ -98130,6 +98330,7 @@ self: { homepage = "https://github.com/nfjinjing/http-pony"; description = "A type unsafe http library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-pony-serve-wai" = callPackage @@ -98760,6 +98961,7 @@ self: { homepage = "https://github.com/loganbraga/hunch"; description = "CSS-like syntax for file system manipulation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunit-dejafu" = callPackage @@ -99351,17 +99553,18 @@ self: { homepage = "https://github.com/haskell-works/hw-kafka-client"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "hw-kafka-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, conduit - , conduit-extra, containers, exceptions, hspec, hw-kafka-client - , mtl, resourcet, transformers + , conduit-extra, containers, exceptions, extra, hspec + , hw-kafka-client, mtl, QuickCheck, resourcet, transformers }: mkDerivation { pname = "hw-kafka-conduit"; - version = "1.1.1"; - sha256 = "308d8e9ed13fc980148b0b1b26e090739533c210bdbbfceb990d4ae54170a212"; + version = "1.1.2"; + sha256 = "aa01650709e83e2a6014e47081248d6169fcab10e1b49a8c2b89928605693bcf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99372,12 +99575,13 @@ self: { base bifunctors bytestring conduit containers resourcet ]; testHaskellDepends = [ - base bifunctors bytestring conduit conduit-extra containers hspec - hw-kafka-client mtl resourcet transformers + base bifunctors bytestring conduit conduit-extra containers extra + hspec hw-kafka-client mtl QuickCheck resourcet transformers ]; homepage = "https://github.com/haskell-works/hw-kafka-client-conduit"; description = "Conduit bindings for kafka-client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-mquery" = callPackage @@ -100486,6 +100690,7 @@ self: { ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-haskell-server" = callPackage @@ -102493,8 +102698,8 @@ self: { pname = "indextype"; version = "0.1.0.0"; sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498"; - revision = "1"; - editedCabalFile = "382507ce3407fd6b5c60eee31675c52dc3bdc192dc4132f7c6e7047021fa0ef2"; + revision = "2"; + editedCabalFile = "daa67f59c54d4c61f73317a1edc7ee86e59327df0eade3a8db6e348a80b8d2d5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; @@ -102708,6 +102913,7 @@ self: { homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -103386,6 +103592,7 @@ self: { ]; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intern" = callPackage @@ -103469,6 +103676,7 @@ self: { homepage = "https://github.com/scvalex/interpol"; description = "GHC preprocessor and library to enable variable interpolation in strings"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolate" = callPackage @@ -103657,6 +103865,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "intro_0_1_0_9" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytestring, containers + , deepseq, dlist, extra, hashable, lens, mtl, safe + , string-conversions, tagged, text, transformers + , unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.1.0.9"; + sha256 = "963620591271c3a8e39cfc6b222b4ea9266da0121887298de7e6e59962d422ae"; + libraryHaskellDepends = [ + base bifunctors binary bytestring containers deepseq dlist extra + hashable mtl safe string-conversions tagged text transformers + unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bifunctors binary bytestring containers deepseq dlist extra + hashable lens mtl safe string-conversions tagged text transformers + unordered-containers writer-cps-mtl + ]; + homepage = "https://github.com/minad/intro#readme"; + description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intro-prelude" = callPackage ({ mkDerivation, intro }: mkDerivation { @@ -104378,6 +104612,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-conduit_0_2_2_1" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text + , time, tls, transformers, x509-validation + }: + mkDerivation { + pname = "irc-conduit"; + version = "0.2.2.1"; + sha256 = "9640c826f27f262cbe6877cb3757548fd6e052d6e27a64bfba41875856a1721a"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra connection irc irc-ctcp + network-conduit-tls profunctors text time tls transformers + x509-validation + ]; + homepage = "https://github.com/barrucadu/irc-conduit"; + description = "Streaming IRC message library using conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-core" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , hashable, HUnit, primitive, text, time, vector @@ -104396,6 +104650,7 @@ self: { homepage = "https://github.com/glguy/irc-core"; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-ctcp" = callPackage @@ -104535,6 +104790,7 @@ self: { homepage = "https://github.com/stepcut/ircbot"; description = "A library for writing IRC bots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ircbouncer" = callPackage @@ -106439,6 +106695,7 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-b" = callPackage @@ -108038,6 +108295,7 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Rapid Gtk Application Development - I18N"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-mvc-controller" = callPackage @@ -108549,6 +108807,7 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keyword-args" = callPackage @@ -109321,6 +109580,7 @@ self: { homepage = "https://github.com/sgillespie/lambda-calculus#readme"; description = "A lambda calculus interpreter"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-canvas" = callPackage @@ -109680,6 +109940,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdacat" = callPackage @@ -110027,6 +110288,7 @@ self: { homepage = "https://github.com/mrkkrp/lame"; description = "Fairly complete high-level binding to LAME encoder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {mp3lame = null;}; "lame-tester" = callPackage @@ -110620,6 +110882,7 @@ self: { homepage = "http://github.com/mitchellwrosen/language-lua2"; description = "Lua parser and pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-mixal" = callPackage @@ -111280,6 +111543,7 @@ self: { ]; description = "A prototypical 2d platform game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "layout" = callPackage @@ -111808,6 +112072,7 @@ self: { homepage = "https://github.com/owensmurray/legion-discovery-client#readme"; description = "Client library for communicating with legion-discovery"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "legion-extra" = callPackage @@ -112808,29 +113073,27 @@ self: { ({ mkDerivation, aeson, base, base-unicode-symbols, binary , boomerang, bytestring, containers, containers-unicode-symbols , contravariant, data-default, data-textual, dns, exceptions - , filepath, hjsonschema, lens, machines, mtl, network, network-ip - , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm - , stm-containers, temporary, test-framework + , filepath, hjsonschema, lens, machines, managed, mtl, network + , network-ip, parsers, pathtype, protolude, QuickCheck, random + , semigroups, stm, stm-containers, temporary, test-framework , test-framework-quickcheck2, test-framework-th, text, text-icu , text-icu-normalized, text-printer, time, transformers, zippers }: mkDerivation { pname = "liblawless"; - version = "0.16.1"; - sha256 = "9598c6e717b1118057190f6a6f15977903956df374812e94049e78866b40578a"; - isLibrary = true; - isExecutable = true; + version = "0.17.1"; + sha256 = "dbba3ab5865c0f957daf3ead4e3f7c16a44ba2e3c4fbbe4ced429f1c88e6f397"; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring containers containers-unicode-symbols contravariant data-default - data-textual dns exceptions hjsonschema lens machines mtl network - network-ip parsers pathtype protolude QuickCheck random semigroups - stm stm-containers temporary text text-icu text-icu-normalized - text-printer time transformers zippers + data-textual dns exceptions hjsonschema lens machines managed mtl + network network-ip parsers pathtype protolude QuickCheck random + semigroups stm stm-containers temporary text text-icu + text-icu-normalized text-printer time transformers zippers ]; testHaskellDepends = [ aeson base binary bytestring exceptions filepath network QuickCheck - semigroups temporary test-framework test-framework-quickcheck2 + semigroups stm temporary test-framework test-framework-quickcheck2 test-framework-th text time transformers ]; description = "Prelude based on protolude for GHC 8 and beyond"; @@ -113275,8 +113538,8 @@ self: { ({ mkDerivation, base, mtl, nvpair, transformers, zfs }: mkDerivation { pname = "libzfs"; - version = "0.1.0.2"; - sha256 = "887ea6f0fbcba72885090666e3384b35cd543c7bc56f28fd1b9c6b5f6640f2e7"; + version = "0.2.0.0"; + sha256 = "85cce97cf4f0fa9be343427ecd3ab0d18c93e6264f1562eafd54fd59dbb06bbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl transformers ]; @@ -113483,6 +113746,7 @@ self: { homepage = "https://github.com/cmoresid/lightning-haskell#readme"; description = "Haskell client for lightning-viz REST API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lighttpd-conf" = callPackage @@ -115450,6 +115714,7 @@ self: { homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locked-poll" = callPackage @@ -115673,6 +115938,7 @@ self: { homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log2json" = callPackage @@ -116629,6 +116895,7 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltiv1p1" = callPackage @@ -116789,6 +117056,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid_2_9_8" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph + , mtl, parsec, text, transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.8"; + sha256 = "9ab498348a68317d2b995c29e0963895d0943de571e9164a28fc3f30ae7f9b72"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text + ]; + homepage = "https://github.com/chrisdone/lucid"; + description = "Clear to write, read and edit DSL for HTML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -117098,6 +117390,7 @@ self: { homepage = "https://github.com/bigmac2k/lz4-conduit"; description = "LZ4 compression for conduits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lzma" = callPackage @@ -117116,6 +117409,7 @@ self: { homepage = "https://github.com/hvr/lzma"; description = "LZMA/XZ compression and decompression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lzma;}; "lzma-clib" = callPackage @@ -117195,6 +117489,7 @@ self: { homepage = "https://github.com/hvr/lzma-streams"; description = "IO-Streams interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mDNSResponder-client" = callPackage @@ -117460,6 +117755,7 @@ self: { homepage = "http://github.com/tych0/maclight"; description = "Control screen and keyboard backlights on MACs under Linux"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "macosx-make-standalone" = callPackage @@ -118351,6 +118647,7 @@ self: { ]; description = "Syntax sugar for defining maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mappy" = callPackage @@ -118566,6 +118863,7 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -119687,6 +119985,7 @@ self: { homepage = "https://github.com/dhess/mellon/"; description = "Control physical access devices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mellon-gpio" = callPackage @@ -119700,6 +119999,7 @@ self: { homepage = "https://github.com/dhess/mellon/"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mellon-web" = callPackage @@ -119895,6 +120195,7 @@ self: { homepage = "http://johannesgerer.com/memis"; description = "Memis Efficient Manual Image Sorting"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memo-ptr" = callPackage @@ -120013,6 +120314,7 @@ self: { homepage = "http://github.com/j1r1k/merge-bash-history#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mersenne-random" = callPackage @@ -120568,6 +120870,7 @@ self: { homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midair" = callPackage @@ -121152,6 +121455,7 @@ self: { homepage = "https://github.com/donatello/minio-hs#readme"; description = "A Minio client library, compatible with S3 like services"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minions" = callPackage @@ -121884,6 +122188,7 @@ self: { homepage = "http://code.haskell.org/mohws/"; description = "Modular Haskell Web Server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mole" = callPackage @@ -122568,6 +122873,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-peel_0_2_1_2" = callPackage + ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework + , test-framework-hunit, transformers + }: + mkDerivation { + pname = "monad-peel"; + version = "0.2.1.2"; + sha256 = "2dd5e9090f3951dbc298e35c3cea7099818aba0485a55059475c4f346fc933f4"; + libraryHaskellDepends = [ + base extensible-exceptions transformers + ]; + testHaskellDepends = [ + base extensible-exceptions HUnit test-framework + test-framework-hunit transformers + ]; + homepage = "http://andersk.mit.edu/haskell/monad-peel/"; + description = "Lift control operations like exception catching through monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-primitive" = callPackage ({ mkDerivation, base, primitive, transformers }: mkDerivation { @@ -122686,6 +123012,7 @@ self: { homepage = "http://github.com/cartazio/monad-ste"; description = "ST monad with efficient explicit errors"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-stlike-io" = callPackage @@ -123160,6 +123487,7 @@ self: { libraryHaskellDepends = [ base bindings-monetdb-mapi ]; description = "Mid-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "money" = callPackage @@ -123320,6 +123648,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, foldl + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.2"; + sha256 = "aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -124399,6 +124752,7 @@ self: { ]; description = "Multi-version deployer for web applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mudbath" = callPackage @@ -124844,6 +125198,7 @@ self: { homepage = "https://github.com/lspitzner/multistate"; description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multivariant" = callPackage @@ -125087,6 +125442,7 @@ self: { ]; description = "Musical pitch representation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "music-pitch-literal" = callPackage @@ -125425,6 +125781,7 @@ self: { ]; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mvc-updates" = callPackage @@ -125510,6 +125867,7 @@ self: { homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; description = "MXNet interface in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {mxnet = null;}; "mxnet-examples" = callPackage @@ -125524,6 +125882,7 @@ self: { homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; description = "Examples for MXNet in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mxnet-nnvm" = callPackage @@ -125538,6 +125897,7 @@ self: { homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; description = "NNVM interface in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {mxnet = null;}; "myTestlll" = callPackage @@ -126276,6 +126636,7 @@ self: { testHaskellDepends = [ base ]; description = "Native library manager for Windows"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nats" = callPackage @@ -127704,6 +128065,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-rpca" = callPackage @@ -127942,6 +128304,8 @@ self: { pname = "network-transport-inmemory"; version = "0.5.2"; sha256 = "8245d795330157d90ad9de599854d119c6d8938a45ab8c4ec89f3160b2e9ef4e"; + revision = "1"; + editedCabalFile = "333544d0ef41ac0b5ccc570f131edefa350d2d522f581ff7351a027a65229ab2"; libraryHaskellDepends = [ base bytestring containers data-accessor network-transport stm ]; @@ -128999,6 +129363,7 @@ self: { homepage = "https://github.com/ppelleti/normalization-insensitive"; description = "Normalization insensitive string comparison"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss" = callPackage @@ -129365,6 +129730,7 @@ self: { homepage = "https://github.com/trskop/number-length"; description = "Number of digits in a number in decimal and hexadecimal representation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "number-show" = callPackage @@ -130412,6 +130778,7 @@ self: { homepage = "https://github.com/hjwylde/omnifmt"; description = "A pretty-printer wrapper to faciliate ease of formatting during development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "on-a-horse" = callPackage @@ -130464,6 +130831,7 @@ self: { libraryHaskellDepends = [ base containers parsec tagsoup ]; description = "HTML-parsing primitives for Parsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "once" = callPackage @@ -131535,6 +131903,7 @@ self: { homepage = "http://github.com/akc/opn"; description = "Open files or URLs using associated programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimal-blocks" = callPackage @@ -132048,6 +132417,7 @@ self: { homepage = "https://github.com/volhovM/orgstat"; description = "Statistics visualizer for org-mode"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "origami" = callPackage @@ -132195,6 +132565,7 @@ self: { homepage = "https://github.com/spwhitton/oso2pdf"; description = "Better conversion of Oxford Scholarship Online material to PDF"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "osx-ar" = callPackage @@ -132698,6 +133069,8 @@ self: { pname = "pandoc"; version = "1.19.2.1"; sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801"; + revision = "1"; + editedCabalFile = "0ba3a65619868f044f48fcad137a2d3564ef1f07daf022f3e147248c1eed3bfa"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -132806,6 +133179,7 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-csv2table" = callPackage @@ -132860,6 +133234,7 @@ self: { homepage = "https://github.com/owickstrom/pandoc-include-code"; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-japanese-filters" = callPackage @@ -132892,6 +133267,7 @@ self: { homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-placetable" = callPackage @@ -132963,6 +133339,8 @@ self: { pname = "pandoc-types"; version = "1.17.0.5"; sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3"; + revision = "1"; + editedCabalFile = "f6238d666c941d4eb5c80c195a9df9cb4d6579281b648dbecd2aad84aaf0e949"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb ]; @@ -133733,6 +134111,7 @@ self: { homepage = "http://bitbucket.org/hyllos/pareto-haskell"; description = "A library for cause-effect relationships"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parport" = callPackage @@ -134243,6 +134622,7 @@ self: { homepage = "https://github.com/mtesseract/haskell-partial-order"; description = "Provides typeclass suitable for types admitting a partial order"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-uri" = callPackage @@ -134440,6 +134820,8 @@ self: { pname = "path"; version = "0.5.12"; sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d"; + revision = "1"; + editedCabalFile = "540d42d3ea3169520a788d6771a3f907f01e5410bd87deea8bb57cb76b536ca0"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell ]; @@ -134679,6 +135061,7 @@ self: { homepage = "https://github.com/meoblast001/paypal-rest-client"; description = "A client to connect to PayPal's REST API (v1)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pb" = callPackage @@ -134924,6 +135307,7 @@ self: { homepage = "https://github.com/NCrashed/pdf-slave#readme"; description = "Tool to generate PDF from haskintex templates and YAML input"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-slave-template" = callPackage @@ -134940,6 +135324,7 @@ self: { homepage = "https://github.com/ncrashed/pdf-slave#readme"; description = "Template format definition for pdf-slave tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-content" = callPackage @@ -136011,6 +136396,7 @@ self: { homepage = "https://github.com/frasertweedale/hs-persona"; description = "Persona (BrowserID) library"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persona-idp" = callPackage @@ -137020,6 +137406,7 @@ self: { ]; description = "Blocked GZip"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-binary" = callPackage @@ -137439,6 +137826,7 @@ self: { homepage = "http://github.com/rcallahan/pipes-illumina"; description = "Illumina NGS data processing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-interleave" = callPackage @@ -137466,6 +137854,7 @@ self: { testHaskellDepends = [ base hspec pipes ]; description = "Stateful IO streams based on pipes"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-key-value-csv" = callPackage @@ -137511,6 +137900,7 @@ self: { homepage = "http://github.com/bgamari/pipes-lzma"; description = "LZMA compressors and decompressors for the Pipes package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-misc" = callPackage @@ -137800,6 +138190,7 @@ self: { ]; description = "Functions that smash Pipes and sqlite-simple together"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-text" = callPackage @@ -137930,6 +138321,7 @@ self: { homepage = "https://github.com/k0001/pipes-zlib"; description = "Zlib and GZip compression and decompression for Pipes streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pisigma" = callPackage @@ -138608,6 +139000,7 @@ self: { homepage = "https://github.com/jpvillaisaza/pocket-haskell"; description = "Bindings for the Pocket API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pocket-dns" = callPackage @@ -139937,6 +140330,7 @@ self: { homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme"; description = "An optparse-applicative parser for postgresql-simple's connection options"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-sop" = callPackage @@ -140154,6 +140548,7 @@ self: { ]; description = "Send email via Postmark using io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmaster" = callPackage @@ -140219,6 +140614,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Potrace bindings for the diagrams library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powermate" = callPackage @@ -140401,6 +140797,7 @@ self: { homepage = "https://github.com/tdammers/praglude"; description = "A pragmatic Prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "preamble" = callPackage @@ -141777,6 +142174,7 @@ self: { homepage = "https://gitorious.org/prof2pretty"; description = "generate pretty source from time/allocation profiles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profiteur" = callPackage @@ -142157,8 +142555,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.3.1"; - sha256 = "32f2d2f709a94805fc89b4368d87cba556e0e80984dceb8b0df242a93a69f635"; + version = "3.4.1"; + sha256 = "b5d8f9773d4f58ab68fc036dacf7368b450e0535769bb1df28e80166cd3d2116"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143133,6 +143531,7 @@ self: { homepage = "https://github.com/bosu/pure-cdb"; description = "Another pure-haskell CDB (Constant Database) implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pure-fft" = callPackage @@ -143287,6 +143686,7 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge" = callPackage @@ -143326,6 +143726,7 @@ self: { homepage = "https://github.com/bitc/purescript-bundle-fast"; description = "A fast alternative to Purescript's `psc-bundle` to be used during development"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pursuit-client" = callPackage @@ -144152,6 +144553,7 @@ self: { homepage = "http://github.com/BlackBrane/quantum-random/"; description = "Retrieve, store and manage real quantum random data"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qudb" = callPackage @@ -144365,6 +144767,7 @@ self: { libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; description = "Simple type-level combinators for augmenting QuickCheck instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-instances" = callPackage @@ -144514,6 +144917,7 @@ self: { ]; description = "Customizable reports for quickcheck properties"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-script" = callPackage @@ -144573,6 +144977,7 @@ self: { homepage = "https://github.com/hiratara/hs-string-random#readme"; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-text" = callPackage @@ -144837,6 +145242,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck quiver transformers ]; description = "Binary serialisation support for Quivers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-bytestring" = callPackage @@ -144901,6 +145307,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Group and chunk values within a Quiver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-http" = callPackage @@ -144919,6 +145326,7 @@ self: { homepage = "https://github.com/christian-marie/quiver-http/"; description = "Adapter to stream over HTTP(s) with quiver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-instances" = callPackage @@ -145026,8 +145434,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.1.0"; - sha256 = "40f9ec9f735fbf45310d717ee39937740a09e8509f16d4950a5f3446a50e8650"; + version = "0.1.1"; + sha256 = "e18010a169135a33f1aa9526aa7cfdd528a9a3c4d57cde26a76a80e6e7bc67a7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq mtl vector ]; @@ -145366,6 +145774,7 @@ self: { homepage = "https://github.com/fnoble/raml"; description = "RESTful API Modeling Language (RAML) library for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ramus" = callPackage @@ -145831,6 +146240,7 @@ self: { homepage = "https://github.com/ChrisPenner/rasa#readme"; description = "A modular text editor"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-example-config" = callPackage @@ -145883,6 +146293,7 @@ self: { homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for running commands"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-cursors" = callPackage @@ -145899,6 +146310,7 @@ self: { homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext adding cursor(s)"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-files" = callPackage @@ -145929,6 +146341,7 @@ self: { homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for logging state/actions"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-slate" = callPackage @@ -145959,6 +146372,7 @@ self: { homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for populating status-bar"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-style" = callPackage @@ -145971,6 +146385,7 @@ self: { homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext managing rendering styles"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-views" = callPackage @@ -146710,6 +147125,7 @@ self: { homepage = "http://github.com/cies/reactive-banana-sdl2#readme"; description = "Reactive Banana integration with SDL2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-threepenny" = callPackage @@ -146948,6 +147364,7 @@ self: { homepage = "https://github.com/zaidan/read-io#readme"; description = "Read IO library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "readable" = callPackage @@ -147327,6 +147744,7 @@ self: { homepage = "https://www.github.com/jwiegley/recursors"; description = "Auto-generate final encodings and their isomorphisms using Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "redHandlers" = callPackage @@ -147369,6 +147787,7 @@ self: { homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "redis" = callPackage @@ -148082,6 +148501,7 @@ self: { homepage = "https://github.com/konn/refresht#readme"; description = "Environment Monad with automatic resource refreshment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refty" = callPackage @@ -149315,6 +149735,7 @@ self: { ]; description = "An parametrizable Remote Monad, and parametrizable Applicative Functor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remotion" = callPackage @@ -149511,6 +149932,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-fftw" = callPackage @@ -150517,6 +150939,31 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "rethinkdb_2_2_0_9" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, binary + , bytestring, containers, criterion, data-default, doctest, mtl + , network, scientific, text, time, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "rethinkdb"; + version = "2.2.0.9"; + sha256 = "8adb11ec9fd6cfd756571faf97f6727c35fa2adc6111ceab0f51ccde658bdd50"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring containers + data-default mtl network scientific text time unordered-containers + utf8-string vector + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ aeson async base criterion text ]; + homepage = "http://github.com/atnnn/haskell-rethinkdb"; + description = "A driver for RethinkDB 2.2"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , criterion, hashable, hspec, hspec-smallcheck, mtl, network @@ -150582,6 +151029,7 @@ self: { homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "RethinkDB driver for Haskell"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retry" = callPackage @@ -150683,6 +151131,7 @@ self: { homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reversi" = callPackage @@ -151269,6 +151718,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rng-utils" = callPackage @@ -151585,6 +152035,7 @@ self: { ]; description = "A collection of rose tree structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rose-trie" = callPackage @@ -152253,6 +152704,7 @@ self: { homepage = "https://github.com/DanielG/rts-loader"; description = "Dynamically load Haskell libraries"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rubberband" = callPackage @@ -152343,6 +152795,7 @@ self: { ]; description = "Pliable records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruler" = callPackage @@ -152697,6 +153150,7 @@ self: { homepage = "https://github.com/k0001/safe-money"; description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -152759,6 +153213,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "safecopy-store" = callPackage + ({ mkDerivation, array, base, bytestring, containers, lens + , lens-action, old-time, QuickCheck, quickcheck-instances, store + , store-core, tasty, tasty-quickcheck, template-haskell, text, time + , vector + }: + mkDerivation { + pname = "safecopy-store"; + version = "0.9.2"; + sha256 = "17e37e713a1dc86a50a16589ebc7e087e9896bdfe40918350b6f546a4992007b"; + libraryHaskellDepends = [ + array base bytestring containers old-time store store-core + template-haskell text time vector + ]; + testHaskellDepends = [ + array base containers lens lens-action QuickCheck + quickcheck-instances store tasty tasty-quickcheck template-haskell + time vector + ]; + homepage = "https://github.com/NCrashed/safecopy"; + description = "Binary serialization with version control"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "safeint" = callPackage ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -152774,6 +153252,7 @@ self: { ]; description = "overflow-checked Int type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safepath" = callPackage @@ -154683,6 +155162,7 @@ self: { libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ]; description = "Render with Cairo on SDL textures. Includes optional convenience drawing API."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdl2-cairo-image" = callPackage @@ -154698,6 +155178,7 @@ self: { ]; description = "An image loading and rendering library for sdl2 / sdl2-cairo"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdl2-compositor" = callPackage @@ -156113,8 +156594,8 @@ self: { ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: mkDerivation { pname = "servant-auth"; - version = "0.2.1.0"; - sha256 = "31c963fa9dcc39431d45edb0f859771cba74f0dc6229258205fac99f0572fb4a"; + version = "0.2.6.0"; + sha256 = "ca70089cb1560dc8b990437c3eb6ff4a8cea0aba387fc7cb7ef1bd0b9f17113d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; @@ -156130,8 +156611,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.2.1.0"; - sha256 = "61afe42548bf696d2a2d2ad89b6284a40c192a30bc9201f0f49529cd90d556fe"; + version = "0.2.6.0"; + sha256 = "928cd5a1e546e38f76f161332ea6591f885d62c052fd8a6cee5e4e22f35e5c36"; libraryHaskellDepends = [ base bytestring servant servant-auth servant-client text ]; @@ -156181,8 +156662,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.1.0"; - sha256 = "0bdce6889b1caf64e6b1ecbf565fb5201d32689c576bb3701cde671fbad8e3a1"; + version = "0.2.6.0"; + sha256 = "333d3fabb345a2892aa803e5e5558356a66382032693d68e762fb95dd75cb4b2"; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text ]; @@ -156283,8 +156764,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.4.0"; - sha256 = "c61e2d4b8de2aee42713fd30f37532ae60c19527ea06601e656c595102c6bbf2"; + version = "0.2.6.0"; + sha256 = "d78ab2c470731d2e18f19c2b45b8cc398541cda56ba947cdb032081737c55ea8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156321,8 +156802,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.4.1.0"; - sha256 = "4d2165bed0789e627cc716270491bf87863d5cda4c3041dfd10c0a297b22e3dc"; + version = "0.4.1.1"; + sha256 = "06a2f6928bd558ad6d22542bf212ac0acdb60d68febe70eab917d37812bb3e84"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl pwstore-fast servant-auth-token-api servant-server text time transformers uuid @@ -156353,6 +156834,7 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Acid-state backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-api" = callPackage @@ -156361,8 +156843,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.0.0"; - sha256 = "6a8ab7ae1f63d2aecca8c6d63f2b305238b010e5c2e19e4c7f51e01d6bb65526"; + version = "0.4.0.1"; + sha256 = "0850d95cc86d0893069887f2e30ed0cb22eef0bdf7f82a6d28e1c51f551e3d83"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -156392,6 +156874,7 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Persistent backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-blaze" = callPackage @@ -156738,6 +157221,7 @@ self: { homepage = "http://github.com/finlay/servant-github#readme"; description = "Bindings to GitHub API using servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-github-webhook" = callPackage @@ -156834,6 +157318,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-js_0_9_3" = callPackage + ({ mkDerivation, base, base-compat, charset, hspec + , hspec-expectations, language-ecmascript, lens, QuickCheck + , servant, servant-foreign, text + }: + mkDerivation { + pname = "servant-js"; + version = "0.9.3"; + sha256 = "086905a2c5d8903910b415b71f007c28cb6de9bccc4ab273e7ed944ceeca2cc2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat charset lens servant servant-foreign text + ]; + testHaskellDepends = [ + base base-compat hspec hspec-expectations language-ecmascript lens + QuickCheck servant text + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Automatically derive javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { @@ -156896,6 +157404,7 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-mock_0_8_1_2" = callPackage @@ -156926,6 +157435,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-multipart" = callPackage + ({ mkDerivation, base, bytestring, directory, http-client + , http-media, network, resourcet, servant, servant-server, text + , transformers, wai, wai-extra, warp + }: + mkDerivation { + pname = "servant-multipart"; + version = "0.10"; + sha256 = "285298e7411297f4e023cceba14fd8f5c03c694f47533adfaf01538682698199"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory http-media resourcet servant + servant-server text transformers wai wai-extra + ]; + executableHaskellDepends = [ + base http-client network servant servant-server text transformers + wai warp + ]; + homepage = "https://github.com/haskell-servant/servant-multipart#readme"; + description = "multipart/form-data (e.g file upload) support for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-named" = callPackage ({ mkDerivation, base, hspec, hspec-wai, http-types, servant , servant-server @@ -157089,6 +157623,7 @@ self: { ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-response" = callPackage @@ -157457,6 +157992,7 @@ self: { homepage = "https://github.com/Gabriel439/Haskell-Server-Generic-Library"; description = "Auto-generate a server for your datatype"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession" = callPackage @@ -157836,6 +158372,7 @@ self: { ]; description = "Ducktyped set interface for Haskell containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setters" = callPackage @@ -158011,6 +158548,7 @@ self: { homepage = "https://github.com/kseo/sfnt2woff#readme"; description = "A command line tool to convert TrueType/OpenType fonts to WOFF format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zlib;}; "sgd" = callPackage @@ -158721,6 +159259,7 @@ self: { homepage = "https://github.com/valderman/shellmate"; description = "Simple interface for shell scripting in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shellmate-extras" = callPackage @@ -159966,6 +160505,7 @@ self: { homepage = "http://jakewheat.github.io/simple-sql-parser/"; description = "A parser for SQL queries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-stacked-vm" = callPackage @@ -160674,6 +161214,7 @@ self: { homepage = "https://github.com/githubuser/skylark-client#readme"; description = "Skylark client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting" = callPackage @@ -160802,8 +161343,8 @@ self: { }: mkDerivation { pname = "slack-api"; - version = "0.11"; - sha256 = "aa4c71bd6e877bca8d5e4cdb516c4049eb9068e287205985fd4305d78425d0c3"; + version = "0.12"; + sha256 = "9b5cde3cbeb67a020614e0b9e10c316dd6dc378b03144944b99846ee75c2bc36"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160854,6 +161395,7 @@ self: { homepage = "https://github.com/jpvillaisaza/slack-web"; description = "Bindings for the Slack web API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slave-thread" = callPackage @@ -160964,6 +161506,7 @@ self: { homepage = "http://akc.is/sloane"; description = "A command line interface to Sloane's OEIS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slope-field" = callPackage @@ -161000,6 +161543,7 @@ self: { homepage = "https://github.com/ducis/pa_slot"; description = "Write lambdas without naming the parameters"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sloth" = callPackage @@ -162798,6 +163342,7 @@ self: { homepage = "https://github.com/kim/snappy-framing"; description = "Snappy Framing Format in Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snappy-iteratee" = callPackage @@ -163226,6 +163771,7 @@ self: { homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme"; description = "Unix domain sockets"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socketio" = callPackage @@ -165341,6 +165887,7 @@ self: { homepage = "http://github.com/rubik/stack-hpc-coveralls"; description = "Initial project template from stack"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -165464,6 +166011,7 @@ self: { homepage = "https://github.com/fpco/stackage-build-plan"; description = "Calculate and print (in different formats) Stackage build plans"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-cabal" = callPackage @@ -165485,6 +166033,7 @@ self: { homepage = "https://www.stackage.org/package/stackage-cabal"; description = "A CLI executable for cabal-based stackage commands"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-cli" = callPackage @@ -165819,6 +166368,7 @@ self: { ]; description = "To be written"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state" = callPackage @@ -165848,6 +166398,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/"; description = "Monad transformers for holding bags of state"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state-plus" = callPackage @@ -165860,6 +166411,7 @@ self: { testHaskellDepends = [ base checkers mtl QuickCheck ]; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state-record" = callPackage @@ -166216,6 +166768,7 @@ self: { homepage = "https://github.com/debug-ito/staversion"; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stb-image" = callPackage @@ -168087,6 +168640,7 @@ self: { homepage = "http://github.com/nboldi/structural-traversal#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "structured-haskell-mode" = callPackage @@ -168277,6 +168831,7 @@ self: { ]; description = "A generator of nix files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sub-state" = callPackage @@ -168786,6 +169341,7 @@ self: { homepage = "https://github.com/nikita-volkov/supplemented"; description = "Early termination for monads"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suspend" = callPackage @@ -169135,6 +169691,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "syb_0_7" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl }: + mkDerivation { + pname = "syb"; + version = "0.7"; + sha256 = "b8757dce5ab4045c49a0ae90407d575b87ee5523a7dd5dfa5c9d54fcceff42b5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers HUnit mtl ]; + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "syb-extras" = callPackage ({ mkDerivation, base, eq, prelude-extras }: mkDerivation { @@ -169919,8 +170489,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "system-info"; - version = "0.1.0.3"; - sha256 = "9d31bad4a6ea7abdb6bef5e929388a58d200982964042cc4aa991c81066dc8b8"; + version = "0.1.0.5"; + sha256 = "aa1e2fec0ceb10b8916422d2e4421e6a6167a283344c7fd2c0fba5fec86f2c45"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -169977,6 +170547,7 @@ self: { homepage = "https://github.com/cocreature/system-locale"; description = "Get system locales"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-posix-redirect" = callPackage @@ -170372,6 +170943,7 @@ self: { homepage = "https://github.com/lovasko/tablize"; description = "Pretty-printing of CSV files"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tabloid" = callPackage @@ -172103,6 +172675,7 @@ self: { homepage = "https://github.com/bollu/teleport#readme"; description = "A tool to quickly switch between directories"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tellbot" = callPackage @@ -172908,6 +173481,7 @@ self: { ]; description = "Template Haskell for test framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-invariant" = callPackage @@ -173058,6 +173632,7 @@ self: { ]; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testPkg" = callPackage @@ -173534,6 +174109,7 @@ self: { ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lens" = callPackage @@ -173547,6 +174123,7 @@ self: { homepage = "https://github.com/ChrisPenner/rasa"; description = "Lenses for operating over text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lips" = callPackage @@ -173563,6 +174140,7 @@ self: { homepage = "https://github.com/mvv/text-lips"; description = "Monadic parsing combinator library with attention to locations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-loc" = callPackage @@ -173618,6 +174196,7 @@ self: { homepage = "https://github.com/jtdaugherty/text-markup/"; description = "A data structure for mapping metadata to text subsequences"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-metrics" = callPackage @@ -174959,6 +175538,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "threepenny-gui-flexbox" = callPackage + ({ mkDerivation, base, clay, text, threepenny-gui }: + mkDerivation { + pname = "threepenny-gui-flexbox"; + version = "0.3.0.2"; + sha256 = "cd38f3ca7672d3f418ec1c9c93e00563178177e407f0013ee3b2eb7f8c00ed2d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base clay text threepenny-gui ]; + executableHaskellDepends = [ base threepenny-gui ]; + homepage = "https://github.com/barischj/threepenny-gui-flexbox"; + description = "Flexbox layouts for Threepenny-gui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thrift" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network @@ -177392,7 +177987,8 @@ self: { description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {effect-interpreters = null;}; "transformers-free" = callPackage ({ mkDerivation, base, transformers }: @@ -177802,6 +178398,7 @@ self: { ]; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trifecta" = callPackage @@ -178246,6 +178843,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Homogeneous tuples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tuple" = callPackage @@ -178569,6 +179167,7 @@ self: { libraryHaskellDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-graphs" = callPackage @@ -178936,6 +179535,7 @@ self: { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -179002,6 +179602,7 @@ self: { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -179018,6 +179619,7 @@ self: { homepage = "https://github.com/himura/twitter-types-lens"; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -180184,6 +180786,7 @@ self: { homepage = "https://github.com/kqr/udp-conduit#readme"; description = "Simple fire-and-forget conduit UDP wrappers"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uglymemo" = callPackage @@ -180280,6 +180883,7 @@ self: { homepage = "https://github.com/hvr/uhttpc"; description = "Minimal HTTP client library optimized for benchmarking"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ui-command" = callPackage @@ -180775,6 +181379,7 @@ self: { homepage = "http://github.com/nushio3/unicode-show#readme"; description = "print and show in unicode"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-symbols" = callPackage @@ -181856,6 +182461,7 @@ self: { homepage = "https://github.com/expipiplus1/update-nix-fetchgit#readme"; description = "A program to update fetchgit values in Nix expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "update-repos" = callPackage @@ -183476,6 +184082,7 @@ self: { homepage = "http://github.com/bergey/vcatt"; description = "Recursively check that a directory is under version control"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcd" = callPackage @@ -184855,6 +185462,7 @@ self: { homepage = "https://github.com/coreyoconnor/vty"; description = "Examples programs using the vty library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-menu" = callPackage @@ -185536,6 +186144,7 @@ self: { homepage = "https://github.com/soenkehahn/wai-make-assets#readme"; description = "Compiling and serving assets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-auth" = callPackage @@ -186920,6 +187529,7 @@ self: { homepage = "http://hub.darcs.net/ertes/web-page"; description = "Monoidally construct web pages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-plugins" = callPackage @@ -187360,6 +187970,7 @@ self: { homepage = "http://hub.darcs.net/fr33domlover/webfinger-client"; description = "WebFinger client library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webidl" = callPackage @@ -187637,6 +188248,7 @@ self: { ]; description = "Wedged postcard generator"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weigh" = callPackage @@ -187666,6 +188278,7 @@ self: { homepage = "https://github.com/oisdk/weighted"; description = "Writer monad which uses semiring constraint"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weighted-regexp" = callPackage @@ -187758,6 +188371,7 @@ self: { homepage = "https://github.com/hjwylde/werewolf"; description = "A game engine for playing werewolf within an arbitrary chat client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "werewolf-slack" = callPackage @@ -187778,6 +188392,7 @@ self: { homepage = "https://github.com/hjwylde/werewolf-slack"; description = "A chat interface for playing werewolf in Slack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wheb-mongo" = callPackage @@ -187829,6 +188444,7 @@ self: { homepage = "https://github.com/davnils/while-lang-parser"; description = "Parser for the While language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "whim" = callPackage @@ -188700,6 +189316,7 @@ self: { homepage = "https://github.com/stackbuilders/workdays"; description = "Workday calculations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "workflow-osx" = callPackage @@ -188939,6 +189556,7 @@ self: { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wreq-stringless" = callPackage @@ -189752,6 +190370,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xeno" = callPackage + ({ mkDerivation, array, base, bytestring, criterion, deepseq + , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector + , weigh, xml + }: + mkDerivation { + pname = "xeno"; + version = "0.1"; + sha256 = "e61e9ca39c0d5dfcdb8bc785a4807d1b8469866a239562b757d9b3c6718de2d5"; + libraryHaskellDepends = [ + array base bytestring deepseq mtl mutable-containers vector + ]; + testHaskellDepends = [ base bytestring hexml hspec ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml + ]; + homepage = "https://github.com/ocramz/xeno"; + description = "A fast event-based XML parser in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xenstore" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, network }: mkDerivation { @@ -190656,6 +191295,7 @@ self: { homepage = "https://github.com/lancelet/xml-tydom"; description = "Typed XML encoding for an xml-conduit backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-tydom-core" = callPackage @@ -190971,6 +191611,7 @@ self: { homepage = "http://xmonad.org/"; description = "Third party extensions for xmonad"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-entryhelper" = callPackage @@ -191074,6 +191715,7 @@ self: { homepage = "https://github.com/vmchale/xmonad-vanessa#readme"; description = "Custom xmonad, which uses stack and sets various defaults"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-wallpaper" = callPackage @@ -191085,6 +191727,7 @@ self: { libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-windownames" = callPackage @@ -191254,6 +191897,7 @@ self: { homepage = "https://github.com/danchoi/xpathdsv#readme"; description = "Command line tool to extract DSV data from HTML and XML with XPATH expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xsact" = callPackage @@ -191494,6 +192138,7 @@ self: { homepage = "https://github.com/cdepillabout/yahoo-finance-api"; description = "Read quotes from Yahoo Finance API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-conduit" = callPackage @@ -191898,6 +192543,7 @@ self: { ]; description = "Yet another array library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yarr-image-io" = callPackage @@ -192262,6 +192908,7 @@ self: { testHaskellDepends = [ base hlint hspec text yesod yesod-test ]; description = "Yesod Middleware for HTTP Basic Authentication"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-bcrypt" = callPackage @@ -192455,6 +193102,7 @@ self: { homepage = "http://www.yesodweb.com/"; description = "OAuth Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-oauth2" = callPackage @@ -192478,6 +193126,7 @@ self: { homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-pam" = callPackage @@ -193018,6 +193667,7 @@ self: { homepage = "https://github.com/prowdsponsor/yesod-fb"; description = "Useful glue functions between the fb library and Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form" = callPackage @@ -193285,6 +193935,7 @@ self: { homepage = "https://github.com/mgsloan/yesod-media-simple"; description = "Simple display of media types, served by yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-newsfeed" = callPackage @@ -193369,6 +194020,7 @@ self: { ]; description = "Yesod plugin to use PayPal with the paypal-rest-client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-persistent" = callPackage @@ -193646,6 +194298,7 @@ self: { homepage = "https://github.com/prowdsponsor/yesod-recaptcha"; description = "Dead simple support for reCAPTCHA on Yesod applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes" = callPackage @@ -194009,6 +194662,7 @@ self: { ]; description = "Yesod support for Text.Markdown."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-tls" = callPackage @@ -194211,6 +194865,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -194537,6 +195192,7 @@ self: { homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-rope" = callPackage @@ -194591,6 +195247,7 @@ self: { homepage = "https://github.com/NorfairKing/yi-solarized"; description = "Solarized colour theme for the Yi text editor"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-spolsky" = callPackage @@ -194846,6 +195503,7 @@ self: { homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yuiGrid" = callPackage @@ -195676,6 +196334,7 @@ self: { libraryHaskellDepends = [ base lens stm ]; description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zot" = callPackage @@ -195727,6 +196386,7 @@ self: { homepage = "https://github.com/facebookexperimental/hs-zstd"; description = "Haskell bindings to the Zstandard compression algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ztail" = callPackage From b923fd5253d797b95b2ce617217954416d827d66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Mar 2017 12:17:36 +0100 Subject: [PATCH 254/274] git-annex 6.20170301.1 tarballs are no longer available anywhere; now we must use fetchgit --- .../haskell-modules/configuration-common.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index db9a8d57398..bbd02b4dc9f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -59,14 +59,13 @@ self: super: { # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; - # The Hackage tarball is purposefully broken. Mr. Hess wants people to build - # his package from the Git repo because that is, like, better! + # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. + # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ git-annex = ((overrideCabal super.git-annex (drv: { - src = pkgs.fetchFromGitHub { - owner = "joeyh"; - repo = "git-annex"; - sha256 = "0f79i2i1cr8j02vc4ganw92prbkv9ca1yl9jgkny0rxf28wdlc6v"; - rev = drv.version; + src = pkgs.fetchgit { + url = "git://git-annex.branchable.com/"; + rev = "refs/tags/" + drv.version; + sha256 = "0irvzwpwxxdy6qs7jj81r6qk7i1gkkqyaza4wcm0phyyn07yh2sz"; }; }))).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From cb13a8c5f839da09c67020b346f899d762d4c75e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 3 Mar 2017 00:20:19 +0300 Subject: [PATCH 255/274] openspades: 0.0.12 -> 0.1.1b Remove openspades-git, it's not needed now that there was a release. --- pkgs/games/openspades/default.nix | 58 ++++++++++++++----------------- pkgs/games/openspades/git.nix | 48 ------------------------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 27 insertions(+), 83 deletions(-) delete mode 100644 pkgs/games/openspades/git.nix diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 0438b687a1b..02e4e9c608f 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,49 +1,43 @@ -{ stdenv, lib, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2, - SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }: - -assert withOpenal -> openal != null; +{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file +, curl, glew , mesa_noglu, SDL2, SDL2_image, zlib, freetype, imagemagick +, openal , opusfile, libogg +}: stdenv.mkDerivation rec { name = "openspades-${version}"; - version = "0.0.12"; + version = "0.1.1b"; + devPakVersion = "33"; - src = fetchurl { - url = "https://github.com/yvt/openspades/archive/v${version}.tar.gz"; - sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm"; + src = fetchFromGitHub { + owner = "yvt"; + repo = "openspades"; + rev = "v${version}"; + sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn"; }; - # https://github.com/yvt/openspades/issues/354 - postPatch = '' - substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan(" - substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan(" - substituteInPlace Sources/Draw/SWMapRenderer.cpp \ - --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf(" - sed '1i#include ' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \ - -i Sources/Draw/SWMapRenderer.cpp - sed '1i#include ' -i Sources/Draw/SWFeatureLevel.h - ''; + nativeBuildInputs = [ cmake imagemagick unzip zip file ]; - nativeBuildInputs = - [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] - ++ lib.optional withOpenal openal; + buildInputs = [ + freetype SDL2 SDL2_image mesa_noglu zlib curl glew opusfile openal libogg + ]; cmakeFlags = [ "-DOPENSPADES_INSTALL_BINARY=bin" - "-DOPENSPADES_RESOURCES=NO" ]; + devPak = fetchurl { + url = "https://github.com/yvt/openspades-paks/releases/download/r${devPakVersion}/OpenSpadesDevPackage-r${devPakVersion}.zip"; + sha256 = "1bd2fyn7mlxa3xnsvzj08xjzw02baimqvmnix07blfhb78rdq9q9"; + }; + + postPatch = '' + sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh + patchShebangs Resources + ''; + enableParallelBuilding = true; - devPack = fetchurl { - url = "http://yvt.jp/files/programs/osppaks/DevPaks27.zip"; - sha256 = "05y7wldg70v5ys41fm0c8kipyspn524z4pglwr3p8h0gfz9n52v6"; - }; - - preBuild = '' - unzip -u -o $devPack -d Resources/DevPak - ''; - - NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal"; + NIX_CFLAGS_LINK = [ "-lopenal" ]; meta = with stdenv.lib; { description = "A compatible client of Ace of Spades 0.75"; diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix deleted file mode 100644 index 9e3d4ac5b64..00000000000 --- a/pkgs/games/openspades/git.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, curl, glew, makeWrapper, mesa, SDL2, - SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }: - -assert withOpenal -> openal != null; - -stdenv.mkDerivation rec { - name = "openspades-${version}"; - version = "2016-04-17"; - - src = fetchFromGitHub { - owner = "yvt"; - repo = "openspades"; - rev = "cadc0b6a57fbee05abcaf42d15664502c94b58cf"; - sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn"; - }; - - postPatch = "sed '1i#include ' -i Sources/Client/{,Client}Player.cpp"; - - nativeBuildInputs = - with stdenv.lib; - [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] - ++ lib.optional withOpenal openal; - - cmakeFlags = [ - "-DOPENSPADES_INSTALL_BINARY=bin" - "-DOPENSPADES_RESOURCES=NO" - ]; - - #enableParallelBuilding = true; - - devPack = fetchurl { - url = "http://yvt.jp/files/programs/osppaks/DevPaks29.zip"; - sha256 = "1fhwxm6wifg0l3ykmiiqa1h4ch5ika2kw2j0v9xnrz24cabsi6cc"; - }; - - preBuild = '' - unzip -u -o $devPack -d Resources/DevPak - ''; - - NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal"; - - meta = with stdenv.lib; { - description = "A compatible client of Ace of Spades 0.75"; - homepage = "https://github.com/yvt/openspades/"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f1968ebf40..3f2bfc5bda0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16493,9 +16493,7 @@ with pkgs; openrw = callPackage ../games/openrw { }; - openspades = callPackage ../games/openspades {}; - - openspades-git = lowPrio (callPackage ../games/openspades/git.nix {}); + openspades = callPackage ../games/openspades { }; openttd = callPackage ../games/openttd { zlib = zlibStatic; From 1254f1a46a56aba571eaa4fe636a1593631eeb25 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Mar 2017 00:21:47 +0200 Subject: [PATCH 256/274] gf2x: Disable i686 build http://hydra.nixos.org/build/49552136/nixlog/3/raw --- pkgs/development/libraries/gf2x/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index feba97f4da4..7ab06afdad6 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "gf2x-${version}"; version = "1.1"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "http://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz"; sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd"; }; - buildInputs = []; + meta = { - inherit version; description = ''Routines for fast arithmetic in GF(2)[x]''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux"]; }; } From 33e23934a7b2ff57f20fb0ff308dd92e868a82e8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 2 Mar 2017 13:51:01 +0100 Subject: [PATCH 257/274] synthv1: 0.7.6 -> 0.8.0 --- pkgs/applications/audio/synthv1/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 4050675e51f..c7932a132d7 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, qt5, libjack2, alsaLib, liblo, lv2 }: +{ stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }: stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.7.6"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "03vnmmiyq92p2gh4zax1vg2lx6y57bsxch936pzbiwx649x53wi9"; + sha256 = "155pfyhr6d35ciw95pbxlqy7751cmij8j5d849rvblqbjzyzb5qx"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; + nativeBuildInputs = [ pkgconfig ]; + meta = with stdenv.lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; homepage = http://synthv1.sourceforge.net/; From 5e267f657da817bb3ef16c4c1030aac0bfe49735 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 2 Mar 2017 16:25:07 -0600 Subject: [PATCH 258/274] llvm4.0: rc2 -> rc3 Also add myself to maintainers for LLVM. --- pkgs/development/compilers/llvm/4.0/clang/default.nix | 2 +- pkgs/development/compilers/llvm/4.0/default.nix | 6 +++--- pkgs/development/compilers/llvm/4.0/libc++/default.nix | 4 ++-- pkgs/development/compilers/llvm/4.0/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/4.0/lld.nix | 2 +- pkgs/development/compilers/llvm/4.0/lldb.nix | 2 +- pkgs/development/compilers/llvm/4.0/llvm.nix | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4.0/clang/default.nix index f566cd6d21c..5be8ffd91cf 100644 --- a/pkgs/development/compilers/llvm/4.0/clang/default.nix +++ b/pkgs/development/compilers/llvm/4.0/clang/default.nix @@ -6,7 +6,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "1p55db1yfya60r2fnr9bh8pj8fqq5gjc1fnv0c1kmac8yfvwkmkn"} + unpackFile ${fetch "cfe" "1lsdyrz82vyrsc7k0ah1zmzzan61s5kakxrkxgfbmklp3pclfkwp"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4.0/default.nix index f407b2cdc9f..349545a2959 100644 --- a/pkgs/development/compilers/llvm/4.0/default.nix +++ b/pkgs/development/compilers/llvm/4.0/default.nix @@ -3,7 +3,7 @@ let callPackage = newScope (self // { inherit stdenv isl release_version version fetch; }); release_version = "4.0.0"; - rc = "rc2"; + rc = "rc3"; version = "${release_version}${rc}"; fetch = name: sha256: fetchurl { @@ -13,8 +13,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "07i098rj41h1sq2f30d6161924zr5yd9gx5kans79p7akxxgc0jr"; - clang-tools-extra_src = fetch "clang-tools-extra" "0ypvkv55pw88iaixib29sgz44d4pfs166vpswnrrbkqlhz92ns0z"; + compiler-rt_src = fetch "compiler-rt" "0jfqhz95cp15c5688c6l9mr12s0qp86milpcrjlc93dc2jy08ba5"; + clang-tools-extra_src = fetch "clang-tools-extra" "1c9c507w3f5vm153rdd0kmzvv2ski6z439izk01zf5snfwkqxkq8"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4.0/libc++/default.nix index 9f950e601b2..57e064fb79a 100644 --- a/pkgs/development/compilers/llvm/4.0/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4.0/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "130clvfffqml8hbnlvr596nfjk18n6ifxab27xl66nxhq99wccfn"; + src = fetch "libcxx" "15l6bcmwczspbqcq4m2lmzb23g11axr9m8dayn25iys26nn00q43"; postUnpack = '' unpackFile ${libcxxabi.src} @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; patchPhase = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" + substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" ''; buildInputs = [ cmake llvm libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4.0/libc++abi.nix index 362663ed443..fc1a6d84caa 100644 --- a/pkgs/development/compilers/llvm/4.0/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4.0/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "09hlqlbxpnqi3449nrk43khp4jgd34xwx406mw6igwl8a673pa85"; + src = fetch "libcxxabi" "1frj1wz780xcwq77icfclnw6q4c8bkkdzkqsrmfjv9963kjylsy5"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4.0/lld.nix index 004230ca81a..7fe08cb0262 100644 --- a/pkgs/development/compilers/llvm/4.0/lld.nix +++ b/pkgs/development/compilers/llvm/4.0/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "144vmb13800s33xgd18321lrviw21mjx5dphzszjgvizn4a1sf1p"; + src = fetch "lld" "0kmyp7iyf4f76wgy87jczkyhvzhlwfydvxgggl74z0x89xgry745"; buildInputs = [ cmake llvm ]; diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4.0/lldb.nix index f37e6fdfafc..23667e6afcd 100644 --- a/pkgs/development/compilers/llvm/4.0/lldb.nix +++ b/pkgs/development/compilers/llvm/4.0/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0g3il7bz1b0xbcm85c6r64vgn8ppxigi1s39s3xzga4pkllf7k07"; + src = fetch "lldb" "1qr0ky7llwgjgx1pzkp3pnz32nb6f7lvg8qg6rp5axhgpkx54hz7"; patchPhase = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4.0/llvm.nix index d54390e5ee8..2d36f7cd0fb 100644 --- a/pkgs/development/compilers/llvm/4.0/llvm.nix +++ b/pkgs/development/compilers/llvm/4.0/llvm.nix @@ -21,7 +21,7 @@ }: let - src = fetch "llvm" "1qfvvblca2aa5shamz66132k30hmpq2mkpfn172xzzlm6znzlmr2"; + src = fetch "llvm" "0ic3y9gaissi6ixyj9x1c0pq69wfbl2svhprp33av0b58f7wj9v7"; shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; platforms = stdenv.lib.platforms.all; }; } From 6f6c06adc1c0338e0125e7d5785b43223493f114 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 2 Mar 2017 16:51:32 -0600 Subject: [PATCH 259/274] llvm4.0: Rename "4.0" (and _40) to "4" (and _4). This reflects upstream versioning change, and allows us to replace 4.0 with 4.1 (which is now a minor revision) without changing the attribute name. Thanks to @vcunat for the idea. --- .../compilers/llvm/{4.0 => 4}/clang/default.nix | 0 .../compilers/llvm/{4.0 => 4}/clang/purity.patch | 0 pkgs/development/compilers/llvm/{4.0 => 4}/default.nix | 2 +- .../compilers/llvm/{4.0 => 4}/libc++/default.nix | 0 .../compilers/llvm/{4.0 => 4}/libc++/setup-hook.sh | 0 pkgs/development/compilers/llvm/{4.0 => 4}/libc++abi.nix | 0 pkgs/development/compilers/llvm/{4.0 => 4}/lld.nix | 0 pkgs/development/compilers/llvm/{4.0 => 4}/lldb.nix | 0 .../compilers/llvm/{4.0 => 4}/llvm-outputs.patch | 0 pkgs/development/compilers/llvm/{4.0 => 4}/llvm.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++---- 11 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/compilers/llvm/{4.0 => 4}/clang/default.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/clang/purity.patch (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/default.nix (96%) rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++/default.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++/setup-hook.sh (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++abi.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/lld.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/lldb.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/llvm-outputs.patch (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/llvm.nix (100%) diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/clang/default.nix rename to pkgs/development/compilers/llvm/4/clang/default.nix diff --git a/pkgs/development/compilers/llvm/4.0/clang/purity.patch b/pkgs/development/compilers/llvm/4/clang/purity.patch similarity index 100% rename from pkgs/development/compilers/llvm/4.0/clang/purity.patch rename to pkgs/development/compilers/llvm/4/clang/purity.patch diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4/default.nix similarity index 96% rename from pkgs/development/compilers/llvm/4.0/default.nix rename to pkgs/development/compilers/llvm/4/default.nix index 349545a2959..cbb3852057d 100644 --- a/pkgs/development/compilers/llvm/4.0/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -8,7 +8,7 @@ let fetch = name: sha256: fetchurl { url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz"; - # Once 4.0 is released, use this instead: + # Once 4 is released, use this instead: # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/libc++/default.nix rename to pkgs/development/compilers/llvm/4/libc++/default.nix diff --git a/pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh rename to pkgs/development/compilers/llvm/4/libc++/setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/libc++abi.nix rename to pkgs/development/compilers/llvm/4/libc++abi.nix diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/lld.nix rename to pkgs/development/compilers/llvm/4/lld.nix diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/lldb.nix rename to pkgs/development/compilers/llvm/4/lldb.nix diff --git a/pkgs/development/compilers/llvm/4.0/llvm-outputs.patch b/pkgs/development/compilers/llvm/4/llvm-outputs.patch similarity index 100% rename from pkgs/development/compilers/llvm/4.0/llvm-outputs.patch rename to pkgs/development/compilers/llvm/4/llvm-outputs.patch diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/llvm.nix rename to pkgs/development/compilers/llvm/4/llvm.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f1968ebf40..75fef2685a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4759,7 +4759,7 @@ with pkgs; clang = llvmPackages.clang; - clang_40 = lowPrio llvmPackages_40.clang; + clang_4 = lowPrio llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; @@ -5314,13 +5314,13 @@ with pkgs; lizardfs = callPackage ../tools/filesystems/lizardfs { }; - lld = lowPrio llvmPackages_40.lld; + lld = lowPrio llvmPackages_4.lld; lldb = llvmPackages.lldb; llvm = llvmPackages.llvm; - llvm_40 = lowPrio llvmPackages_40.llvm; + llvm_4 = lowPrio llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; @@ -5358,7 +5358,7 @@ with pkgs; inherit (stdenvAdapters) overrideCC; }; - llvmPackages_40 = callPackage ../development/compilers/llvm/4.0 { + llvmPackages_4 = callPackage ../development/compilers/llvm/4 { inherit (stdenvAdapters) overrideCC; }; From 3f116702cc1242e34d008a8f1793e6f542e79472 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 3 Mar 2017 01:33:18 +0000 Subject: [PATCH 260/274] buildbot-master module: fix overly restrictive option type for masterCfg --- .../modules/services/continuous-integration/buildbot/master.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 512e09eb804..f638cf4bae3 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -66,7 +66,7 @@ in { }; masterCfg = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' Optionally pass raw master.cfg file as string. Other options in this configuration will be ignored. From 09a593b3de8e66084def281e205afff7d53e28e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Mar 2017 22:58:23 +0100 Subject: [PATCH 261/274] Drop obsolete, unmaintained haskell.packages.lts-x_y package sets. Stack no longer uses them since a long time: https://github.com/commercialhaskell/stack/issues/2259. --- pkgs/top-level/haskell-packages.nix | 128 ---------------------------- 1 file changed, 128 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6f07c129322..b4226e656fd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -182,133 +182,5 @@ in rec { }; }); - # These attributes exist only for backwards-compatibility so that we don't break - # stack's --nix support. These attributes will disappear in the foreseeable - # future: https://github.com/commercialhaskell/stack/issues/2259. - - lts-0_0 = packages.ghc783; - lts-0_1 = packages.ghc783; - lts-0_2 = packages.ghc783; - lts-0_3 = packages.ghc783; - lts-0_4 = packages.ghc783; - lts-0_5 = packages.ghc783; - lts-0_6 = packages.ghc783; - lts-0_7 = packages.ghc783; - lts-0 = packages.lts-0_7; - - lts-1_0 = packages.ghc784; - lts-1_1 = packages.ghc784; - lts-1_2 = packages.ghc784; - lts-1_4 = packages.ghc784; - lts-1_5 = packages.ghc784; - lts-1_7 = packages.ghc784; - lts-1_8 = packages.ghc784; - lts-1_9 = packages.ghc784; - lts-1_10 =packages.ghc784; - lts-1_11 =packages.ghc784; - lts-1_12 =packages.ghc784; - lts-1_13 =packages.ghc784; - lts-1_14 =packages.ghc784; - lts-1_15 =packages.ghc784; - lts-1 = packages.lts-1_15; - - lts-2_0 = packages.ghc784; - lts-2_1 = packages.ghc784; - lts-2_2 = packages.ghc784; - lts-2_3 = packages.ghc784; - lts-2_4 = packages.ghc784; - lts-2_5 = packages.ghc784; - lts-2_6 = packages.ghc784; - lts-2_7 = packages.ghc784; - lts-2_8 = packages.ghc784; - lts-2_9 = packages.ghc784; - lts-2_10 = packages.ghc784; - lts-2_11 = packages.ghc784; - lts-2_12 = packages.ghc784; - lts-2_13 = packages.ghc784; - lts-2_14 = packages.ghc784; - lts-2_15 = packages.ghc784; - lts-2_16 = packages.ghc784; - lts-2_17 = packages.ghc784; - lts-2_18 = packages.ghc784; - lts-2_19 = packages.ghc784; - lts-2_20 = packages.ghc784; - lts-2_21 = packages.ghc784; - lts-2_22 = packages.ghc784; - lts-2 = packages.lts-2_22; - - lts-3_0 = packages.ghc7102; - lts-3_1 = packages.ghc7102; - lts-3_2 = packages.ghc7102; - lts-3_3 = packages.ghc7102; - lts-3_4 = packages.ghc7102; - lts-3_5 = packages.ghc7102; - lts-3_6 = packages.ghc7102; - lts-3_7 = packages.ghc7102; - lts-3_8 = packages.ghc7102; - lts-3_9 = packages.ghc7102; - lts-3_10 = packages.ghc7102; - lts-3_11 = packages.ghc7102; - lts-3_12 = packages.ghc7102; - lts-3_13 = packages.ghc7102; - lts-3_14 = packages.ghc7102; - lts-3_15 = packages.ghc7102; - lts-3_16 = packages.ghc7102; - lts-3_17 = packages.ghc7102; - lts-3_18 = packages.ghc7102; - lts-3_19 = packages.ghc7102; - lts-3_20 = packages.ghc7102; - lts-3 = packages.lts-3_20; - - lts-4_0 = packages.ghc7103; - lts-4_1 = packages.ghc7103; - lts-4_2 = packages.ghc7103; - lts-4 = packages.lts-4_2; - - lts-5_0 = packages.ghc7103; - lts-5_1 = packages.ghc7103; - lts-5_2 = packages.ghc7103; - lts-5_3 = packages.ghc7103; - lts-5_4 = packages.ghc7103; - lts-5_5 = packages.ghc7103; - lts-5_6 = packages.ghc7103; - lts-5_7 = packages.ghc7103; - lts-5_8 = packages.ghc7103; - lts-5_9 = packages.ghc7103; - lts-5_10 = packages.ghc7103; - lts-5_11 = packages.ghc7103; - lts-5_12 = packages.ghc7103; - lts-5_13 = packages.ghc7103; - lts-5_14 = packages.ghc7103; - lts-5_15 = packages.ghc7103; - lts-5_16 = packages.ghc7103; - lts-5_17 = packages.ghc7103; - lts-5_18 = packages.ghc7103; - lts-5 = packages.lts-5_18; - - lts-6_0 = packages.ghc7103; - lts-6_1 = packages.ghc7103; - lts-6_2 = packages.ghc7103; - lts-6_3 = packages.ghc7103; - lts-6_4 = packages.ghc7103; - lts-6_5 = packages.ghc7103; - lts-6_6 = packages.ghc7103; - lts-6_7 = packages.ghc7103; - lts-6_8 = packages.ghc7103; - lts-6_9 = packages.ghc7103; - lts-6_10 = packages.ghc7103; - lts-6_11 = packages.ghc7103; - lts-6_12 = packages.ghc7103; - lts-6_13 = packages.ghc7103; - lts-6_14 = packages.ghc7103; - lts-6_15 = packages.ghc7103; - lts-6_16 = packages.ghc7103; - lts-6_17 = packages.ghc7103; - lts-6 = packages.lts-6_17; - - lts-7_0 = packages.ghc801; - lts-7 = packages.lts-7_0; - - lts = packages.lts-7; }; } From 39488911128ad5d5df0b549baf53840dedfc6d21 Mon Sep 17 00:00:00 2001 From: Alexander Kirchhoff Date: Fri, 3 Mar 2017 00:17:01 -0800 Subject: [PATCH 262/274] pam_ssh_agent_auth: Re-allow multiple authorized keys files This functionality was initially introduced in 3644f9124aaf35f2ad7b17cd05df19226d4e4d1c to fix https://github.com/NixOS/nixos/pull/52, but was broken in the update from 0.9.5 to 0.10.3. The original patch does not cleanly apply due to reformatting and parameter changes upstream, but the adaptations of the patch to the new version are not too severe. --- .../linux/pam_ssh_agent_auth/default.nix | 6 + .../multiple-key-files.patch | 365 ++++++++++++++++++ 2 files changed, 371 insertions(+) create mode 100644 pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 9ce1ef6ae53..48c02be9c38 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw"; }; + patches = + [ # Allow multiple colon-separated authorized keys files to be + # specified in the file= option. + ./multiple-key-files.patch + ]; + buildInputs = [ pam openssl perl ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch new file mode 100644 index 00000000000..190325251c9 --- /dev/null +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch @@ -0,0 +1,365 @@ +diff -u pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.c pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c +--- pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.c 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c 2017-03-02 23:47:18.012203283 -0800 +@@ -176,7 +176,7 @@ + return; + } + +-int ++const char * + pamsshagentauth_find_authorized_keys(const char * user, const char * ruser, const char * servicename) + { + Buffer session_id2 = { 0 }; +@@ -184,7 +184,7 @@ + Key *key; + AuthenticationConnection *ac; + char *comment; +- uint8_t retval = 0; ++ const char *key_file = 0; + uid_t uid = getpwnam(ruser)->pw_uid; + + OpenSSL_add_all_digests(); +@@ -199,13 +199,11 @@ + id->key = key; + id->filename = comment; + id->ac = ac; +- if(userauth_pubkey_from_id(ruser, id, &session_id2)) { +- retval = 1; +- } ++ key_file = userauth_pubkey_from_id(ruser, id, &session_id2); + pamsshagentauth_xfree(id->filename); + pamsshagentauth_key_free(id->key); + pamsshagentauth_xfree(id); +- if(retval == 1) ++ if(key_file) + break; + } + } +@@ -217,5 +215,5 @@ + } + /* pamsshagentauth_xfree(session_id2); */ + EVP_cleanup(); +- return retval; ++ return key_file; + } +diff -u pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.h pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.h +--- pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.h 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.h 2017-03-02 23:48:06.345803339 -0800 +@@ -31,6 +31,6 @@ + #ifndef _ITERATE_SSH_AGENT_KEYS_H + #define _ITERATE_SSH_AGENT_KEYS_H + +-int pamsshagentauth_find_authorized_keys(const char * user, const char * ruser, const char * servicename); ++const char * pamsshagentauth_find_authorized_keys(const char * user, const char * ruser, const char * servicename); + + #endif +diff -u pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.c +--- pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.c 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.c 2017-03-02 23:51:57.642669946 -0800 +@@ -61,7 +61,6 @@ + #define strncasecmp_literal(A,B) strncasecmp( A, B, sizeof(B) - 1) + #define UNUSED(expr) do { (void)(expr); } while (0) + +-char *authorized_keys_file = NULL; + uint8_t allow_user_owned_authorized_keys_file = 0; + char *authorized_keys_command = NULL; + char *authorized_keys_command_user = NULL; +@@ -171,15 +170,13 @@ + goto cleanexit; + } + +- if(authorized_keys_file_input && user) { +- /* +- * user is the name of the target-user, and so must be used for validating the authorized_keys file +- */ +- parse_authorized_key_file(user, authorized_keys_file_input); +- } else { +- pamsshagentauth_verbose("Using default file=/etc/security/authorized_keys"); +- authorized_keys_file = pamsshagentauth_xstrdup("/etc/security/authorized_keys"); +- } ++ if (!authorized_keys_file_input || !user) ++ authorized_keys_file_input = "/etc/security/authorized_keys"; ++ ++ /* ++ * user is the name of the target-user, and so must be used for validating the authorized_keys file ++ */ ++ parse_authorized_key_files(user, authorized_keys_file_input); + + /* + * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter. +@@ -187,16 +184,17 @@ + */ + + if(user && strlen(ruser) > 0) { +- pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); + + /* + * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user + */ +- if(pamsshagentauth_find_authorized_keys(user, ruser, servicename)) { /* getpwnam(ruser)->pw_uid)) { */ +- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ const char *key_file; ++ if((key_file = pamsshagentauth_find_authorized_keys(user, ruser, servicename))) { /* getpwnam(ruser)->pw_uid)) { */ ++ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file); + retval = PAM_SUCCESS; + } else { +- pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); + } + } else { + pamsshagentauth_logit("No %s specified, cannot continue with this form of authentication", (user) ? "ruser" : "user" ); +@@ -208,7 +206,7 @@ + free(__progname); + #endif + +- free(authorized_keys_file); ++ free_authorized_key_files(); + + return retval; + } +diff -u pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.pod pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.pod +--- pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.pod 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.pod 2017-03-02 23:52:28.914857449 -0800 +@@ -31,7 +31,7 @@ + + =item file= + +-Specify the path to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below) ++Specify the path(s) to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below). Paths are separated using colons. + + =item allow_user_owned_authorized_keys_file + +diff -u pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.c pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.c +--- pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.c 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.c 2017-03-03 00:07:45.201322570 -0800 +@@ -79,8 +79,12 @@ + + #include "identity.h" + #include "pam_user_key_allowed2.h" ++#include "pam_user_authorized_keys.h" + +-extern char *authorized_keys_file; ++#define MAX_AUTHORIZED_KEY_FILES 16 ++ ++char *authorized_keys_files[MAX_AUTHORIZED_KEY_FILES]; ++unsigned int nr_authorized_keys_files = 0; + + extern char *authorized_keys_command; + +@@ -91,79 +95,88 @@ + uid_t authorized_keys_file_allowed_owner_uid; + + void +-parse_authorized_key_file(const char *user, +- const char *authorized_keys_file_input) ++parse_authorized_key_files(const char *user, ++ const char *authorized_keys_file_input) + { +- char fqdn[HOST_NAME_MAX] = ""; ++ const char *pos = authorized_keys_file_input; + char hostname[HOST_NAME_MAX] = ""; +- char auth_keys_file_buf[4096] = ""; +- char *slash_ptr = NULL; +- char owner_uname[128] = ""; +- size_t owner_uname_len = 0; +- +- /* +- * temporary copy, so that both tilde expansion and percent expansion both +- * get to apply to the path +- */ +- strncat(auth_keys_file_buf, authorized_keys_file_input, +- sizeof(auth_keys_file_buf) - 1); ++ char fqdn[HOST_NAME_MAX] = ""; + +- if(allow_user_owned_authorized_keys_file) +- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++#if HAVE_GETHOSTNAME ++ *hostname = '\0'; ++ gethostname(fqdn, HOST_NAME_MAX); ++ strncat(hostname, fqdn, strcspn(fqdn,".")); ++#endif + +- if(*auth_keys_file_buf == '~') { +- if(*(auth_keys_file_buf + 1) == '/') { +- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ while (pos) { ++ const char *colon = strchr(pos, ':'); ++ char auth_keys_file_buf[4096] = ""; ++ char *slash_ptr = NULL; ++ char owner_uname[128] = ""; ++ size_t owner_uname_len = 0; ++ ++ strncat(auth_keys_file_buf, pos, sizeof(auth_keys_file_buf) - 1); ++ if (colon) { ++ auth_keys_file_buf[colon - pos] = 0; ++ pos = colon + 1; + } else { +- slash_ptr = strchr(auth_keys_file_buf, '/'); +- if(!slash_ptr) +- pamsshagentauth_fatal +- ("cannot expand tilde in path without a `/'"); +- +- owner_uname_len = slash_ptr - auth_keys_file_buf - 1; +- if(owner_uname_len > (sizeof(owner_uname) - 1)) +- pamsshagentauth_fatal("Username too long"); +- +- strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len); +- if(!authorized_keys_file_allowed_owner_uid) +- authorized_keys_file_allowed_owner_uid = +- getpwnam(owner_uname)->pw_uid; ++ pos = 0; ++ } ++ ++ if(allow_user_owned_authorized_keys_file) ++ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ ++ if(*auth_keys_file_buf == '~') { ++ if(*(auth_keys_file_buf+1) == '/') { ++ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ } ++ else { ++ slash_ptr = strchr(auth_keys_file_buf,'/'); ++ if(!slash_ptr) ++ pamsshagentauth_fatal("cannot expand tilde in path without a `/'"); ++ ++ owner_uname_len = slash_ptr - auth_keys_file_buf - 1; ++ if(owner_uname_len > (sizeof(owner_uname) - 1) ) ++ pamsshagentauth_fatal("Username too long"); ++ ++ strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len); ++ if(!authorized_keys_file_allowed_owner_uid) ++ authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid; ++ } ++ char *tmp = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid); ++ strncpy(auth_keys_file_buf, tmp, sizeof(auth_keys_file_buf) - 1 ); ++ pamsshagentauth_xfree(tmp); + } +- authorized_keys_file = +- pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, +- authorized_keys_file_allowed_owner_uid); +- strncpy(auth_keys_file_buf, authorized_keys_file, +- sizeof(auth_keys_file_buf) - 1); +- pamsshagentauth_xfree(authorized_keys_file) /* when we +- percent_expand +- later, we'd step +- on this, so free +- it immediately */ ; +- } + +- if(strstr(auth_keys_file_buf, "%h")) { +- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ if(strstr(auth_keys_file_buf, "%h")) { ++ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ } ++ ++ if (nr_authorized_keys_files >= MAX_AUTHORIZED_KEY_FILES) ++ pamsshagentauth_fatal("Too many authorized key files"); ++ authorized_keys_files[nr_authorized_keys_files++] = ++ pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL); + } +-#if HAVE_GETHOSTNAME +- *hostname = '\0'; +- gethostname(fqdn, HOST_NAME_MAX); +- strncat(hostname, fqdn, strcspn(fqdn, ".")); +-#endif +- authorized_keys_file = +- pamsshagentauth_percent_expand(auth_keys_file_buf, "h", +- getpwnam(user)->pw_dir, "H", hostname, +- "f", fqdn, "u", user, NULL); + } + +-int ++void ++free_authorized_key_files() ++{ ++ unsigned int n; ++ for (n = 0; n < nr_authorized_keys_files; n++) ++ free(authorized_keys_files[n]); ++ nr_authorized_keys_files = 0; ++} ++ ++const char * + pam_user_key_allowed(const char *ruser, Key * key) + { +- return +- pamsshagentauth_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), +- key, authorized_keys_file) +- || pamsshagentauth_user_key_allowed2(getpwuid(0), key, +- authorized_keys_file) +- || pamsshagentauth_user_key_command_allowed2(authorized_keys_command, +- authorized_keys_command_user, +- getpwnam(ruser), key); ++ unsigned int n; ++ for (n = 0; n < nr_authorized_keys_files; n++) { ++ if (pamsshagentauth_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_files[n]) ++ || pamsshagentauth_user_key_allowed2(getpwuid(0), key, authorized_keys_files[n]) ++ || pamsshagentauth_user_key_command_allowed2(authorized_keys_command, authorized_keys_command_user, getpwnam(ruser), key)) ++ return authorized_keys_files[n]; ++ } ++ return 0; + } +diff -u pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.h pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.h +--- pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.h 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.h 2017-03-03 00:09:17.256064914 -0800 +@@ -28,11 +28,12 @@ + */ + + +-#ifndef _PAM_USER_KEY_ALLOWED_H +-#define _PAM_USER_KEY_ALLOWED_H ++#ifndef _PAM_USER_AUTHORIZED_KEYS_H ++#define _PAM_USER_AUTHORIZED_KEYS_H + + #include "identity.h" +-int pam_user_key_allowed(const char *, Key *); +-void parse_authorized_key_file(const char *, const char *); ++const char * pam_user_key_allowed(const char *, Key *); ++void parse_authorized_key_files(const char *, const char *); ++void free_authorized_key_files(); + + #endif +diff -u pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.c pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c +--- pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.c 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c 2017-03-03 00:10:33.163545380 -0800 +@@ -52,7 +52,7 @@ + extern uint8_t session_id_len; + */ + +-int ++const char * + userauth_pubkey_from_id(const char *ruser, Identity * id, Buffer * session_id2) + { + Buffer b = { 0 }; +@@ -60,11 +60,12 @@ + u_char *pkblob = NULL, *sig = NULL; + u_int blen = 0, slen = 0; + int authenticated = 0; ++ const char *key_file; + + pkalg = (char *) key_ssh_name(id->key); + + /* first test if this key is even allowed */ +- if(! pam_user_key_allowed(ruser, id->key)) ++ if(!(key_file = pam_user_key_allowed(ruser, id->key))) + goto user_auth_clean_exit; + + if(pamsshagentauth_key_to_blob(id->key, &pkblob, &blen) == 0) +@@ -97,5 +98,5 @@ + if(pkblob != NULL) + pamsshagentauth_xfree(pkblob); + CRYPTO_cleanup_all_ex_data(); +- return authenticated; ++ return authenticated ? key_file : 0; + } +diff -u pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.h pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.h +--- pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.h 2016-11-12 19:24:32.000000000 -0800 ++++ pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.h 2017-03-03 00:10:59.067046872 -0800 +@@ -32,6 +32,6 @@ + #define _USERAUTH_PUBKEY_FROM_ID_H + + #include +-int userauth_pubkey_from_id(const char *, Identity *, Buffer *); ++const char * userauth_pubkey_from_id(const char *, Identity *, Buffer *); + + #endif From 86a1d6f4aa6dd6b40f8a50fac556165bfb43ce23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 3 Mar 2017 10:21:32 +0100 Subject: [PATCH 263/274] pfixtools: fix build with unbound-1.6.1 --- .../0001-Fix-build-with-unbound-1.6.1.patch | 54 +++++++++++++++++++ pkgs/servers/mail/postfix/pfixtools.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch diff --git a/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch b/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch new file mode 100644 index 00000000000..5de22573ea3 --- /dev/null +++ b/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch @@ -0,0 +1,54 @@ +From bf269dda3c81bb9eaa244b3015d426de38c85ccf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carles=20Pag=C3=A8s?= +Date: Fri, 3 Mar 2017 09:59:09 +0100 +Subject: [PATCH] Fix build with unbound 1.6.1 + +From their changelog: Fix to rename ub_callback_t to ub_callback_type, because POSIX reserves _t typedefs +--- + postlicyd/dns.c | 2 +- + postlicyd/dns.h | 2 +- + postlicyd/spf-proto.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/postlicyd/dns.c b/postlicyd/dns.c +index d8409c2..97f1c4d 100644 +--- a/postlicyd/dns.c ++++ b/postlicyd/dns.c +@@ -123,7 +123,7 @@ static int dns_handler(client_t *event, void *config) + } + + bool dns_resolve(const char *hostname, dns_rrtype_t type, +- ub_callback_t callback, void *data) ++ ub_callback_type callback, void *data) + { + if (_G.ctx == NULL) { + _G.ctx = ub_ctx_create(); +diff --git a/postlicyd/dns.h b/postlicyd/dns.h +index d84de3b..905b924 100644 +--- a/postlicyd/dns.h ++++ b/postlicyd/dns.h +@@ -89,7 +89,7 @@ typedef void (*dns_result_callback_f)(dns_result_t *result, void *data); + */ + __attribute__((nonnull(1,3,4))) + bool dns_resolve(const char *hostname, dns_rrtype_t type, +- ub_callback_t callback, void *data); ++ ub_callback_type callback, void *data); + + /** Fetch the DNS record of the given type. + */ +diff --git a/postlicyd/spf-proto.c b/postlicyd/spf-proto.c +index 31cb0a5..79a2d83 100644 +--- a/postlicyd/spf-proto.c ++++ b/postlicyd/spf-proto.c +@@ -279,7 +279,7 @@ static bool spf_validate_domain(const char* restrict domain) + } + + static bool spf_query(spf_t *spf, const char* query, dns_rrtype_t rtype, +- ub_callback_t cb) ++ ub_callback_type cb) + { + buffer_reset(&_G.query_buffer); + buffer_addstr(&_G.query_buffer, query); +-- +2.12.0 + diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index b17beeb095f..1bbe6f3466b 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation { src = pfixtoolsSrc; + patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; + buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2]; postUnpack = '' From a32a00eb813818daa69e6dbc67f119d4ae527101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 3 Mar 2017 11:45:08 +0100 Subject: [PATCH 264/274] haskellPackages.http-api-data: dontCheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2f4003b56163ebf4b9f0b1ea6ed3c0a974a3fcd7) Signed-off-by: Domen Kožar --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bbd02b4dc9f..dd5d42b8a9f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -867,6 +867,9 @@ self: super: { # https://github.com/dan-t/cabal-lenses/issues/6 cabal-lenses = doJailbreak super.cabal-lenses; + # https://github.com/fizruk/http-api-data/issues/49 + http-api-data = dontCheck super.http-api-data; + # https://github.com/snoyberg/yaml/issues/106 yaml = disableCabalFlag super.yaml "system-libyaml"; From 0f9517eb9e67aabecc4ed90c18216545378c5ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 3 Mar 2017 11:51:12 +0100 Subject: [PATCH 265/274] hexen: mark as broken Does not build and is not maintained. --- pkgs/games/hexen/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix index 9e8d3ce0b8e..7dfb4cf9d3a 100644 --- a/pkgs/games/hexen/default.nix +++ b/pkgs/games/hexen/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { homepage = http://www.libsdl.org/projects/hexen/; description = "Port of Raven Software's popular Hexen 3-D shooter game"; license = stdenv.lib.licenses.free; + broken = true; }; } From 410bba8f9547f00d1d196b3d424f908bf2f2a3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 3 Mar 2017 12:03:50 +0100 Subject: [PATCH 266/274] libbladeRF: fix udev rule location in $out Shell variables in cmakeFlags are not expanded, so the rules instead ended up in `$out/'$out'/etc/udev/rules.d`. --- pkgs/development/libraries/libbladeRF/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index b8a4466c8c3..1411474195d 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Debug" - "-DUDEV_RULES_PATH=$out/etc/udev/rules.d" + "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" "-DBUILD_DOCUMENTATION=ON" ]; From 1f7fe3dc07d76862da17dda37ac4d5190e0ec8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 3 Mar 2017 12:10:09 +0100 Subject: [PATCH 267/274] vbam: fix location of etc in output Shell variables are not expanded in cmakeFlags, so the etc files ended up in `$out/'$out'/etc` instead of the expected `$out/etc`. --- pkgs/misc/emulators/vbam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 82193bc350b..8ef64a11a17 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { "-DCMAKE_BUILD_TYPE='Release'" "-DENABLE_FFMPEG='true'" #"-DENABLE_LINK='true'" currently broken :/ - "-DSYSCONFDIR='$out/etc'" + "-DSYSCONFDIR=etc" ]; meta = { From 75c3f009719b14906548027b7d43149664c122e1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 3 Mar 2017 12:39:00 +0100 Subject: [PATCH 268/274] libclc: fix evaluation --- pkgs/development/libraries/libclc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 9c1acf13243..c5ba65e7b6d 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, llvm_40, clang }: +{ stdenv, fetchFromGitHub, python2, llvm_4, clang }: stdenv.mkDerivation { name = "libclc-2017-02-25"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s"; }; - buildInputs = [ python2 llvm_40 clang ]; + buildInputs = [ python2 llvm_4 clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py From 253d7363981a6f76be8dd99ee7747fb05f513f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 3 Mar 2017 12:43:56 +0100 Subject: [PATCH 269/274] boinc: fix location of /etc in $out Looks like the latest version no longer requires the patch, and the patch instead resulted in /etc files being installed to `$out/$out/etc` instead of `$out/etc` --- pkgs/applications/science/misc/boinc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 53ea9ce7212..54be212b86c 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { libxcb xcbutil ]; - postConfigure = '' - sed -i -e s,/etc,$out/etc, client/scripts/Makefile - ''; - NIX_LDFLAGS = "-lX11"; preConfigure = '' From a8458bb506daf18cd83d9a5e159dbaa67c7592c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 3 Mar 2017 12:57:24 +0100 Subject: [PATCH 270/274] ffcast: remove unnecessary DESTDIR=$out This avoids files being installed to $out/nix/store --- pkgs/tools/X11/ffcast/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index 1e1e3f888c9..3283cea1db5 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-xrectsel" ]; postBuild = '' - make DESTDIR="$out" install + make install ''; meta = with stdenv.lib; { From ac592121b9df83a81d2d90be1c40c2d393689ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 3 Mar 2017 12:57:24 +0100 Subject: [PATCH 271/274] xrectsel: remove unnecessary DESTDIR=$out This avoids files being installed to $out/nix/store --- pkgs/tools/X11/xrectsel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index f38ecab9f11..e54ced714e7 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; postBuild = '' - make DESTDIR="$out" install + make install ''; meta = with stdenv.lib; { From bb9a37a2a56249483cd98ef09c254b78e736af1a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 3 Mar 2017 13:42:31 +0100 Subject: [PATCH 272/274] ikarus: remove unmaintained, only works on 32 bit --- .../science/misc/gplates/default.nix | 4 ++-- pkgs/development/compilers/ikarus/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/compilers/ikarus/default.nix diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index bc5b8060e23..7fa0c3f6865 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal -, proj, boost160, cmake, python2, doxygen, graphviz, gmp }: +, proj, boost159, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { name = "gplates-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost160 cmake python2 + qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost159 cmake python2 doxygen graphviz gmp ]; diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix deleted file mode 100644 index e9bf6c8bb5b..00000000000 --- a/pkgs/development/compilers/ikarus/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, gmp }: - -stdenv.mkDerivation rec { - version = "0.0.3"; - name = "ikarus-${version}"; - - src = fetchurl { - url = "http://launchpad.net/ikarus/0.0/${version}/+download/${name}.tar.gz"; - sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv"; - }; - - buildInputs = [ gmp ]; - - meta = { - description = "Scheme compiler, aiming at R6RS"; - homepage = http://ikarus-scheme.org/; - license = stdenv.lib.licenses.gpl3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34341874e3a..5adbe3eb806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5191,8 +5191,6 @@ with pkgs; inherit (haskellPackages) idris; }; - ikarus = callPackage ../development/compilers/ikarus { }; - intercal = callPackage ../development/compilers/intercal { flex = flex_2_6_1; # Works with 2.5.35 too, but not 2.6.3 }; From d88721e4408988202a0ae3cea3f5551ebfa13168 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 14 Feb 2017 23:18:44 +0100 Subject: [PATCH 273/274] modules: add support for module replacement with disabledModules This is based on a prototype Nicolas B. Pierron worked on during a discussion we had at FOSDEM. A new version with a workaround for problems of the reverted original. Discussion: https://github.com/NixOS/nixpkgs/commit/3f2566689 --- lib/modules.nix | 24 ++++-- lib/tests/modules.sh | 8 ++ lib/tests/modules/default.nix | 1 + lib/tests/modules/disable-declare-enable.nix | 5 ++ lib/tests/modules/disable-define-enable.nix | 5 ++ lib/tests/modules/disable-enable-modules.nix | 5 ++ .../manual/development/replace-modules.xml | 75 +++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + nixos/doc/manual/release-notes/rl-1703.xml | 10 +++ 9 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 lib/tests/modules/disable-declare-enable.nix create mode 100644 lib/tests/modules/disable-define-enable.nix create mode 100644 lib/tests/modules/disable-enable-modules.nix create mode 100644 nixos/doc/manual/development/replace-modules.xml diff --git a/lib/modules.nix b/lib/modules.nix index 4eee41306cd..a7c397d2cf4 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -20,7 +20,8 @@ rec { , prefix ? [] , # This should only be used for special arguments that need to be evaluated # when resolving module structure (like in imports). For everything else, - # there's _module.args. + # there's _module.args. If specialArgs.modulesPath is defined it will be + # used as the base path for disabledModules. specialArgs ? {} , # This would be remove in the future, Prefer _module.args option instead. args ? {} @@ -58,10 +59,7 @@ rec { closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs); - # Note: the list of modules is reversed to maintain backward - # compatibility with the old module system. Not sure if this is - # the most sensible policy. - options = mergeModules prefix (reverseList closed); + options = mergeModules prefix (reverseList (filterModules (specialArgs.modulesPath or "") closed)); # Traverse options and extract the option values into the final # config set. At the same time, check whether all option @@ -87,6 +85,16 @@ rec { result = { inherit options config; }; in result; + + # Filter disabled modules. Modules can be disabled allowing + # their implementation to be replaced. + filterModules = modulesPath: modules: + let + moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m; + disabledKeys = map moduleKey (concatMap (m: m.disabledModules) modules); + in + filter (m: !(elem m.key disabledKeys)) modules; + /* Close a set of modules under the ‘imports’ relation. */ closeModules = modules: args: let @@ -111,12 +119,13 @@ rec { else {}; in if m ? config || m ? options then - let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file" "meta"]; in + let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in if badAttrs != {} then throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'." else { file = m._file or file; key = toString m.key or key; + disabledModules = m.disabledModules or []; imports = m.imports or []; options = m.options or {}; config = mkMerge [ (m.config or {}) metaSet ]; @@ -124,9 +133,10 @@ rec { else { file = m._file or file; key = toString m.key or key; + disabledModules = m.disabledModules or []; imports = m.require or [] ++ m.imports or []; options = {}; - config = mkMerge [ (removeAttrs m ["key" "_file" "require" "imports"]) metaSet ]; + config = mkMerge [ (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]) metaSet ]; }; applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 8b476a5d3dc..ba0c67fb7d4 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -99,6 +99,14 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-if-foo-enabl checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enable.nix checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix +# Check disabledModules with config definitions and option declarations. +set -- config.enable ./define-enable.nix ./declare-enable.nix +checkConfigOutput "true" "$@" +checkConfigOutput "false" "$@" ./disable-define-enable.nix +checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix +checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix +checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix + # Check _module.args. set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@" diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix index c5ce9cb3e3b..5b094710419 100644 --- a/lib/tests/modules/default.nix +++ b/lib/tests/modules/default.nix @@ -3,5 +3,6 @@ { inherit (lib.evalModules { inherit modules; + specialArgs.modulesPath = ./.; }) config options; } diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix new file mode 100644 index 00000000000..a373ee7e550 --- /dev/null +++ b/lib/tests/modules/disable-declare-enable.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + disabledModules = [ ./declare-enable.nix ]; +} diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix new file mode 100644 index 00000000000..0d84a7c3cb6 --- /dev/null +++ b/lib/tests/modules/disable-define-enable.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + disabledModules = [ ./define-enable.nix ]; +} diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix new file mode 100644 index 00000000000..c325f4e0743 --- /dev/null +++ b/lib/tests/modules/disable-enable-modules.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + disabledModules = [ "define-enable.nix" "declare-enable.nix" ]; +} diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml new file mode 100644 index 00000000000..cc0539ec510 --- /dev/null +++ b/nixos/doc/manual/development/replace-modules.xml @@ -0,0 +1,75 @@ +
+ +Replace Modules + +Modules that are imported can also be disabled. The option + declarations and config implementation of a disabled module will be + ignored, allowing another to take it's place. This can be used to + import a set of modules from another channel while keeping the rest + of the system on a stable release. +disabledModules is a top level attribute like + imports, options and + config. It contains a list of modules that will + be disabled. This can either be the full path to the module or a + string with the filename relative to the modules path + (eg. <nixpkgs/nixos/modules> for nixos). + + +This example will replace the existing postgresql module with + the version defined in the nixos-unstable channel while keeping the + rest of the modules and packages from the original nixos channel. + This only overrides the module definition, this won't use postgresql + from nixos-unstable unless explicitly configured to do so. + + +{ config, lib, pkgs, ... }: + +{ + disabledModules = [ "services/databases/postgresql.nix" ]; + + imports = + [ # Use postgresql service from nixos-unstable channel. + # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable + <nixos-unstable/nixos/modules/services/databases/postgresql.nix> + ]; + + services.postgresql.enable = true; +} + + +This example shows how to define a custom module as a + replacement for an existing module. Importing this module will + disable the original module without having to know it's + implementation details. + + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.man; +in + +{ + disabledModules = [ "services/programs/man.nix" ]; + + options = { + programs.man.enable = mkOption { + type = types.bool; + default = true; + description = "Whether to enable manual pages."; + }; + }; + + config = mkIf cfg.enabled { + warnings = [ "disabled manpages for production deployments." ]; + }; +} + + +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index ef6920160e6..5bdcad5ceb5 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -179,5 +179,6 @@ in { + diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index fda46217144..f40b03ec9b9 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -271,6 +271,16 @@ following incompatible changes: + + + Modules can now be disabled by using + disabledModules, allowing another to take it's place. This can be + used to import a set of modules from another channel while keeping the + rest of the system on a stable release. + + + From 913aae40baea860244bac1dbecd7ea564316a40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 3 Mar 2017 14:10:18 +0100 Subject: [PATCH 274/274] luajitPackages.mpack.meta.broken = true It seems only to link succesfully to vanilla lua. http://hydra.nixos.org/build/49554613 --- pkgs/top-level/lua-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3b6603996fc..d2aaa63c667 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -461,6 +461,8 @@ let homepage = "https://github.com/tarruda/libmpack"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; + # gcc -llua fails with luajit + broken = (builtins.parseDrvName lua.name).name != "lua"; }; };