From 351db21d34249a5afee505652f393bf44815db61 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 28 Sep 2016 21:39:19 -0400 Subject: [PATCH 001/149] mesos: 0.28.2 -> 1.0.1 --- .../networking/cluster/mesos/default.nix | 86 +- .../cluster/mesos/fetch-mesos-deps.sh | 2435 +++++++++-------- .../networking/cluster/mesos/mesos-deps.nix | 2 +- .../networking/cluster/mesos/nixos.patch | 463 ++++ .../networking/cluster/mesos/rb51324.patch | 21 +- .../networking/cluster/mesos/rb51325.patch | 73 +- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 1802 insertions(+), 1280 deletions(-) create mode 100644 pkgs/applications/networking/cluster/mesos/nixos.patch diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index ac7d94d5c9a8..8857e6ba4e35 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -2,6 +2,7 @@ , automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent +, ethtool, coreutils , bash }: @@ -10,7 +11,7 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.28.2"; + version = "1.0.1"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -18,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "0wh4h11w5qvqa66fiz0qbm9q48d3jz48mw6mm22bcy9q9wmzrxcn"; + sha256 = "1hdh2wh11ck98ycfrxfzgivgk2pjl3638vkyw14xj7faj9qxjlz0"; }; patches = [ @@ -29,7 +30,8 @@ in stdenv.mkDerivation rec { ./rb51324.patch ./rb51325.patch - ./maven_repo.patch + # see https://github.com/cstrahan/mesos/tree/nixos-${version} + ./nixos.patch ]; buildInputs = [ @@ -45,59 +47,59 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} + substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \ + --subst-var-by sh ${bash}/bin/bash - substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/stout/include/stout/os/posix/shell.hpp \ + --subst-var-by sh ${bash}/bin/bash - substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/Makefile.am \ + --subst-var-by mavenRepo ${mavenRepo} - substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/shell.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace src/cli/mesos-scp \ - --replace "'scp " "'${openssh}/bin/scp " - - substituteInPlace src/launcher/executor.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/cli/mesos-scp \ + --subst-var-by scp ${openssh}/bin/scp substituteInPlace src/launcher/fetcher.cpp \ - --replace '"gzip' '"${gzip}/bin/gzip' \ - --replace '"tar' '"${gnutar}/bin/tar' \ - --replace '"unzip' '"${unzip}/bin/unzip' + --subst-var-by gzip ${gzip}/bin/gzip \ + --subst-var-by tar ${gnutar}/bin/tar \ + --subst-var-by unzip ${unzip}/bin/unzip substituteInPlace src/python/cli/src/mesos/cli.py \ - --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" + --subst-var-by mesos-resolve $out/bin/mesos-resolve - substituteInPlace src/slave/containerizer/mesos/launch.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/slave/containerizer/mesos/isolators/posix/disk.cpp \ + --subst-var-by du ${coreutils}/bin/du \ + --subst-var-by cp ${coreutils}/bin/cp + + substituteInPlace src/slave/containerizer/mesos/provisioner/backends/copy.cpp \ + --subst-var-by cp ${coreutils}/bin/cp + + substituteInPlace src/uri/fetchers/copy.cpp \ + --subst-var-by cp ${coreutils}/bin/cp + + substituteInPlace src/uri/fetchers/curl.cpp \ + --subst-var-by curl ${curl}/bin/curl + + substituteInPlace src/uri/fetchers/docker.cpp \ + --subst-var-by curl ${curl}/bin/curl '' + lib.optionalString stdenv.isLinux '' - substituteInPlace configure.ac \ - --replace /usr/include/libnl3 ${libnl.dev}/include/libnl3 - - substituteInPlace src/linux/perf.cpp \ - --replace '"perf ' '"${perf}/bin/perf ' - - substituteInPlace src/linux/systemd.cpp \ - --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' + substituteInPlace src/linux/perf.cpp \ + --subst-var-by perf ${perf}/bin/perf substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ - --replace '"mount ' '"${utillinux}/bin/mount ' \ + --subst-var-by mount ${utillinux}/bin/mount substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \ - --replace '"mount ' '"${utillinux}/bin/mount ' \ + --subst-var-by mount ${utillinux}/bin/mount substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \ - --replace '"tc ' '"${iproute}/bin/tc ' \ - --replace '"ip ' '"${iproute}/bin/ip ' \ - --replace '"mount ' '"${utillinux}/bin/mount ' \ - --replace '/bin/sh' "${stdenv.shell}" + --subst-var-by tc ${iproute}/bin/tc \ + --subst-var-by ip ${iproute}/bin/ip \ + --subst-var-by mount ${utillinux}/bin/mount \ + --subst-var-by sh ${stdenv.shell} \ + --subst-var-by ethtool ${ethtool}/sbin/ethtool ''; configureFlags = [ @@ -113,8 +115,11 @@ in stdenv.mkDerivation rec { "--with-ssl=${openssl.dev}" "--enable-libevent" "--with-libevent=${libevent.dev}" + "--with-protobuf=${pythonProtobuf.protobuf}" + "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" + "--with-nl=${libnl.dev}" ]; postInstall = '' @@ -180,8 +185,5 @@ in stdenv.mkDerivation rec { description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ]; platforms = platforms.linux; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - broken = true; }; } diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh index bcdae83839fc..f4a4588dbe41 100644 --- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh +++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh @@ -9,1292 +9,1349 @@ function fetchArtifact { curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath" } -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 -fetchArtifact asm/asm/3.2/asm-3.2.pom -fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 -fetchArtifact com/google/google/1/google-1.pom -fetchArtifact com/google/google/1/google-1.pom.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1 -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom -fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 -fetchArtifact junit/junit/4.10/junit-4.10.pom -fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 -fetchArtifact org/apache/apache/10/apache-10.pom -fetchArtifact org/apache/apache/10/apache-10.pom.sha1 fetchArtifact org/apache/apache/11/apache-11.pom fetchArtifact org/apache/apache/11/apache-11.pom.sha1 -fetchArtifact org/apache/apache/13/apache-13.pom -fetchArtifact org/apache/apache/13/apache-13.pom.sha1 -fetchArtifact org/apache/apache/2/apache-2.pom -fetchArtifact org/apache/apache/2/apache-2.pom.sha1 -fetchArtifact org/apache/apache/3/apache-3.pom -fetchArtifact org/apache/apache/3/apache-3.pom.sha1 -fetchArtifact org/apache/apache/4/apache-4.pom -fetchArtifact org/apache/apache/4/apache-4.pom.sha1 -fetchArtifact org/apache/apache/5/apache-5.pom -fetchArtifact org/apache/apache/5/apache-5.pom.sha1 -fetchArtifact org/apache/apache/6/apache-6.pom -fetchArtifact org/apache/apache/6/apache-6.pom.sha1 +fetchArtifact org/apache/apache/10/apache-10.pom +fetchArtifact org/apache/apache/10/apache-10.pom.sha1 fetchArtifact org/apache/apache/7/apache-7.pom fetchArtifact org/apache/apache/7/apache-7.pom.sha1 fetchArtifact org/apache/apache/9/apache-9.pom fetchArtifact org/apache/apache/9/apache-9.pom.sha1 -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom -fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom -fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 +fetchArtifact org/apache/apache/13/apache-13.pom +fetchArtifact org/apache/apache/13/apache-13.pom.sha1 +fetchArtifact org/apache/apache/3/apache-3.pom +fetchArtifact org/apache/apache/3/apache-3.pom.sha1 +fetchArtifact org/apache/apache/6/apache-6.pom +fetchArtifact org/apache/apache/6/apache-6.pom.sha1 +fetchArtifact org/apache/apache/4/apache-4.pom +fetchArtifact org/apache/apache/4/apache-4.pom.sha1 +fetchArtifact org/apache/apache/2/apache-2.pom +fetchArtifact org/apache/apache/2/apache-2.pom.sha1 +fetchArtifact org/apache/apache/5/apache-5.pom +fetchArtifact org/apache/apache/5/apache-5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1 fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom +fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom +fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar.sha1 fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1 fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar.sha1 +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1 -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 -fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom -fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar.sha1 +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar.sha1 fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1 -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1 -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom +fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1 +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1 -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom -fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1 fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar.sha1 +fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom +fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1 -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar.sha1 +fetchArtifact com/google/google/1/google-1.pom +fetchArtifact com/google/google/1/google-1.pom.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 +fetchArtifact junit/junit/4.10/junit-4.10.pom +fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1 +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 fetchArtifact velocity/velocity/1.5/velocity-1.5.pom fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom +fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1 +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1 +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 +fetchArtifact asm/asm/3.2/asm-3.2.pom +fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 stopNest diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix index b6fcbaafbb10..1edb4a755d89 100644 --- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix +++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "12c6z5yvp60v57f6nijifp14i56bb5614hac1qg528s9liaf8vml"; + outputHash = "066ikswavq3l37x1s3pfdncyj77pvpa0kj14ax5dqb9njmsg0s11"; buildInputs = [ curl ]; diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch new file mode 100644 index 000000000000..032357e452db --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/nixos.patch @@ -0,0 +1,463 @@ +diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp +index a29967d..290b98b 100644 +--- a/3rdparty/stout/include/stout/os/posix/fork.hpp ++++ b/3rdparty/stout/include/stout/os/posix/fork.hpp +@@ -369,7 +369,7 @@ private: + if (exec.isSome()) { + // Execute the command (via '/bin/sh -c command'). + const char* command = exec.get().command.c_str(); +- execlp("sh", "sh", "-c", command, (char*) nullptr); ++ execlp("@sh@", "sh", "-c", command, (char*) nullptr); + EXIT(EXIT_FAILURE) + << "Failed to execute '" << command << "': " << os::strerror(errno); + } else if (wait.isSome()) { +diff --git a/3rdparty/stout/include/stout/os/posix/shell.hpp b/3rdparty/stout/include/stout/os/posix/shell.hpp +index 1d73ae5..9bf89b5 100644 +--- a/3rdparty/stout/include/stout/os/posix/shell.hpp ++++ b/3rdparty/stout/include/stout/os/posix/shell.hpp +@@ -37,7 +37,7 @@ namespace Shell { + // received by the callee, usually the command name and `arg1` is the + // second command argument received by the callee. + +-constexpr const char* name = "sh"; ++constexpr const char* name = "@sh@"; + constexpr const char* arg0 = "sh"; + constexpr const char* arg1 = "-c"; + +diff --git a/src/Makefile.am b/src/Makefile.am +index 28dd151..36fc6ec 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1528,7 +1528,8 @@ if HAS_JAVA + + $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom + @echo "Building mesos-$(PACKAGE_VERSION).jar ..." +- @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom clean package ++ @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package ++ + + # Convenience library for JNI bindings. + # TODO(Charles Reiss): We really should be building the Java library +diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp +index a71ab07..feed8c4 100755 +--- a/src/cli/mesos-scp ++++ b/src/cli/mesos-scp +@@ -19,7 +19,7 @@ if sys.version_info < (2,6,0): + + + def scp(host, src, dst): +- cmd = 'scp -pr %s %s' % (src, host + ':' + dst) ++ cmd = '@scp@ -pr %s %s' % (src, host + ':' + dst) + try: + process = subprocess.Popen( + cmd, +diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp +index 4456c28..e22c8fc 100644 +--- a/src/launcher/fetcher.cpp ++++ b/src/launcher/fetcher.cpp +@@ -68,13 +68,13 @@ static Try extract( + strings::endsWith(sourcePath, ".tar.bz2") || + strings::endsWith(sourcePath, ".txz") || + strings::endsWith(sourcePath, ".tar.xz")) { +- command = "tar -C '" + destinationDirectory + "' -xf"; ++ command = "@tar@ -C '" + destinationDirectory + "' -xf"; + } else if (strings::endsWith(sourcePath, ".gz")) { + string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3); + string filename = Path(pathWithoutExtension).basename(); +- command = "gzip -dc > '" + destinationDirectory + "/" + filename + "' <"; ++ command = "@gzip@ -dc > '" + destinationDirectory + "/" + filename + "' <"; + } else if (strings::endsWith(sourcePath, ".zip")) { +- command = "unzip -o -d '" + destinationDirectory + "'"; ++ command = "@unzip@ -o -d '" + destinationDirectory + "'"; + } else { + return false; + } +@@ -162,7 +162,7 @@ static Try copyFile( + const string& sourcePath, + const string& destinationPath) + { +- const string command = "cp '" + sourcePath + "' '" + destinationPath + "'"; ++ const string command = "@cp@ '" + sourcePath + "' '" + destinationPath + "'"; + + LOG(INFO) << "Copying resource with command:" << command; + +diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp +index ea823b3..170f54d 100644 +--- a/src/linux/perf.cpp ++++ b/src/linux/perf.cpp +@@ -125,7 +125,7 @@ private: + // NOTE: The watchdog process places perf in its own process group + // and will kill the perf process when the parent dies. + Try _perf = subprocess( +- "perf", ++ "@perf@", + argv, + Subprocess::PIPE(), + Subprocess::PIPE(), +@@ -319,7 +319,7 @@ bool valid(const set& events) + ostringstream command; + + // Log everything to stderr which is then redirected to /dev/null. +- command << "perf stat --log-fd 2"; ++ command << "@perf@ stat --log-fd 2"; + foreach (const string& event, events) { + command << " --event " << event; + } +diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp +index 619aa27..c1cbfe4 100644 +--- a/src/linux/systemd.cpp ++++ b/src/linux/systemd.cpp +@@ -196,12 +196,19 @@ bool exists() + // This is static as the init system should not change while we are running. + static const bool exists = []() -> bool { + // (1) Test whether `/sbin/init` links to systemd. +- const Result realpath = os::realpath("/sbin/init"); +- if (realpath.isError() || realpath.isNone()) { +- LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " +- << realpath.error(); +- +- return false; ++ // cstrahan: first assume we're on NixOS, then try non-NixOS ++ Result realpath = os::realpath("/run/current-system/systemd/lib/systemd/systemd"); ++ Result realpathNixOS = realpath; ++ if (realpathNixOS.isError() || realpathNixOS.isNone()) { ++ Result realpathNonNixOS = realpath = os::realpath("/sbin/init"); ++ if (realpathNonNixOS.isError() || realpathNonNixOS.isNone()) { ++ LOG(WARNING) << "Failed to test /run/current-system/systemd/lib/systemd/systemd for systemd environment: " ++ << realpathNixOS.error(); ++ LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " ++ << realpathNonNixOS.error(); ++ ++ return false; ++ } + } + + CHECK_SOME(realpath); +diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py +index f342992..354abf4 100644 +--- a/src/python/cli/src/mesos/cli.py ++++ b/src/python/cli/src/mesos/cli.py +@@ -40,7 +40,7 @@ def resolve(master): + import subprocess + + process = subprocess.Popen( +- ['mesos-resolve', master], ++ ['@mesos-resolve@', master], + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp +index 51d1518..783adb5 100644 +--- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp ++++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp +@@ -204,7 +204,7 @@ Future> SharedFilesystemIsolatorProcess::prepare( + } + + launchInfo.add_pre_exec_commands()->set_value( +- "mount -n --bind " + hostPath + " " + volume.container_path()); ++ "@mount@ -n --bind " + hostPath + " " + volume.container_path()); + } + + return launchInfo; +diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +index b41e266..e07c163 100644 +--- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp ++++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +@@ -163,7 +163,7 @@ Future> NamespacesPidIsolatorProcess::prepare( + // containers cannot see the namespace bind mount of other + // containers. + launchInfo.add_pre_exec_commands()->set_value( +- "mount -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) + ++ "@mount@ -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) + + " " + string(PID_NS_BIND_MOUNT_ROOT)); + + // Mount /proc for the container's pid namespace to show the +@@ -176,9 +176,9 @@ Future> NamespacesPidIsolatorProcess::prepare( + // -n flag so the mount is not added to the mtab where it will not + // be correctly removed with the namespace terminates. + launchInfo.add_pre_exec_commands()->set_value( +- "mount none /proc --make-private -o rec"); ++ "@mount@ none /proc --make-private -o rec"); + launchInfo.add_pre_exec_commands()->set_value( +- "mount -n -t proc proc /proc -o nosuid,noexec,nodev"); ++ "@mount@ -n -t proc proc /proc -o nosuid,noexec,nodev"); + + return launchInfo; + } +diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +index 79ee960..d55a353 100644 +--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp ++++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +@@ -1392,19 +1392,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) + // Check the availability of a few Linux commands that we will use. + // We use the blocking os::shell here because 'create' will only be + // invoked during initialization. +- Try checkCommandTc = os::shell("tc filter show"); ++ Try checkCommandTc = os::shell("@tc@ filter show"); + if (checkCommandTc.isError()) { + return Error("Check command 'tc' failed: " + checkCommandTc.error()); + } + + // NOTE: loopback device always exists. +- Try checkCommandEthtool = os::shell("ethtool -k lo"); ++ Try checkCommandEthtool = os::shell("@ethtool@ -k lo"); + if (checkCommandEthtool.isError()) { + return Error("Check command 'ethtool' failed: " + + checkCommandEthtool.error()); + } + +- Try checkCommandIp = os::shell("ip link show"); ++ Try checkCommandIp = os::shell("@ip@ link show"); + if (checkCommandIp.isError()) { + return Error("Check command 'ip' failed: " + checkCommandIp.error()); + } +@@ -1924,9 +1924,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) + // visible. It's OK to use the blocking os::shell here because + // 'create' will only be invoked during initialization. + Try mount = os::shell( +- "mount --bind %s %s && " +- "mount --make-slave %s && " +- "mount --make-shared %s", ++ "@mount@ --bind %s %s && " ++ "@mount@ --make-slave %s && " ++ "@mount@ --make-shared %s", + bindMountRoot->c_str(), + bindMountRoot->c_str(), + bindMountRoot->c_str(), +@@ -1943,8 +1943,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) + // shared mount yet (possibly due to slave crash while preparing + // the work directory mount). It's safe to re-do the following. + Try mount = os::shell( +- "mount --make-slave %s && " +- "mount --make-shared %s", ++ "@mount@ --make-slave %s && " ++ "@mount@ --make-shared %s", + bindMountRoot->c_str(), + bindMountRoot->c_str()); + +@@ -1963,8 +1963,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) + // so that they are in different peer groups. + if (entry.shared() == bindMountEntry->shared()) { + Try mount = os::shell( +- "mount --make-slave %s && " +- "mount --make-shared %s", ++ "@mount@ --make-slave %s && " ++ "@mount@ --make-shared %s", + bindMountRoot->c_str(), + bindMountRoot->c_str()); + +@@ -3916,13 +3916,13 @@ string PortMappingIsolatorProcess::scripts(Info* info) + { + ostringstream script; + +- script << "#!/bin/sh\n"; ++ script << "#!@sh@\n"; + script << "set -xe\n"; + + // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave + // mount so that changes in the container will not be propagated to + // the host. +- script << "mount --make-rslave " << bindMountRoot << "\n"; ++ script << "@mount@ --make-rslave " << bindMountRoot << "\n"; + + // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be + // forwarded anyway. +@@ -3930,7 +3930,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) + << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n"; + + // Configure lo and eth0. +- script << "ip link set " << lo << " address " << hostMAC ++ script << "@ip@ link set " << lo << " address " << hostMAC + << " mtu " << hostEth0MTU << " up\n"; + + // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel +@@ -3939,12 +3939,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) + // when we receive a packet with a bad checksum. Disabling rx + // checksum offloading ensures the TCP layer will checksum and drop + // it. +- script << "ethtool -K " << eth0 << " rx off\n"; +- script << "ip link set " << eth0 << " address " << hostMAC << " up\n"; +- script << "ip addr add " << hostIPNetwork << " dev " << eth0 << "\n"; ++ script << "@ethtool@ -K " << eth0 << " rx off\n"; ++ script << "@ip@ link set " << eth0 << " address " << hostMAC << " up\n"; ++ script << "@ip@ addr add " << hostIPNetwork << " dev " << eth0 << "\n"; + + // Set up the default gateway to match that of eth0. +- script << "ip route add default via " << hostDefaultGateway << "\n"; ++ script << "@ip@ route add default via " << hostDefaultGateway << "\n"; + + // Restrict the ephemeral ports that can be used by the container. + script << "echo " << info->ephemeralPorts.lower() << " " +@@ -3973,19 +3973,19 @@ string PortMappingIsolatorProcess::scripts(Info* info) + } + + // Set up filters on lo and eth0. +- script << "tc qdisc add dev " << lo << " ingress\n"; +- script << "tc qdisc add dev " << eth0 << " ingress\n"; ++ script << "@tc@ qdisc add dev " << lo << " ingress\n"; ++ script << "@tc@ qdisc add dev " << eth0 << " ingress\n"; + + // Allow talking between containers and from container to host. + // TODO(chzhcn): Consider merging the following two filters. +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" + << " match ip dst " << hostIPNetwork.address() + << " action mirred egress redirect dev " << eth0 << "\n"; + +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" +@@ -3996,7 +3996,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) + foreach (const PortRange& range, + getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) { + // Local traffic inside a container will not be redirected to eth0. +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32" + << " flowid ffff:0" +@@ -4005,7 +4005,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) + + // Traffic going to host loopback IP and ports assigned to this + // container will be redirected to lo. +- script << "tc filter add dev " << eth0 << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << eth0 << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" +@@ -4017,14 +4017,14 @@ string PortMappingIsolatorProcess::scripts(Info* info) + } + + // Do not forward the ICMP packet if the destination IP is self. +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" + << " match ip protocol 1 0xff" + << " match ip dst " << hostIPNetwork.address() << "\n"; + +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" +@@ -4033,9 +4033,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) + << net::IPNetwork::LOOPBACK_V4().address() << "\n"; + + // Display the filters created on eth0 and lo. +- script << "tc filter show dev " << eth0 ++ script << "@tc@ filter show dev " << eth0 + << " parent " << ingress::HANDLE << "\n"; +- script << "tc filter show dev " << lo ++ script << "@tc@ filter show dev " << lo + << " parent " << ingress::HANDLE << "\n"; + + // If throughput limit for container egress traffic exists, use HTB +@@ -4047,9 +4047,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) + // throughput. TBF requires other parameters such as 'burst' that + // HTB already has default values for. + if (egressRateLimitPerContainer.isSome()) { +- script << "tc qdisc add dev " << eth0 << " root handle " ++ script << "@tc@ qdisc add dev " << eth0 << " root handle " + << CONTAINER_TX_HTB_HANDLE << " htb default 1\n"; +- script << "tc class add dev " << eth0 << " parent " ++ script << "@tc@ class add dev " << eth0 << " parent " + << CONTAINER_TX_HTB_HANDLE << " classid " + << CONTAINER_TX_HTB_CLASS_ID << " htb rate " + << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n"; +@@ -4060,12 +4060,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) + // fq_codel, which has a larger buffer and better control on + // buffer bloat. + // TODO(cwang): Verity that fq_codel qdisc is available. +- script << "tc qdisc add dev " << eth0 ++ script << "@tC@ qdisc add dev " << eth0 + << " parent " << CONTAINER_TX_HTB_CLASS_ID << " fq_codel\n"; + + // Display the htb qdisc and class created on eth0. +- script << "tc qdisc show dev " << eth0 << "\n"; +- script << "tc class show dev " << eth0 << "\n"; ++ script << "@tc@ qdisc show dev " << eth0 << "\n"; ++ script << "@tc@ class show dev " << eth0 << "\n"; + } + + return script.str(); +diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp +index 3dfe7ad..4288666 100644 +--- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp ++++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp +@@ -492,7 +492,7 @@ private: + // NOTE: The monitor watchdog will watch the parent process and kill + // the 'du' process in case that the parent die. + Try s = subprocess( +- "du", ++ "@du@", + command, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +index b9f6d7a..0fcf455 100644 +--- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp ++++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +@@ -141,7 +141,7 @@ Future CopyBackendProcess::_provision( + #endif // __APPLE__ || __FreeBSD__ + + Try s = subprocess( +- "cp", ++ "@cp@", + args, + Subprocess::PATH("/dev/null"), + Subprocess::PATH("/dev/null"), +diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp +index f095ad6..ee0c2a7 100644 +--- a/src/uri/fetchers/copy.cpp ++++ b/src/uri/fetchers/copy.cpp +@@ -88,7 +88,7 @@ Future CopyFetcherPlugin::fetch( + const vector argv = {"cp", "-a", uri.path(), directory}; + + Try s = subprocess( +- "cp", ++ "@cp@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp +index cc3f9ee..691d2d9 100644 +--- a/src/uri/fetchers/curl.cpp ++++ b/src/uri/fetchers/curl.cpp +@@ -98,7 +98,7 @@ Future CurlFetcherPlugin::fetch( + }; + + Try s = subprocess( +- "curl", ++ "@curl@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp +index 211be6f..d7e3771 100644 +--- a/src/uri/fetchers/docker.cpp ++++ b/src/uri/fetchers/docker.cpp +@@ -113,7 +113,7 @@ static Future curl( + + // TODO(jieyu): Kill the process if discard is called. + Try s = subprocess( +- "curl", ++ "@curl@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +@@ -212,7 +212,7 @@ static Future download( + + // TODO(jieyu): Kill the process if discard is called. + Try s = subprocess( +- "curl", ++ "@curl@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), diff --git a/pkgs/applications/networking/cluster/mesos/rb51324.patch b/pkgs/applications/networking/cluster/mesos/rb51324.patch index abcd6d065dbc..68ef866161fe 100644 --- a/pkgs/applications/networking/cluster/mesos/rb51324.patch +++ b/pkgs/applications/networking/cluster/mesos/rb51324.patch @@ -1,17 +1,16 @@ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp -index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44cf882d27 100644 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp -+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp -@@ -18,6 +18,8 @@ +diff --git a/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/stout/include/stout/os/ls.hpp +index f8da9ef..6d549d3 100644 +--- a/3rdparty/stout/include/stout/os/ls.hpp ++++ b/3rdparty/stout/include/stout/os/ls.hpp +@@ -18,6 +18,7 @@ #else #include #endif // __WINDOWS__ + -+#include #include #include -@@ -26,8 +28,6 @@ +@@ -26,8 +27,6 @@ #include #include @@ -20,17 +19,17 @@ index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44 namespace os { -@@ -36,36 +36,32 @@ inline Try> ls(const std::string& directory) +@@ -36,36 +35,32 @@ inline Try> ls(const std::string& directory) DIR* dir = opendir(directory.c_str()); - if (dir == NULL) { + if (dir == nullptr) { - // Preserve `opendir` error. return ErrnoError("Failed to opendir '" + directory + "'"); } - dirent* temp = (dirent*) malloc(os::dirent_size(dir)); - -- if (temp == NULL) { +- if (temp == nullptr) { - // Preserve `malloc` error. - ErrnoError error("Failed to allocate directory entries"); - closedir(dir); @@ -41,7 +40,7 @@ index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44 struct dirent* entry; - int error; -- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != NULL) { +- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != nullptr) { + // Zero `errno` before starting to call `readdir`. This is necessary + // to allow us to determine when `readdir` returns an error. + errno = 0; diff --git a/pkgs/applications/networking/cluster/mesos/rb51325.patch b/pkgs/applications/networking/cluster/mesos/rb51325.patch index 9c6eb7bebbea..5c5ce00730bb 100644 --- a/pkgs/applications/networking/cluster/mesos/rb51325.patch +++ b/pkgs/applications/networking/cluster/mesos/rb51325.patch @@ -1,34 +1,35 @@ -diff -Naur a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am ---- a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:20:04.834457344 +0200 -+++ b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:21:00.190983981 +0200 -@@ -62,7 +62,6 @@ - stout/os/chroot.hpp \ - stout/os/close.hpp \ - stout/os/constants.hpp \ -- stout/os/direntsize.hpp \ - stout/os/environment.hpp \ - stout/os/exists.hpp \ - stout/os/fcntl.hpp \ -@@ -101,7 +100,6 @@ - stout/os/posix/bootid.hpp \ - stout/os/posix/chown.hpp \ - stout/os/posix/chroot.hpp \ -- stout/os/posix/direntsize.hpp \ - stout/os/posix/exists.hpp \ - stout/os/posix/fcntl.hpp \ - stout/os/posix/fork.hpp \ -@@ -118,7 +116,6 @@ - stout/os/raw/environment.hpp \ - stout/os/windows/bootid.hpp \ - stout/os/windows/chroot.hpp \ -- stout/os/windows/direntsize.hpp \ - stout/os/windows/exists.hpp \ - stout/os/windows/fcntl.hpp \ - stout/os/windows/fork.hpp \ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp +diff --git a/3rdparty/stout/include/Makefile.am b/3rdparty/stout/include/Makefile.am +index 1f2ee85..b0b08d8 100644 +--- a/3rdparty/stout/include/Makefile.am ++++ b/3rdparty/stout/include/Makefile.am +@@ -64,7 +64,6 @@ nobase_include_HEADERS = \ + stout/os/chroot.hpp \ + stout/os/close.hpp \ + stout/os/constants.hpp \ +- stout/os/direntsize.hpp \ + stout/os/environment.hpp \ + stout/os/exists.hpp \ + stout/os/fcntl.hpp \ +@@ -108,7 +107,6 @@ nobase_include_HEADERS = \ + stout/os/posix/chown.hpp \ + stout/os/posix/chroot.hpp \ + stout/os/posix/close.hpp \ +- stout/os/posix/direntsize.hpp \ + stout/os/posix/exists.hpp \ + stout/os/posix/fcntl.hpp \ + stout/os/posix/fork.hpp \ +@@ -134,7 +132,6 @@ nobase_include_HEADERS = \ + stout/os/windows/bootid.hpp \ + stout/os/windows/chroot.hpp \ + stout/os/windows/close.hpp \ +- stout/os/windows/direntsize.hpp \ + stout/os/windows/exists.hpp \ + stout/os/windows/fcntl.hpp \ + stout/os/windows/fork.hpp \ +diff --git a/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/stout/include/stout/os/direntsize.hpp deleted file mode 100644 -index 819f99a89862491e99873bdedc603317b91266b0..0000000000000000000000000000000000000000 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp +index 819f99a..0000000 +--- a/3rdparty/stout/include/stout/os/direntsize.hpp +++ /dev/null @@ -1,26 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); @@ -57,10 +58,10 @@ index 819f99a89862491e99873bdedc603317b91266b0..00000000000000000000000000000000 - - -#endif // __STOUT_OS_DIRENTSIZE_HPP__ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp +diff --git a/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/stout/include/stout/os/posix/direntsize.hpp deleted file mode 100644 -index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..0000000000000000000000000000000000000000 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp +index 9d8f72e..0000000 +--- a/3rdparty/stout/include/stout/os/posix/direntsize.hpp +++ /dev/null @@ -1,42 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); @@ -105,10 +106,10 @@ index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..00000000000000000000000000000000 -} // namespace os { - -#endif // __STOUT_OS_POSIX_DIRENTSIZE_HPP__ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp +diff --git a/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/stout/include/stout/os/windows/direntsize.hpp deleted file mode 100644 -index 7c8c7a06f478b3a80341a874494cff21f71fc397..0000000000000000000000000000000000000000 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp +index 7c8c7a0..0000000 +--- a/3rdparty/stout/include/stout/os/windows/direntsize.hpp +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58eda14f3b83..85b4c9316bd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5384,7 +5384,7 @@ in mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools wrapPython; - pythonProtobuf = pythonPackages.protobuf2_5; + pythonProtobuf = pythonPackages.protobuf2_6; perf = linuxPackages.perf; }; From 8ea1e9353702748efdae1baa9f457dd86612a79e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 14 Nov 2016 00:23:25 +0900 Subject: [PATCH 002/149] i3 module: refactor --- .../services/x11/window-managers/i3.nix | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index cfe9439b688c..f9c75e80db41 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -3,52 +3,58 @@ with lib; let - wmCfg = config.services.xserver.windowManager; + cfg = config.services.xserver.windowManager.i3; +in + +{ + options.services.xserver.windowManager.i3 = { + enable = mkEnableOption "i3 window manager"; - i3option = name: { - enable = mkEnableOption name; configFile = mkOption { - default = null; - type = types.nullOr types.path; + default = null; + type = with types; nullOr path; description = '' Path to the i3 configuration file. If left at the default value, $HOME/.i3/config will be used. ''; }; + extraSessionCommands = mkOption { - default = ""; - type = types.lines; + default = ""; + type = types.lines; description = '' Shell commands executed just before i3 is started. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.i3; + defaultText = "pkgs.i3"; + example = "pkgs.i3-gaps"; + description = '' + i3 package to use. + ''; + }; }; - i3config = name: pkg: cfg: { + config = mkIf cfg.enable { services.xserver.windowManager.session = [{ - inherit name; + name = "i3"; start = '' ${cfg.extraSessionCommands} - ${pkg}/bin/i3 ${optionalString (cfg.configFile != null) + ${cfg.package}/bin/i3 ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\"" } & waitPID=$! ''; }]; - environment.systemPackages = [ pkg ]; + environment.systemPackages = [ cfg.package ]; }; -in - -{ - options.services.xserver.windowManager = { - i3 = i3option "i3"; - i3-gaps = i3option "i3-gaps"; - }; - - config = mkMerge [ - (mkIf wmCfg.i3.enable (i3config "i3" pkgs.i3 wmCfg.i3)) - (mkIf wmCfg.i3-gaps.enable (i3config "i3-gaps" pkgs.i3-gaps wmCfg.i3-gaps)) + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "i3-gaps" "enable" ] + "Use services.xserver.windowManager.i3.enable and set services.xserver.windowManager.i3.package to pkgs.i3-gaps to use i3-gaps.") ]; } From 1aaa57654904f83072852b19449bffa0a7dbf3d9 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Mon, 14 Nov 2016 22:39:47 +0100 Subject: [PATCH 003/149] django_1_5: update depending packages --- pkgs/top-level/python-packages.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51d9647b929c..b1c79a77dc59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9974,21 +9974,21 @@ in { }; django_tagging = buildPythonPackage rec { - name = "django-tagging-0.3.1"; + name = "django-tagging-0.4.5"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; - sha256 = "e5fbeb7ca6e0c22a9a96239095dff508040ec95171e51c69e6f8ada72ea4bce2"; + sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; }; # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ django_1_5 ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "A generic tagging application for Django projects"; - homepage = http://code.google.com/p/django-tagging/; + homepage = https://github.com/Fantomas42/django-tagging; }; }; @@ -27726,14 +27726,15 @@ in { graphite_web = buildPythonPackage rec { name = "graphite-web-${version}"; - version = "0.9.12"; + disabled = isPy3k; + version = "0.9.15"; src = pkgs.fetchurl rec { url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; - sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114"; + sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django_1_5 django_tagging whisper pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django django_tagging whisper pycairo ldap memcached ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ From c0d349fb20a3905cc9e34af5d6d001303e1ea213 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Mon, 14 Nov 2016 22:52:41 +0100 Subject: [PATCH 004/149] django_1_5: remove --- pkgs/top-level/python-packages.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1c79a77dc59..bff6727df0ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9802,29 +9802,6 @@ in { }; }; - django_1_5 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.5.12"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; - sha256 = "1vbcvn6ncg7hq5i1w95h746vkq9lmp120vx63h3p56z5nsz7gpmk"; - }; - - # too complicated to setup - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_appconf = buildPythonPackage rec { name = "django-appconf-${version}"; version = "1.0.1"; From 5bc7ae7adb66639dbff676db51454ed2e5f8ad87 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 16 Nov 2016 16:29:35 +0100 Subject: [PATCH 005/149] kubernetes module: support for kubernetes 1.4 --- nixos/modules/services/cluster/kubernetes.nix | 608 ++++++++++++------ nixos/tests/kubernetes.nix | 556 +++++++++++----- .../networking/cluster/cni/default.nix | 36 ++ .../networking/cluster/kubernetes/default.nix | 3 - pkgs/top-level/all-packages.nix | 2 + 5 files changed, 843 insertions(+), 362 deletions(-) create mode 100644 pkgs/applications/networking/cluster/cni/default.nix diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 19303e97a706..4bdfa6d1ff58 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -5,28 +5,62 @@ with lib; let cfg = config.services.kubernetes; + skipAttrs = attrs: map (filterAttrs (k: v: k != "enable")) + (filter (v: !(hasAttr "enable" v) || v.enable) attrs); + + infraContainer = pkgs.dockerTools.buildImage { + name = "pause"; + tag = "latest"; + contents = cfg.package.pause; + config.Cmd = "/bin/pause"; + }; + + kubeconfig = pkgs.writeText "kubeconfig" (builtins.toJSON { + apiVersion = "v1"; + kind = "Config"; + clusters = [{ + name = "local"; + cluster.certificate-authority = cfg.kubeconfig.caFile; + cluster.server = cfg.kubeconfig.server; + }]; + users = [{ + name = "kubelet"; + user = { + client-certificate = cfg.kubeconfig.certFile; + client-key = cfg.kubeconfig.keyFile; + }; + }]; + contexts = [{ + context = { + cluster = "local"; + user = "kubelet"; + }; + current-context = "kubelet-context"; + }]; + }); + + policyFile = pkgs.writeText "kube-policy" + concatStringsSep "\n" (map (builtins.toJSON cfg.apiserver.authorizationPolicy)); + + cniConfig = pkgs.buildEnv { + name = "kubernetes-cni-config"; + paths = imap (i: entry: + pkgs.writeTextDir "${10+i}-${entry.type}.conf" (builtins.toJSON entry) + ) cfg.kubelet.cni.config; + }; + + manifests = pkgs.buildEnv { + name = "kubernetes-manifests"; + paths = mapAttrsToList (name: manifest: + pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest) + ) cfg.kubelet.manifests; + }; + in { ###### interface options.services.kubernetes = { - package = mkOption { - description = "Kubernetes package to use."; - type = types.package; - }; - - verbose = mkOption { - description = "Kubernetes enable verbose mode for debugging"; - default = false; - type = types.bool; - }; - - etcdServers = mkOption { - description = "Kubernetes list of etcd servers to watch."; - default = [ "127.0.0.1:2379" ]; - type = types.listOf types.str; - }; - roles = mkOption { description = '' Kubernetes role that this machine should take. @@ -38,18 +72,76 @@ in { type = types.listOf (types.enum ["master" "node"]); }; + package = mkOption { + description = "Kubernetes package to use."; + type = types.package; + default = pkgs.kubernetes; + }; + + verbose = mkOption { + description = "Kubernetes enable verbose mode for debugging"; + default = false; + type = types.bool; + }; + + etcd = { + servers = mkOption { + description = "List of etcd servers. By default etcd is started, except if this option is changed."; + default = ["http://127.0.0.1:2379"]; + type = types.listOf types.str; + }; + + keyFile = mkOption { + description = "Etcd key file"; + default = null; + type = types.nullOr types.path; + }; + + certFile = mkOption { + description = "Etcd cert file"; + default = null; + type = types.nullOr types.path; + }; + + caFile = mkOption { + description = "Etcd ca file"; + default = null; + type = types.nullOr types.path; + }; + }; + + kubeconfig = { + server = mkOption { + description = "Kubernetes apiserver server address"; + default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}"; + type = types.str; + }; + + caFile = mkOption { + description = "Certificate authrority file to use to connect to kuberentes apiserver"; + type = types.nullOr types.path; + default = null; + }; + + certFile = mkOption { + description = "Client certificate file to use to connect to kubernetes"; + type = types.nullOr types.path; + default = null; + }; + + keyFile = mkOption { + description = "Client key file to use to connect to kubernetes"; + type = types.nullOr types.path; + default = null; + }; + }; + dataDir = mkOption { description = "Kubernetes root directory for managing kubelet files."; default = "/var/lib/kubernetes"; type = types.path; }; - dockerCfg = mkOption { - description = "Kubernetes contents of dockercfg file."; - default = ""; - type = types.lines; - }; - apiserver = { enable = mkOption { description = "Whether to enable kubernetes apiserver."; @@ -72,6 +164,16 @@ in { type = types.str; }; + advertiseAddress = mkOption { + description = '' + Kubernetes apiserver IP address on which to advertise the apiserver + to members of the cluster. This address must be reachable by the rest + of the cluster. + ''; + default = null; + type = types.nullOr types.str; + }; + port = mkOption { description = "Kubernetes apiserver listening port."; default = 8080; @@ -80,41 +182,36 @@ in { securePort = mkOption { description = "Kubernetes apiserver secure port."; - default = 6443; + default = 443; type = types.int; }; tlsCertFile = mkOption { description = "Kubernetes apiserver certificate file."; - default = ""; - type = types.str; + default = null; + type = types.nullOr types.path; }; - tlsPrivateKeyFile = mkOption { + tlsKeyFile = mkOption { description = "Kubernetes apiserver private key file."; - default = ""; - type = types.str; + default = null; + type = types.nullOr types.path; }; clientCaFile = mkOption { description = "Kubernetes apiserver CA file for client auth."; - default = ""; - type = types.str; + default = null; + type = types.nullOr types.path; }; tokenAuth = mkOption { description = '' Kubernetes apiserver token authentication file. See - + ''; - default = {}; - example = literalExample '' - { - alice = "abc123"; - bob = "xyz987"; - } - ''; - type = types.attrsOf types.str; + default = null; + example = ''token,user,uid,"group1,group2,group3"''; + type = types.nullOr types.lines; }; authorizationMode = mkOption { @@ -148,13 +245,13 @@ in { allowPrivileged = mkOption { description = "Whether to allow privileged containers on kubernetes."; - default = false; + default = true; type = types.bool; }; portalNet = mkOption { description = "Kubernetes CIDR notation IP range from which to assign portal IPs"; - default = "10.10.10.10/16"; + default = "10.10.10.10/24"; type = types.str; }; @@ -171,9 +268,9 @@ in { admissionControl = mkOption { description = '' Kubernetes admission control plugins to use. See - + ''; - default = ["AlwaysAdmit"]; + default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota"]; example = [ "NamespaceLifecycle" "NamespaceExists" "LimitRanger" "SecurityContextDeny" "ServiceAccount" "ResourceQuota" @@ -181,15 +278,40 @@ in { type = types.listOf types.str; }; - serviceAccountKey = mkOption { + serviceAccountKeyFile = mkOption { description = '' Kubernetes apiserver PEM-encoded x509 RSA private or public key file, - used to verify ServiceAccount tokens. + used to verify ServiceAccount tokens. By default tls private key file + is used. ''; default = null; type = types.nullOr types.path; }; + kubeletClientCaFile = mkOption { + description = "Path to a cert file for connecting to kubelet"; + default = null; + type = types.nullOr types.path; + }; + + kubeletClientCertFile = mkOption { + description = "Client certificate to use for connections to kubelet"; + default = null; + type = types.nullOr types.path; + }; + + kubeletClientKeyFile = mkOption { + description = "Key to use for connections to kubelet"; + default = null; + type = types.nullOr types.path; + }; + + kubeletHttps = mkOption { + description = "Whether to use https for connections to kubelet"; + default = true; + type = types.bool; + }; + extraOpts = mkOption { description = "Kubernetes apiserver extra command line options."; default = ""; @@ -216,10 +338,10 @@ in { type = types.int; }; - master = mkOption { - description = "Kubernetes apiserver address"; - default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; - type = types.str; + leaderElect = mkOption { + description = "Whether to start leader election before executing main loop"; + type = types.bool; + default = false; }; extraOpts = mkOption { @@ -248,13 +370,13 @@ in { type = types.int; }; - master = mkOption { - description = "Kubernetes apiserver address"; - default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; - type = types.str; + leaderElect = mkOption { + description = "Whether to start leader election before executing main loop"; + type = types.bool; + default = false; }; - serviceAccountPrivateKey = mkOption { + serviceAccountKeyFile = mkOption { description = '' Kubernetes controller manager PEM-encoded private RSA key file used to sign service account tokens @@ -272,6 +394,12 @@ in { type = types.nullOr types.path; }; + clusterCidr = mkOption { + description = "Kubernetes controller manager CIDR Range for Pods in cluster"; + default = "10.10.0.0/16"; + type = types.str; + }; + extraOpts = mkOption { description = "Kubernetes controller manager extra command line options."; default = ""; @@ -292,6 +420,12 @@ in { type = types.bool; }; + registerSchedulable = mkOption { + description = "Register the node as schedulable. No-op if register-node is false."; + default = true; + type = types.bool; + }; + address = mkOption { description = "Kubernetes kubelet info server listening address."; default = "0.0.0.0"; @@ -304,6 +438,18 @@ in { type = types.int; }; + tlsCertFile = mkOption { + description = "File containing x509 Certificate for HTTPS."; + default = null; + type = types.nullOr types.path; + }; + + tlsKeyFile = mkOption { + description = "File containing x509 private key matching tlsCertFile."; + default = null; + type = types.nullOr types.path; + }; + healthz = { bind = mkOption { description = "Kubernetes kubelet healthz listening address."; @@ -326,19 +472,10 @@ in { allowPrivileged = mkOption { description = "Whether to allow kubernetes containers to request privileged mode."; - default = false; + default = true; type = types.bool; }; - apiServers = mkOption { - description = '' - Kubernetes kubelet list of Kubernetes API servers for publishing events, - and reading pods and services. - ''; - default = ["${cfg.apiserver.address}:${toString cfg.apiserver.port}"]; - type = types.listOf types.str; - }; - cadvisorPort = mkOption { description = "Kubernetes kubelet local cadvisor port."; default = 4194; @@ -347,16 +484,62 @@ in { clusterDns = mkOption { description = "Use alternative dns."; - default = ""; + default = "10.10.1.1"; type = types.str; }; clusterDomain = mkOption { description = "Use alternative domain."; - default = "kubernetes.io"; + default = "cluster.local"; type = types.str; }; + networkPlugin = mkOption { + description = "Network plugin to use by kubernetes"; + type = types.nullOr (types.enum ["cni" "kubenet"]); + default = "kubenet"; + }; + + cni = { + packages = mkOption { + description = "List of network plugin packages to install"; + type = types.listOf types.package; + default = []; + }; + + config = mkOption { + description = "Kubernetes CNI configuration"; + type = types.listOf types.attrs; + default = []; + example = literalExample '' + [{ + "cniVersion": "0.2.0", + "name": "mynet", + "type": "bridge", + "bridge": "cni0", + "isGateway": true, + "ipMasq": true, + "ipam": { + "type": "host-local", + "subnet": "10.22.0.0/16", + "routes": [ + { "dst": "0.0.0.0/0" } + ] + } + } { + "cniVersion": "0.2.0", + "type": "loopback" + }] + ''; + }; + }; + + manifests = mkOption { + description = "List of manifests to bootstrap with kubelet"; + type = types.attrsOf types.attrs; + default = {}; + }; + extraOpts = mkOption { description = "Kubernetes kubelet extra command line options."; default = ""; @@ -377,12 +560,6 @@ in { type = types.str; }; - master = mkOption { - description = "Kubernetes apiserver address"; - default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; - type = types.str; - }; - extraOpts = mkOption { description = "Kubernetes proxy extra command line options."; default = ""; @@ -390,23 +567,23 @@ in { }; }; - kube2sky = { - enable = mkEnableOption "Whether to enable kube2sky dns service."; + dns = { + enable = mkEnableOption "kubernetes dns service."; + + port = mkOption { + description = "Kubernetes dns listening port"; + default = 53; + type = types.int; + }; domain = mkOption { - description = "Kuberntes kube2sky domain under which all DNS names will be hosted."; + description = "Kuberntes dns domain under which to create names."; default = cfg.kubelet.clusterDomain; type = types.str; }; - master = mkOption { - description = "Kubernetes apiserver address"; - default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; - type = types.str; - }; - extraOpts = mkOption { - description = "Kubernetes kube2sky extra command line options."; + description = "Kubernetes dns extra command line options."; default = ""; type = types.str; }; @@ -416,50 +593,118 @@ in { ###### implementation config = mkMerge [ + (mkIf cfg.kubelet.enable { + systemd.services.kubelet = { + description = "Kubernetes Kubelet Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "docker.service" "kube-apiserver.service" ]; + path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables ]; + preStart = '' + docker load < ${infraContainer} + rm /opt/cni/bin/* || true + ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages} + ''; + serviceConfig = { + ExecStart = ''${cfg.package}/bin/kubelet \ + --pod-manifest-path=${manifests} \ + --kubeconfig=${kubeconfig} \ + --require-kubeconfig \ + --address=${cfg.kubelet.address} \ + --port=${toString cfg.kubelet.port} \ + --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \ + --register-schedulable=${if cfg.kubelet.registerSchedulable then "true" else "false"} \ + ${optionalString (cfg.kubelet.tlsCertFile != null) + "--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \ + ${optionalString (cfg.kubelet.tlsKeyFile != null) + "--tls-private-key-file=${cfg.kubelet.tlsKeyFile}"} \ + --healthz-bind-address=${cfg.kubelet.healthz.bind} \ + --healthz-port=${toString cfg.kubelet.healthz.port} \ + --hostname-override=${cfg.kubelet.hostname} \ + --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ + --root-dir=${cfg.dataDir} \ + --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ + ${optionalString (cfg.kubelet.clusterDns != "") + "--cluster-dns=${cfg.kubelet.clusterDns}"} \ + ${optionalString (cfg.kubelet.clusterDomain != "") + "--cluster-domain=${cfg.kubelet.clusterDomain}"} \ + --pod-infra-container-image=pause \ + ${optionalString (cfg.kubelet.networkPlugin != null) + "--network-plugin=${cfg.kubelet.networkPlugin}"} \ + --cni-conf-dir=${cniConfig} \ + --reconcile-cidr \ + --hairpin-mode=hairpin-veth \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${cfg.kubelet.extraOpts} + ''; + WorkingDirectory = cfg.dataDir; + }; + }; + + environment.etc = mapAttrs' (name: manifest: + nameValuePair "kubernetes/manifests/${name}.json" { + text = builtins.toJSON manifest; + mode = "0755"; + } + ) cfg.kubelet.manifests; + + # Allways include cni plugins + services.kubernetes.kubelet.cni.packages = [pkgs.cni]; + }) + (mkIf cfg.apiserver.enable { systemd.services.kube-apiserver = { - description = "Kubernetes Api Server"; + description = "Kubernetes Kubelet Service"; wantedBy = [ "multi-user.target" ]; - requires = ["kubernetes-setup.service"]; - after = [ "network.target" "etcd.service" "kubernetes-setup.service" ]; + after = [ "network.target" "docker.service" ]; serviceConfig = { - ExecStart = let - authorizationPolicyFile = - pkgs.writeText "kubernetes-policy" - (builtins.toJSON cfg.apiserver.authorizationPolicy); - tokenAuthFile = - pkgs.writeText "kubernetes-auth" - (concatImapStringsSep "\n" (i: v: v + "," + (toString i)) - (mapAttrsToList (name: token: token + "," + name) cfg.apiserver.tokenAuth)); - in ''${cfg.package}/bin/kube-apiserver \ - --etcd-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ - --insecure-bind-address=${cfg.apiserver.address} \ + ExecStart = ''${cfg.package}/bin/kube-apiserver \ + --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \ + ${optionalString (cfg.etcd.caFile != null) + "--etcd-cafile=${cfg.etcd.caFile}"} \ + ${optionalString (cfg.etcd.certFile != null) + "--etcd-certfile=${cfg.etcd.certFile}"} \ + ${optionalString (cfg.etcd.keyFile != null) + "--etcd-keyfile=${cfg.etcd.keyFile}"} \ --insecure-port=${toString cfg.apiserver.port} \ - --bind-address=${cfg.apiserver.publicAddress} \ + --bind-address=0.0.0.0 \ + ${optionalString (cfg.apiserver.advertiseAddress != null) + "--advertise-address=${cfg.apiserver.advertiseAddress}"} \ --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ - ${optionalString (cfg.apiserver.tlsCertFile!="") + ${optionalString (cfg.apiserver.tlsCertFile != null) "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \ - ${optionalString (cfg.apiserver.tlsPrivateKeyFile!="") - "--tls-private-key-file=${cfg.apiserver.tlsPrivateKeyFile}"} \ - ${optionalString (cfg.apiserver.tokenAuth!=[]) - "--token-auth-file=${tokenAuthFile}"} \ - ${optionalString (cfg.apiserver.clientCaFile!="") + ${optionalString (cfg.apiserver.tlsKeyFile != null) + "--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \ + ${optionalString (cfg.apiserver.tokenAuth != null) + "--token-auth-file=${cfg.apiserver.tokenAuth}"} \ + --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \ + ${optionalString (cfg.apiserver.kubeletClientCaFile != null) + "--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \ + ${optionalString (cfg.apiserver.kubeletClientCertFile != null) + "--kubelet-client-certificate=${cfg.apiserver.kubeletClientCertFile}"} \ + ${optionalString (cfg.apiserver.kubeletClientKeyFile != null) + "--kubelet-client-key=${cfg.apiserver.kubeletClientKeyFile}"} \ + ${optionalString (cfg.apiserver.clientCaFile != null) "--client-ca-file=${cfg.apiserver.clientCaFile}"} \ --authorization-mode=${cfg.apiserver.authorizationMode} \ ${optionalString (cfg.apiserver.authorizationMode == "ABAC") - "--authorization-policy-file=${authorizationPolicyFile}"} \ + "--authorization-policy-file=${policyFile}"} \ --secure-port=${toString cfg.apiserver.securePort} \ --service-cluster-ip-range=${cfg.apiserver.portalNet} \ - ${optionalString (cfg.apiserver.runtimeConfig!="") + ${optionalString (cfg.apiserver.runtimeConfig != "") "--runtime-config=${cfg.apiserver.runtimeConfig}"} \ --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \ - ${optionalString (cfg.apiserver.serviceAccountKey!=null) - "--service-account-key-file=${cfg.apiserver.serviceAccountKey}"} \ - --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ + ${optionalString (cfg.apiserver.serviceAccountKeyFile!=null) + "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \ + ${optionalString cfg.verbose "--v=6"} \ + ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; + WorkingDirectory = cfg.dataDir; User = "kubernetes"; + Group = "kubernetes"; + AmbientCapabilities = "cap_net_bind_service"; + Restart = "on-failure"; + RestartSec = 5; }; }; }) @@ -468,17 +713,20 @@ in { systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "kubernetes-apiserver.service" ]; + after = [ "kube-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-scheduler \ --address=${cfg.scheduler.address} \ --port=${toString cfg.scheduler.port} \ - --master=${cfg.scheduler.master} \ - --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ + --leader-elect=${if cfg.scheduler.leaderElect then "true" else "false"} \ + --kubeconfig=${kubeconfig} \ + ${optionalString cfg.verbose "--v=6"} \ + ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ ${cfg.scheduler.extraOpts} ''; + WorkingDirectory = cfg.dataDir; User = "kubernetes"; + Group = "kubernetes"; }; }; }) @@ -487,113 +735,94 @@ in { systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "kubernetes-apiserver.service" ]; + after = [ "kube-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-controller-manager \ --address=${cfg.controllerManager.address} \ --port=${toString cfg.controllerManager.port} \ - --master=${cfg.controllerManager.master} \ - ${optionalString (cfg.controllerManager.serviceAccountPrivateKey!=null) - "--service-account-private-key-file=${cfg.controllerManager.serviceAccountPrivateKey}"} \ + --kubeconfig=${kubeconfig} \ + --leader-elect=${if cfg.controllerManager.leaderElect then "true" else "false"} \ + ${if (cfg.controllerManager.serviceAccountKeyFile!=null) + then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}" + else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \ ${optionalString (cfg.controllerManager.rootCaFile!=null) "--root-ca-file=${cfg.controllerManager.rootCaFile}"} \ - --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ + ${optionalString (cfg.controllerManager.clusterCidr!=null) + "--cluster-cidr=${cfg.controllerManager.clusterCidr}"} \ + --allocate-node-cidrs=true \ + ${optionalString cfg.verbose "--v=6"} \ + ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ ${cfg.controllerManager.extraOpts} ''; + WorkingDirectory = cfg.dataDir; User = "kubernetes"; + Group = "kubernetes"; }; }; }) - (mkIf cfg.kubelet.enable { - systemd.services.kubelet = { - description = "Kubernetes Kubelet Service"; - wantedBy = [ "multi-user.target" ]; - requires = ["kubernetes-setup.service"]; - after = [ "network.target" "etcd.service" "docker.service" "kubernetes-setup.service" ]; - path = [ pkgs.gitMinimal pkgs.openssh ]; - script = '' - export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" - exec ${cfg.package}/bin/kubelet \ - --api-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ - --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \ - --address=${cfg.kubelet.address} \ - --port=${toString cfg.kubelet.port} \ - --healthz-bind-address=${cfg.kubelet.healthz.bind} \ - --healthz-port=${toString cfg.kubelet.healthz.port} \ - --hostname-override=${cfg.kubelet.hostname} \ - --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ - --root-dir=${cfg.dataDir} \ - --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ - ${optionalString (cfg.kubelet.clusterDns != "") - ''--cluster-dns=${cfg.kubelet.clusterDns}''} \ - ${optionalString (cfg.kubelet.clusterDomain != "") - ''--cluster-domain=${cfg.kubelet.clusterDomain}''} \ - --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ - ${cfg.kubelet.extraOpts} - ''; - serviceConfig.WorkingDirectory = cfg.dataDir; - }; - }) - (mkIf cfg.proxy.enable { systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "etcd.service" ]; + after = [ "kube-apiserver.service" ]; + path = [pkgs.iptables]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ - --master=${cfg.proxy.master} \ + --kubeconfig=${kubeconfig} \ --bind-address=${cfg.proxy.address} \ - --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ - ${cfg.proxy.extraOpts} + ${optionalString cfg.verbose "--v=6"} \ + ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ + ${cfg.controllerManager.extraOpts} ''; - Restart = "always"; # Retry connection - RestartSec = "5s"; + WorkingDirectory = cfg.dataDir; }; }; }) - (mkIf cfg.kube2sky.enable { - systemd.services.kube2sky = { - description = "Kubernetes Dns Bridge Service"; + (mkIf cfg.dns.enable { + systemd.services.kube-dns = { + description = "Kubernetes Dns Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "skydns.service" "etcd.service" "kubernetes-apiserver.service" ]; + after = [ "kube-apiserver.service" ]; serviceConfig = { - ExecStart = ''${cfg.package}/bin/kube2sky \ - -etcd-server=http://${head cfg.etcdServers} \ - -domain=${cfg.kube2sky.domain} \ - -kube_master_url=http://${cfg.kube2sky.master} \ - -logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ - ${cfg.kube2sky.extraOpts} + ExecStart = ''${cfg.package}/bin/kube-dns \ + --kubecfg-file=${kubeconfig} \ + --dns-port=${toString cfg.dns.port} \ + --domain=${cfg.dns.domain} \ + ${optionalString cfg.verbose "--v=6"} \ + ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ + ${cfg.dns.extraOpts} ''; + WorkingDirectory = cfg.dataDir; User = "kubernetes"; + Group = "kubernetes"; + AmbientCapabilities = "cap_net_bind_service"; + SendSIGHUP = true; }; }; }) + (mkIf cfg.kubelet.enable { + boot.kernelModules = ["br_netfilter"]; + }) + (mkIf (any (el: el == "master") cfg.roles) { + virtualisation.docker.enable = mkDefault true; + services.kubernetes.kubelet.enable = mkDefault true; + services.kubernetes.kubelet.allowPrivileged = mkDefault true; services.kubernetes.apiserver.enable = mkDefault true; services.kubernetes.scheduler.enable = mkDefault true; services.kubernetes.controllerManager.enable = mkDefault true; - services.kubernetes.kube2sky.enable = mkDefault true; + services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]); }) (mkIf (any (el: el == "node") cfg.roles) { virtualisation.docker.enable = mkDefault true; + virtualisation.docker.logDriver = mkDefault "json-file"; services.kubernetes.kubelet.enable = mkDefault true; services.kubernetes.proxy.enable = mkDefault true; - }) - - (mkIf (any (el: el == "node" || el == "master") cfg.roles) { - services.etcd.enable = mkDefault true; - - services.skydns.enable = mkDefault true; - services.skydns.domain = mkDefault cfg.kubelet.clusterDomain; + services.kubernetes.dns.enable = mkDefault true; }) (mkIf ( @@ -601,24 +830,16 @@ in { cfg.scheduler.enable || cfg.controllerManager.enable || cfg.kubelet.enable || - cfg.proxy.enable + cfg.proxy.enable || + cfg.dns.enable ) { - systemd.services.kubernetes-setup = { - description = "Kubernetes setup."; - serviceConfig.Type = "oneshot"; - script = '' - mkdir -p /var/run/kubernetes - chown kubernetes /var/lib/kubernetes - - rm ${cfg.dataDir}/.dockercfg || true - ln -fs ${pkgs.writeText "kubernetes-dockercfg" cfg.dockerCfg} ${cfg.dataDir}/.dockercfg - ''; - }; - - services.kubernetes.package = mkDefault pkgs.kubernetes; + systemd.tmpfiles.rules = [ + "d /opt/cni/bin 0755 root root -" + "d /var/run/kubernetes 0755 kubernetes kubernetes -" + "d /var/lib/kubernetes 0755 kubernetes kubernetes -" + ]; environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { name = "kubernetes"; uid = config.ids.uids.kubernetes; @@ -630,6 +851,5 @@ in { }; users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes; }) - ]; } diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index b19ea67b0baf..273bd3c80c19 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -1,182 +1,408 @@ -# This test runs two node kubernetes cluster and checks if simple redis pod works +{ system ? builtins.currentSystem }: -import ./make-test.nix ({ pkgs, ...} : rec { - name = "kubernetes"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; +with import ../lib/testing.nix { inherit system; }; +with import ../lib/qemu-flags.nix; +with pkgs.lib; + +let + redisPod = pkgs.writeText "redis-master-pod.json" (builtins.toJSON { + kind = "Pod"; + apiVersion = "v1"; + metadata.name = "redis"; + metadata.labels.name = "redis"; + spec.containers = [{ + name = "redis"; + image = "redis"; + args = ["--bind" "0.0.0.0"]; + imagePullPolicy = "Never"; + ports = [{ + name = "redis-server"; + containerPort = 6379; + }]; + }]; + }); + + redisService = pkgs.writeText "redis-service.json" (builtins.toJSON { + kind = "Service"; + apiVersion = "v1"; + metadata.name = "redis"; + spec = { + ports = [{port = 6379; targetPort = 6379;}]; + selector = {name = "redis";}; + }; + }); + + redisImage = pkgs.dockerTools.buildImage { + name = "redis"; + tag = "latest"; + contents = pkgs.redis; + config.Entrypoint = "/bin/redis-server"; }; - redisMaster = builtins.toFile "redis-master-pod.yaml" '' - id: redis-master-pod - kind: Pod - apiVersion: v1beta1 - desiredState: - manifest: - version: v1beta1 - id: redis-master-pod - containers: - - name: master - image: master:5000/nix - cpu: 100 - ports: - - name: redis-server - containerPort: 6379 - hostPort: 6379 - volumeMounts: - - name: nix-store - mountPath: /nix/store - readOnly: true - volumeMounts: - - name: system-profile - mountPath: /bin - readOnly: true - command: - - /bin/redis-server - volumes: - - name: nix-store - source: - hostDir: - path: /nix/store - - name: system-profile - source: - hostDir: - path: /run/current-system/sw/bin - labels: - name: redis - role: master + testSimplePod = '' + $kubernetes->execute("docker load < ${redisImage}"); + $kubernetes->waitUntilSucceeds("kubectl create -f ${redisPod}"); + $kubernetes->succeed("kubectl create -f ${redisService}"); + $kubernetes->waitUntilSucceeds("kubectl get pod redis | grep Running"); + $kubernetes->succeed("nc -z \$\(dig \@10.10.0.1 redis.default.svc.cluster.local +short\) 6379"); ''; +in { + # This test runs kubernetes on a single node + trivial = makeTest { + name = "kubernetes-trivial"; - nodes = { - master = - { config, pkgs, lib, nodes, ... }: - { - virtualisation.memorySize = 768; - services.kubernetes = { - roles = ["master" "node"]; - dockerCfg = ''{"master:5000":{}}''; - controllerManager.machines = ["master" "node"]; - apiserver.address = "0.0.0.0"; - verbose = true; + nodes = { + kubernetes = + { config, pkgs, lib, nodes, ... }: + { + virtualisation.memorySize = 768; + virtualisation.diskSize = 2048; + + programs.bash.enableCompletion = true; + + services.kubernetes.roles = ["master" "node"]; + virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0"; + + networking.bridges.cbr0.interfaces = []; + networking.interfaces.cbr0 = {}; }; - virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0 --insecure-registry master:5000"; + }; - services.etcd = { - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://master:7001"]; - initialCluster = ["master=http://master:7001" "node=http://node:7001"]; - }; - services.dockerRegistry.enable = true; - services.dockerRegistry.host = "0.0.0.0"; - services.dockerRegistry.port = 5000; + testScript = '' + startAll; - virtualisation.vlans = [ 1 2 ]; - networking.bridges = { - cbr0.interfaces = [ "eth2" ]; - }; - networking.interfaces = { - cbr0 = { - ipAddress = "10.10.0.1"; - prefixLength = 24; - }; - eth2.ip4 = lib.mkOverride 0 [ ]; - }; - networking.localCommands = '' - ip route add 10.10.0.0/16 dev cbr0 - ip route flush cache - ''; - networking.extraHosts = "127.0.0.1 master"; + $kubernetes->waitUntilSucceeds("kubectl get nodes | grep kubernetes | grep Ready"); - networking.firewall.enable = false; - #networking.firewall.allowedTCPPorts = [ 4001 7001 ]; - - environment.systemPackages = [ pkgs.redis ]; - }; - - node = - { config, pkgs, lib, nodes, ... }: - { - services.kubernetes = { - roles = ["node"]; - dockerCfg = ''{"master:5000":{}}''; - kubelet.apiServers = ["master:8080"]; - verbose = true; - }; - virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0 --insecure-registry master:5000"; - services.etcd = { - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node:7001"]; - initialCluster = ["master=http://master:7001" "node=http://node:7001"]; - }; - - virtualisation.vlans = [ 1 2 ]; - networking.bridges = { - cbr0.interfaces = [ "eth2" ]; - }; - networking.interfaces = { - cbr0 = { - ipAddress = "10.10.1.1"; - prefixLength = 24; - }; - eth2.ip4 = lib.mkOverride 0 [ ]; - }; - networking.localCommands = '' - ip route add 10.10.0.0/16 dev cbr0 - ip route flush cache - ''; - networking.extraHosts = "127.0.0.1 node"; - - networking.firewall.enable = false; - #networking.firewall.allowedTCPPorts = [ 4001 7001 ]; - - environment.systemPackages = [ pkgs.redis ]; - }; - - client = - { config, pkgs, nodes, ... }: - { - virtualisation.docker.enable = true; - virtualisation.docker.extraOptions = "--insecure-registry master:5000"; - environment.systemPackages = [ pkgs.kubernetes ]; - environment.etc."test/redis-master-pod.yaml".source = redisMaster; - environment.etc."test/pause".source = "${pkgs.kubernetes}/bin/kube-pause"; - environment.etc."test/Dockerfile".source = pkgs.writeText "Dockerfile" '' - FROM scratch - ADD pause / - ENTRYPOINT ["/pause"] - ''; - }; + ${testSimplePod} + ''; }; - testScript = '' - startAll; + cluster = let + runWithOpenSSL = file: cmd: pkgs.runCommand file { + buildInputs = [ pkgs.openssl ]; + } cmd; - $master->waitForUnit("kubernetes-apiserver.service"); - $master->waitForUnit("kubernetes-scheduler.service"); - $master->waitForUnit("kubernetes-controller-manager.service"); - $master->waitForUnit("kubernetes-kubelet.service"); - $master->waitForUnit("kubernetes-proxy.service"); + ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048"; + ca_pem = runWithOpenSSL "ca.pem" '' + openssl req \ + -x509 -new -nodes -key ${ca_key} \ + -days 10000 -out $out -subj "/CN=etcd-ca" + ''; + etcd_key = runWithOpenSSL "etcd-key.pem" "openssl genrsa -out $out 2048"; + etcd_csr = runWithOpenSSL "etcd.csr" '' + openssl req \ + -new -key ${etcd_key} \ + -out $out -subj "/CN=etcd" \ + -config ${openssl_cnf} + ''; + etcd_cert = runWithOpenSSL "etcd.pem" '' + openssl x509 \ + -req -in ${etcd_csr} \ + -CA ${ca_pem} -CAkey ${ca_key} \ + -CAcreateserial -out $out \ + -days 365 -extensions v3_req \ + -extfile ${openssl_cnf} + ''; - $node->waitForUnit("kubernetes-kubelet.service"); - $node->waitForUnit("kubernetes-proxy.service"); + etcd_client_key = runWithOpenSSL "etcd-client-key.pem" + "openssl genrsa -out $out 2048"; - $master->waitUntilSucceeds("kubectl get minions | grep master"); - $master->waitUntilSucceeds("kubectl get minions | grep node"); + etcd_client_csr = runWithOpenSSL "etcd-client-key.pem" '' + openssl req \ + -new -key ${etcd_client_key} \ + -out $out -subj "/CN=etcd-client" \ + -config ${client_openssl_cnf} + ''; - $client->waitForUnit("docker.service"); - $client->succeed("tar cv --files-from /dev/null | docker import - nix"); - $client->succeed("docker tag nix master:5000/nix"); - $master->waitForUnit("docker-registry.service"); - $client->succeed("docker push master:5000/nix"); - $client->succeed("mkdir -p /root/pause"); - $client->succeed("cp /etc/test/pause /root/pause/"); - $client->succeed("cp /etc/test/Dockerfile /root/pause/"); - $client->succeed("cd /root/pause && docker build -t master:5000/pause ."); - $client->succeed("docker push master:5000/pause"); + etcd_client_cert = runWithOpenSSL "etcd-client.crt" '' + openssl x509 \ + -req -in ${etcd_client_csr} \ + -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \ + -out $out -days 365 -extensions v3_req \ + -extfile ${client_openssl_cnf} + ''; - subtest "simple pod", sub { - $client->succeed("kubectl create -f ${redisMaster} -s http://master:8080"); - $client->waitUntilSucceeds("kubectl get pods -s http://master:8080 | grep redis-master | grep -i running"); - } + apiserver_key = runWithOpenSSL "apiserver-key.pem" "openssl genrsa -out $out 2048"; - ''; -}) + apiserver_csr = runWithOpenSSL "apiserver.csr" '' + openssl req \ + -new -key ${apiserver_key} \ + -out $out -subj "/CN=kube-apiserver" \ + -config ${apiserver_cnf} + ''; + + apiserver_cert = runWithOpenSSL "apiserver.pem" '' + openssl x509 \ + -req -in ${apiserver_csr} \ + -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \ + -out $out -days 365 -extensions v3_req \ + -extfile ${apiserver_cnf} + ''; + + worker_key = runWithOpenSSL "worker-key.pem" "openssl genrsa -out $out 2048"; + + worker_csr = runWithOpenSSL "worker.csr" '' + openssl req \ + -new -key ${worker_key} \ + -out $out -subj "/CN=kube-worker" \ + -config ${worker_cnf} + ''; + + worker_cert = runWithOpenSSL "worker.pem" '' + openssl x509 \ + -req -in ${worker_csr} \ + -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \ + -out $out -days 365 -extensions v3_req \ + -extfile ${worker_cnf} + ''; + + openssl_cnf = pkgs.writeText "openssl.cnf" '' + [req] + req_extensions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = digitalSignature, keyEncipherment + extendedKeyUsage = serverAuth + subjectAltName = @alt_names + [alt_names] + DNS.1 = etcd1 + DNS.2 = etcd2 + DNS.3 = etcd3 + IP.1 = 127.0.0.1 + ''; + + client_openssl_cnf = pkgs.writeText "client-openssl.cnf" '' + [req] + req_extensions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = digitalSignature, keyEncipherment + extendedKeyUsage = clientAuth + ''; + + apiserver_cnf = pkgs.writeText "apiserver-openssl.cnf" '' + [req] + req_extensions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = nonRepudiation, digitalSignature, keyEncipherment + subjectAltName = @alt_names + [alt_names] + DNS.1 = kubernetes + DNS.2 = kubernetes.default + DNS.3 = kubernetes.default.svc + DNS.4 = kubernetes.default.svc.cluster.local + IP.1 = 10.10.10.1 + ''; + + worker_cnf = pkgs.writeText "worker-openssl.cnf" '' + [req] + req_extensions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = nonRepudiation, digitalSignature, keyEncipherment + subjectAltName = @alt_names + [alt_names] + DNS.1 = kubeWorker1 + DNS.2 = kubeWorker2 + ''; + + etcdNodeConfig = { + virtualisation.memorySize = 128; + + services = { + etcd = { + enable = true; + keyFile = etcd_key; + certFile = etcd_cert; + trustedCaFile = ca_pem; + peerClientCertAuth = true; + listenClientUrls = ["https://0.0.0.0:2379"]; + listenPeerUrls = ["https://0.0.0.0:2380"]; + }; + }; + + environment.variables = { + ETCDCTL_CERT_FILE = "${etcd_client_cert}"; + ETCDCTL_KEY_FILE = "${etcd_client_key}"; + ETCDCTL_CA_FILE = "${ca_pem}"; + ETCDCTL_PEERS = "https://127.0.0.1:2379"; + }; + + networking.firewall.allowedTCPPorts = [ 2379 2380 ]; + }; + + kubeConfig = { + virtualisation.diskSize = 2048; + programs.bash.enableCompletion = true; + + services.flannel = { + enable = true; + network = "10.10.0.0/16"; + iface = "eth1"; + etcd = { + endpoints = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"]; + keyFile = etcd_client_key; + certFile = etcd_client_cert; + caFile = ca_pem; + }; + }; + + # vxlan + networking.firewall.allowedUDPPorts = [ 8472 ]; + + systemd.services.docker.after = ["flannel.service"]; + systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/subnet.env"; + virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false --bip $FLANNEL_SUBNET"; + + services.kubernetes.verbose = true; + services.kubernetes.etcd = { + servers = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"]; + keyFile = etcd_client_key; + certFile = etcd_client_cert; + caFile = ca_pem; + }; + + environment.systemPackages = [ pkgs.bind pkgs.tcpdump pkgs.utillinux ]; + }; + + kubeMasterConfig = {pkgs, ...}: { + require = [kubeConfig]; + + # kube apiserver + networking.firewall.allowedTCPPorts = [ 443 ]; + + virtualisation.memorySize = 512; + + services.kubernetes = { + roles = ["master"]; + scheduler.leaderElect = true; + controllerManager.leaderElect = true; + + apiserver = { + publicAddress = "0.0.0.0"; + advertiseAddress = "192.168.1.8"; + tlsKeyFile = apiserver_key; + tlsCertFile = apiserver_cert; + clientCaFile = ca_pem; + kubeletClientCaFile = ca_pem; + kubeletClientKeyFile = worker_key; + kubeletClientCertFile = worker_cert; + }; + }; + }; + + kubeWorkerConfig = { pkgs, ... }: { + require = [kubeConfig]; + + virtualisation.memorySize = 512; + + # kubelet + networking.firewall.allowedTCPPorts = [ 10250 ]; + + services.kubernetes = { + roles = ["node"]; + kubeconfig = { + server = "https://kubernetes:443"; + caFile = ca_pem; + certFile = worker_cert; + keyFile = worker_key; + }; + kubelet = { + tlsKeyFile = worker_key; + tlsCertFile = worker_cert; + }; + }; + }; + in makeTest { + name = "kubernetes-cluster"; + + nodes = { + etcd1 = { config, pkgs, nodes, ... }: { + require = [etcdNodeConfig]; + services.etcd = { + advertiseClientUrls = ["https://etcd1:2379"]; + initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"]; + initialAdvertisePeerUrls = ["https://etcd1:2380"]; + }; + }; + + etcd2 = { config, pkgs, ... }: { + require = [etcdNodeConfig]; + services.etcd = { + advertiseClientUrls = ["https://etcd2:2379"]; + initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"]; + initialAdvertisePeerUrls = ["https://etcd2:2380"]; + }; + }; + + etcd3 = { config, pkgs, ... }: { + require = [etcdNodeConfig]; + services.etcd = { + advertiseClientUrls = ["https://etcd3:2379"]; + initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"]; + initialAdvertisePeerUrls = ["https://etcd3:2380"]; + }; + }; + + kubeMaster1 = { config, pkgs, lib, nodes, ... }: { + require = [kubeMasterConfig]; + }; + + kubeMaster2 = { config, pkgs, lib, nodes, ... }: { + require = [kubeMasterConfig]; + }; + + # Kubernetes TCP load balancer + kubernetes = { config, pkgs, ... }: { + # kubernetes + networking.firewall.allowedTCPPorts = [ 443 ]; + + services.haproxy.enable = true; + services.haproxy.config = '' + global + log 127.0.0.1 local0 notice + user haproxy + group haproxy + + defaults + log global + retries 2 + timeout connect 3000 + timeout server 5000 + timeout client 5000 + + listen kubernetes + bind 0.0.0.0:443 + mode tcp + option ssl-hello-chk + balance roundrobin + server kube-master-1 kubeMaster1:443 check + server kube-master-2 kubeMaster2:443 check + ''; + }; + + kubeWorker1 = { config, pkgs, lib, nodes, ... }: { + require = [kubeWorkerConfig]; + }; + + kubeWorker2 = { config, pkgs, lib, nodes, ... }: { + require = [kubeWorkerConfig]; + }; + }; + + testScript = '' + startAll; + + ${testSimplePod} + ''; + }; +} diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix new file mode 100644 index 000000000000..bdff04cb0738 --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + name = "cni-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "containernetworking"; + repo = "cni"; + rev = "v${version}"; + sha256 = "1nvixvf5slnsdrfpfs2km64x680wf83jbyp7il12bcim37q2az7m"; + }; + + buildInputs = [ go ]; + + outputs = ["out" "plugins"]; + + buildPhase = '' + patchShebangs build + ./build + ''; + + installPhase = '' + mkdir -p $out/bin $plugins + mv bin/cnitool $out/bin + mv bin/* $plugins/ + ''; + + meta = with stdenv.lib; { + description = "Container Network Interface - networking for Linux containers"; + license = licenses.asl20; + homepage = https://github.com/containernetworking/cni; + maintainers = with maintainers; [offline]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 5430902477f2..44444417f3c3 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -48,9 +48,6 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin" - wrapProgram "$out/bin/kubelet" --prefix PATH : "${coreutils}/bin" - # Remove references to go compiler while read file; do cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad2..919e1892edb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12325,6 +12325,8 @@ in pulseaudioSupport = config.pulseaudio or false; }; + cni = callPackage ../applications/networking/cluster/cni {}; + communi = qt5.callPackage ../applications/networking/irc/communi { }; compiz = callPackage ../applications/window-managers/compiz { From 6dae6b87401637fd6ab9c242a95848bba1c773b2 Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Sun, 20 Nov 2016 15:16:56 -0800 Subject: [PATCH 006/149] portaudio: 19-20140130 -> 19-20161030 --- pkgs/development/libraries/portaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 5d8c2430ab9f..98a5513c7e7a 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - name = "portaudio-19-20140130"; - + name = "portaudio-19-20161030"; + src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + url = http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz; sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; }; From 35032ef15f3d14169a6cd399a72713d2d5d1b836 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Tue, 22 Nov 2016 13:40:57 +0100 Subject: [PATCH 007/149] opencv3: added tab to make cflags aligned --- pkgs/development/libraries/opencv/3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index aa2a1660d6fa..0c69e21c8dc4 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ] - ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]; + ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]; enableParallelBuilding = true; From 589cc65306229223176010d0b512fd676c491df6 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 22 Nov 2016 22:48:18 +0100 Subject: [PATCH 008/149] postgresql: add 9.6.1 --- pkgs/servers/sql/postgresql/default.nix | 33 +++++++++++++------ .../postgresql/hardcode-pgxs-path-96.patch | 14 ++++++++ .../sql/postgresql/less-is-more-96.patch | 12 +++++++ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch create mode 100644 pkgs/servers/sql/postgresql/less-is-more-96.patch diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c0e97dab8125..5417a60f3dc9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, makeWrapper }: let - common = { version, sha256, psqlSchema } @ args: stdenv.mkDerivation (rec { + common = { version, sha256, psqlSchema } @ args: + let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec { name = "postgresql-${version}"; src = fetchurl { @@ -14,7 +15,7 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl ] + [ zlib readline openssl makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; @@ -30,9 +31,9 @@ let ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = - [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) - ./less-is-more.patch - ./hardcode-pgxs-path.patch + [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) + (if atLeast "9.6" then ./less-is-more-96.patch else ./less-is-more.patch) + (if atLeast "9.6" then ./hardcode-pgxs-path-96.patch else ./hardcode-pgxs-path.patch) ./specify_pkglibdir_at_runtime.patch ]; @@ -41,10 +42,11 @@ let LC_ALL = "C"; postConfigure = - '' - # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "src/bin/pg_config/pg_config.c" --replace HARDCODED_PGXS_PATH $out/lib - ''; + let path = if atLeast "9.6" then "src/common/config_info.c" else "src/bin/pg_config/pg_config.c"; in + '' + # Hardcode the path to pgxs so pg_config returns the path in $out + substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $out/lib + ''; postInstall = '' @@ -56,6 +58,12 @@ let substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld ''; + postFixup = + '' + # initdb needs access to "locale" command from glibc. + wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin + ''; + disallowedReferences = [ stdenv.cc ]; passthru = { @@ -104,5 +112,10 @@ in { sha256 = "1l3fqxlpxgl6nrcd4h6lpi2hsiv56yg83n3xrn704rmdch8mfpng"; }; + postgresql96 = common { + version = "9.6.1"; + psqlSchema = "9.6"; + sha256 = "1k8zwnabsl8f7vlp3azm4lrklkb9jkaxmihqf0mc27ql9451w475"; + }; } diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch b/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch new file mode 100644 index 000000000000..6cd449769baa --- /dev/null +++ b/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch @@ -0,0 +1,14 @@ +diff -Naur postgresql-9.6.1-orig/src/common/config_info.c postgresql-9.6.1/src/common/config_info.c +--- postgresql-9.6.1-orig/src/common/config_info.c 2016-11-22 21:39:29.231929261 +0100 ++++ postgresql-9.6.1/src/common/config_info.c 2016-11-22 23:36:53.685163543 +0100 +@@ -118,7 +118,10 @@ + i++; + + configdata[i].name = pstrdup("PGXS"); ++ strlcpy(path, "HARDCODED_PGXS_PATH", sizeof(path)); ++/* commented out to be able to point to nix $out path + get_pkglib_path(my_exec_path, path); ++*/ + strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); + cleanup_path(path); + configdata[i].setting = pstrdup(path); diff --git a/pkgs/servers/sql/postgresql/less-is-more-96.patch b/pkgs/servers/sql/postgresql/less-is-more-96.patch new file mode 100644 index 000000000000..f14af9dc2207 --- /dev/null +++ b/pkgs/servers/sql/postgresql/less-is-more-96.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.6.1-orig/src/include/fe_utils/print.h postgresql-9.6.1/src/include/fe_utils/print.h +--- postgresql-9.6.1-orig/src/include/fe_utils/print.h 2016-11-22 21:39:29.148932827 +0100 ++++ postgresql-9.6.1/src/include/fe_utils/print.h 2016-11-22 21:39:36.283626258 +0100 +@@ -18,7 +18,7 @@ + + /* This is not a particularly great place for this ... */ + #ifndef __CYGWIN__ +-#define DEFAULT_PAGER "more" ++#define DEFAULT_PAGER "less" + #else + #define DEFAULT_PAGER "less" + #endif diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecb48fd70887..7afed9299f3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10324,7 +10324,8 @@ in postgresql92 postgresql93 postgresql94 - postgresql95; + postgresql95 + postgresql96; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; From 8c887535ddde0383560d4867957dda194e143193 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 23 Nov 2016 00:13:26 +0100 Subject: [PATCH 009/149] postgresql: bug fix updates for all versions See https://www.postgresql.org/about/news/1712/ --- pkgs/servers/sql/postgresql/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c0e97dab8125..a5a8d0bc6d03 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -75,33 +75,33 @@ let in { postgresql91 = common { - version = "9.1.23"; + version = "9.1.24"; psqlSchema = "9.1"; - sha256 = "1mgnfm65fspkq62skfy48rjkprnxcfhydw0x3ipp4sdkngl72x3z"; + sha256 = "1lz5ibvgz6cxprxlnd7a8iwv387idr7k53bdsvy4bw9ayglq83fy"; }; postgresql92 = common { - version = "9.2.18"; + version = "9.2.19"; psqlSchema = "9.2"; - sha256 = "1x1mxbwqvgj9s4y8pb4vv6fmmr36z5zl3b2ggb84ckdfhvakganp"; + sha256 = "1bfvx1h1baxp40y4xi88974p43vazz13mwc0h8scq3sr9wxdfa8x"; }; postgresql93 = common { - version = "9.3.14"; + version = "9.3.15"; psqlSchema = "9.3"; - sha256 = "1783kl0abf9az90mvs08pdh63d33cv2njc1q515zz89bqkqj4hsw"; + sha256 = "0kswvs4rzcmjz12hhyi61w5x2wh4dxskar8v7rgajfm98qabmz59"; }; postgresql94 = common { - version = "9.4.9"; + version = "9.4.10"; psqlSchema = "9.4"; - sha256 = "1jg1l6vrfwhfyqrx07bgcpqxb5zcp8zwm8qd2vcj0k11j0pac861"; + sha256 = "1kvfhalf3rs59887b5qa14zp85zcnsc6pislrs0wd08rxn5nfqbh"; }; postgresql95 = common { - version = "9.5.4"; + version = "9.5.5"; psqlSchema = "9.5"; - sha256 = "1l3fqxlpxgl6nrcd4h6lpi2hsiv56yg83n3xrn704rmdch8mfpng"; + sha256 = "157kf6mdazmxfmd11f0akya2xcz6sfgprn7yqc26dpklps855ih2"; }; From ffac67fcf3e3f0cc255d39f16ec4eb107703cabc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 20:32:12 +0100 Subject: [PATCH 010/149] nixos/base: don't include dar & cabextract in ISO Should free up lots of space due to dependency on gnupg, which dpeends on openldap which pull in gcc. --- nixos/modules/profiles/base.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 32bea97823ce..d980c298ffcf 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -42,8 +42,6 @@ # Some compression/archiver tools. pkgs.unzip pkgs.zip - pkgs.dar # disk archiver - pkgs.cabextract ]; # Include support for various filesystems. From 5a184be96f87d647f4261d83f32d08ae2f1a7403 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 21:08:19 +0100 Subject: [PATCH 011/149] imlib2: add version without X11 --- pkgs/development/libraries/imlib2/default.nix | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 85e9979ebb07..5181ff886166 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig +, freetype +, x11Support ? true, xlibsWrapper ? null }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "imlib2-1.4.9"; @@ -8,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x"; }; - buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; + buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ] + ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +26,8 @@ stdenv.mkDerivation rec { # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors - configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null; + configureFlags = optional stdenv.isDarwin "--enable-amd64=no" + ++ optional (!x11Support) "--without-x"; meta = { description = "Image manipulation library"; @@ -34,8 +40,8 @@ stdenv.mkDerivation rec { easily, without sacrificing speed. ''; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ spwhitt ]; + license = licenses.free; + platforms = platforms.unix; + maintainers = with maintainers; [ spwhitt ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecb48fd70887..3c7e2ccdc096 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7452,6 +7452,9 @@ in iml = callPackage ../development/libraries/iml { }; imlib2 = callPackage ../development/libraries/imlib2 { }; + imlib2-nox = imlib2.override { + x11Support = false; + }; imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; From f983743d7521fd880e3a8623c0068dc844221ba2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 21:09:14 +0100 Subject: [PATCH 012/149] w3m-nox: use imlib2 without X11 support Also, the minimal live CD previously installed both the X11 and non-X11 versions (through services.nixosManual) of w3m. --- nixos/modules/profiles/base.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index d980c298ffcf..f90d0d992ec8 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,7 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.w3m # needed for the manual anyway + pkgs.w3m-nox # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs pkgs.efibootmgr diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c7e2ccdc096..8550ad5c74cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15105,13 +15105,15 @@ in # Version without X11 w3m-nox = w3m.override { x11Support = false; + imlib2 = imlib2-nox; }; # Version for batch text processing, not a good browser w3m-batch = w3m.override { graphicsSupport = false; - x11Support = false; mouseSupport = false; + x11Support = false; + imlib2 = imlib2-nox; }; weechat = callPackage ../applications/networking/irc/weechat { From d64bf1fdadaac6f24a11de1ed83ca85d7001838e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 22:11:25 +0100 Subject: [PATCH 013/149] imlib2: use multiple outputs --- pkgs/development/libraries/imlib2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 5181ff886166..a6ad33d842c9 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--enable-amd64=no" ++ optional (!x11Support) "--without-x"; + outputs = [ "out" "bin" "dev" ]; + + postInstall = '' + moveToOutput bin/imlib2-config "$dev" + ''; + meta = { description = "Image manipulation library"; From da600849e3f402ce47782e2bc39a1f21a355dfd5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 22:24:37 +0100 Subject: [PATCH 014/149] nixos: disable sound for minimal ISO Saves a few megabytes of ALSA stuff. --- nixos/modules/profiles/minimal.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index b047b7063653..e2497d04252e 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -14,4 +14,6 @@ with lib; programs.man.enable = mkDefault false; programs.info.enable = mkDefault false; + + sound.enable = mkDefault false; } From 6de991bd95953493447e03cb87f181e4c4a547e6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 22:25:55 +0100 Subject: [PATCH 015/149] nixos: compress squashfs with xz --- nixos/lib/make-squashfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 3b640334e17a..2baa4f667607 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { # Generate the squashfs image. mksquashfs nix-path-registration $storePaths $out \ - -keep-as-directory -all-root + -keep-as-directory -all-root -comp xz ''; } From 7974d7493a6275aacf4e6d8717db168ccd6930e7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 01:05:28 +0100 Subject: [PATCH 016/149] linux: compress kernel image with xz --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e650b7abc1c7..ab5af38d8b67 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -27,6 +27,8 @@ with stdenv.lib; MODULE_COMPRESS_XZ y ''} + KERNEL_XZ y + # Debugging. DEBUG_KERNEL y TIMER_STATS y From 1d08acb3053936b6d67bbdbfb06a66f5f64bdc9e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 01:31:44 +0100 Subject: [PATCH 017/149] giblib: fix compat with imlib2 multiple outputs --- pkgs/development/libraries/giblib/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 9a73b82f8884..17847695f973 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation rec { name = "giblib-1.2.4"; - + src = fetchurl { url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; - - buildInputs = [xlibsWrapper imlib2]; + + buildInputs = [ xlibsWrapper ]; + propagatedBuildInputs = [ imlib2 ]; meta = { homepage = http://linuxbrit.co.uk/giblib/; + description = "wrapper library for imlib2, and other stuff"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; }; } From b75e13b7e66026c8d0707c5e1d1290ce90f306d5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 22 Nov 2016 21:05:27 +0100 Subject: [PATCH 018/149] trv: fix installation of binaries --- pkgs/development/tools/misc/trv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 4b00e92b4c3c..e73d77f772df 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; dontStrip = true; - installFlags = "SEMVER=${version} PREFIX=$out"; + installFlags = "SEMVER=${version} PREFIX=$(out)"; meta = with stdenv.lib; { homepage = https://github.com/afiniate/trv; From 97a496a472ded2ca22a5a1bdf91752cd3e1b8df0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 22 Nov 2016 21:07:09 +0100 Subject: [PATCH 019/149] ocamlPackages.ocplib-simplex: init at 0.3 ocplib-simplex is a (fully) functional OCaml implementation of the simplex algorithm for solving systems of linear inequalities. homepage: https://github.com/OCamlPro-Iguernlala/ocplib-simplex --- .../ocaml-modules/ocplib-simplex/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocplib-simplex/default.nix diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix new file mode 100644 index 000000000000..4ce3ac6dff30 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib }: + +let + pname = "ocplib-simplex"; + version = "0.3"; +in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "OCamlPro-Iguernlala"; + repo = pname; + rev = version; + sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa"; + }; + + buildInputs = [ autoreconfHook ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; + homepage = https://github.com/OCamlPro-Iguernlala/ocplib-simplex; + inherit (ocaml.meta) platforms; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ba006319261d..391e2c80a57f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -339,6 +339,8 @@ let ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ojquery = callPackage ../development/ocaml-modules/ojquery { }; From b4077f32101d7f98ff0e0fe19b91ff23db15de28 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 23 Nov 2016 07:30:00 -0200 Subject: [PATCH 020/149] xcape: git-2015-03-01 -> 1.2 --- pkgs/tools/X11/xcape/default.nix | 57 +++++++++++++++++++------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index 5436edd0ea37..894f082a708c 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -1,31 +1,42 @@ -{stdenv, fetchurl, fetchgit, libX11, xproto, libXtst, xextproto, pkgconfig -, inputproto, libXi}: +{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xextproto, +libXi }: + let - s = rec { - baseName = "xcape"; - version = "git-2015-03-01"; - name = "${baseName}-${version}"; - }; - buildInputs = [ - libX11 libXtst xproto xextproto pkgconfig inputproto libXi - ]; + baseName = "xcape"; + version = "1.2"; in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchgit { - url = https://github.com/alols/xcape; - rev = "f3802fc086ce9d961d644a5d29ad5b650db56215"; - sha256 = "0d79riwzmjr621ss3yhxqn2q8chn3f9rvk2nnjckz5yxbifvfg9s"; + +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "alols"; + repo = baseName; + rev = "v${version}"; + sha256 = "09a05cxgrip6nqy1qmwblamp2bhknqnqmxn7i2a1rgxa0nba95dm"; }; - preConfigure = '' - makeFlags="$makeFlags PREFIX=$out" - ''; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libX11 libXtst xextproto libXi ]; + + makeFlags = [ "PREFIX=$(out)" "MANDIR=/share/man/man1" ]; + + postInstall = "install -D --target-directory $out/share/doc README.md"; + meta = { - inherit (s) version; - description = ''A tool to have Escape and Control on a single key''; + description = "Utility to configure modifier keys to act as other keys"; + longDescription = '' + xcape allows you to use a modifier key as another key when + pressed and released on its own. Note that it is slightly + slower than pressing the original key, because the pressed event + does not occur until the key is released. The default behaviour + is to generate the Escape key when Left Control is pressed and + released on its own. + ''; + homepage = "https://github.com/alols/xcape"; license = stdenv.lib.licenses.gpl3 ; - maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; }; } From 6f5a704205a52a1ae1ca735dc5c8c60bc1be4b2e Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 23 Nov 2016 07:49:19 -0200 Subject: [PATCH 021/149] aria2: 1.28.0 -> 1.29.0 --- pkgs/tools/networking/aria2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index eec84e103867..ab82851f178f 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw"; + sha256 = "1ivxz2ld4cl9z29kdicban9dir6s0si2jqn4g11gz587x7pagbim"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://aria2.github.io; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; - maintainers = with maintainers; [ koral jgeerds ]; license = licenses.gpl2Plus; platforms = platforms.unix; + maintainers = with maintainers; [ koral jgeerds ]; }; } From 247a77ad002e233d16f63bfe68234ecaf275b120 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 23 Nov 2016 10:50:58 +0100 Subject: [PATCH 022/149] snapraid: 10.0 -> 11.0 --- pkgs/tools/filesystems/snapraid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 3946d6fcef84..bbaad516ebe0 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "10.0"; + version = "11.0"; src = fetchurl { url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz"; - sha256 = "1mhs0gl285a5y2bw6k04lrnyg1pp2am7dfcsvg0w4vr5h2ag3p7p"; + sha256 = "0wapbi8ph7qcyh1jwyrn2r5slzsznlxvg137r4l02xgaaf42p9rh"; }; doCheck = true; From 3975f5bd5ea7e964e93cfcd7291f72c7331c88d9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 23 Nov 2016 20:03:21 +0800 Subject: [PATCH 023/149] syncthing: 0.14.11 -> 0.14.12 (#20645) --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2601078df224..d46120e00888 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: stdenv.mkDerivation rec { - version = "0.14.11"; + version = "0.14.12"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "12b8284mya5z1q7ighbzk8rqxj0kcv5n0l39dygikfcbl1krr6sg"; + sha256 = "09w0i9rmdi9fjsphib2x6gs6yn5d1a41nh1pm4k9ks31am9zdwsm"; }; buildInputs = [ go ]; From 1305691cec7af1aeda33f46abe27fd29af087694 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 04:52:07 +0100 Subject: [PATCH 024/149] mpv: 0.21.0 -> 0.22.0 --- pkgs/applications/video/mpv/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3ed58017fe2f..dd9c67b952f5 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -79,13 +79,13 @@ let }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "1v1qfppysi0qn40q9z7cx9gs7pcrz2hn1g44iynygvgj29h1gify"; + sha256 = "0mv8fs2zxp6pvpi5xdrpvvqcaa5f0c83jdfi0pfqnwbpkz1kb9s6"; }; patchPhase = '' @@ -160,6 +160,11 @@ in stdenv.mkDerivation rec { --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH" + '' + '' + + cp TOOLS/umpv $out/bin + wrapProgram $out/bin/umpv \ + --set MPV "$out/bin/mpv" ''; meta = with stdenv.lib; { From 6c2a1b55b52d867b73701f28f30deeea2db09f23 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 04:52:46 +0100 Subject: [PATCH 025/149] tmux: use currently maintained bash completion repo --- pkgs/tools/misc/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 9052c5ce6d53..95d1a7275d9b 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -3,10 +3,10 @@ let bashCompletion = fetchFromGitHub { - owner = "przepompownia"; + owner = "imomaliev"; repo = "tmux-bash-completion"; - rev = "678a27616b70c649c6701cae9cd8c92b58cc051b"; - sha256 = "1d2myrh4xiay9brsxafb02pi922760sdkyyy5xjm4sfh4iimc4zf"; + rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d"; + sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8"; }; in From 65b3060f6943960cb309e20adb7fee5a1c73b5f6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 01:41:03 +0100 Subject: [PATCH 026/149] qutebrowser: pdfjs: 1.4.20 -> 1.5.188 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 0d9c1a113f8d..5e5f8848ebe0 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -7,11 +7,11 @@ let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; - version = "1.4.20"; + version = "1.5.188"; src = fetchurl { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1ca1fzyc5qnan6gavcd8bnfqriqqvgdsf4m8ka4nayf50k64xxj9"; + sha256 = "1y3yaqfgjj96qzvbm5200x68j5hy1qs7l2mqm3kbbj2b58z9f1qv"; }; nativeBuildInputs = [ unzip ]; From a04a4b2a6aa6e75b0887e6f7d27ded5ea6c0dcd2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 01:01:51 +0100 Subject: [PATCH 027/149] nginxMainline: 1.11.5 -> 1.11.6 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index cfd608962d85..00a5ac2563a3 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.11.5"; - sha256 = "1xmn5m1wjx1n11lwwlcg71836acb43gwq9ngk088jpx78liqlgr2"; + version = "1.11.6"; + sha256 = "1gc5phrzm2hbpvryaya6rlvasa00vjips4hv5q1rqbcfa6xsnlri"; }) From 7a038b931158ae6d1605d6456709b9a9fa90a3a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Nov 2016 14:02:19 +0100 Subject: [PATCH 028/149] libevent: Drop unnecessary autoreconfHook dependency --- pkgs/development/libraries/libevent/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 364ff28f9a62..17aeb1d4377f 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, openssl, findutils }: +{ stdenv, fetchurl, openssl, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { @@ -12,7 +12,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isCygwin findutils; meta = with stdenv.lib; { From 54f8379321d3e44c9d286d29d756c756f3a59f42 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 23 Nov 2016 16:15:45 +0100 Subject: [PATCH 029/149] haskellPackages: fix HDBC-odbc haddockPhase --- .../haskell-modules/configuration-common.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f46735e55511..f521f3100500 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -144,7 +144,6 @@ self: super: { groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; HaXml = dontHaddock super.HaXml; - HDBC-odbc = dontHaddock super.HDBC-odbc; hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; http-client-conduit = dontHaddock super.http-client-conduit; @@ -1067,6 +1066,15 @@ self: super: { # https://github.com/roelvandijk/terminal-progress-bar/issues/13 terminal-progress-bar = doJailbreak super.terminal-progress-bar; + # https://github.com/hdbc/hdbc-odbc/pull/29 + HDBC-odbc = overrideCabal super.HDBC-odbc (old: { + postPatch = old.postPatch or "" + '' + sed -e '/data BoundValue =/ { s/$/{/ ; n; n ; s/{ bvVal/ bvVal/ }' \ + -e 's/-- | This is rather/-- This is rather/' \ + -i Database/HDBC/ODBC/Statement.hsc + ''; + }); + # https://github.com/vshabanov/HsOpenSSL/issues/11 HsOpenSSL = doJailbreak super.HsOpenSSL; From 9755ecf8b093eb079fc752e36762ab2a8899a7f2 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 23 Nov 2016 13:56:08 -0200 Subject: [PATCH 030/149] vivaldi: 1.4.589.38-1 -> 1.5.658.44-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index df08fadfbdf9..2eb91b06ac3f 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -10,16 +10,16 @@ }: let - version = "1.4"; - build = "589.38-1"; + version = "1.5"; + build = "658.44-1"; fullVersion = "stable_${version}.${build}"; info = if stdenv.is64bit then { arch = "amd64"; - sha256 = "08qdpl5dkb2snpqlk3rsqlyl9rfas9v6bbcw2p4kzazhinak5hv3"; + sha256 = "02zb9pw8h7gm0hlhk95bn8fz14x68ax2jz8g7bgzppyryq8xlg6l"; } else { arch = "i386"; - sha256 = "0wpaglc1aaam5bqxgvf5zwcbr0xll8yj63l19q792l51j1vkv56q"; + sha256 = "1cwpmdsv4rrr13d1x017rms7cjp5zh3vpz3b44ar49ip6zj6j0a8"; }; in stdenv.mkDerivation rec { From 5b45caa1de1d0b710b8baf7322638581cc37d336 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 13 Nov 2016 16:14:16 -0500 Subject: [PATCH 031/149] elpa-packages: 2016-11-23 --- .../editors/emacs-modes/elpa-generated.nix | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 2e050d730fcf..eb25a64b7095 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.89.6"; + version = "11.89.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.89.6.tar"; - sha256 = "1lfaki8s9ri6ds88mhpxwqb2jrjf7hbs1w3nxhg307344lac07gy"; + url = "https://elpa.gnu.org/packages/auctex-11.89.7.tar"; + sha256 = "03sxdh6dv4m98yq09hxcph2lgidai8ky22i9acjcp6vfjlsb9mlf"; }; packageRequires = []; meta = { @@ -335,10 +335,10 @@ company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.0.tar"; - sha256 = "1d090j1xv97nbxzz0iq4gmzjijggm8wsd0y1zfsa8syrq8qa0ajs"; + url = "https://elpa.gnu.org/packages/company-0.9.2.tar"; + sha256 = "10divixs06gq9nm8s8x0q12ir07y27d06l52ix2dn84zvj853z4z"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -619,10 +619,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.0.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.0.1.tar"; - sha256 = "14l7zq4bm5ihybpj8qvqpzzmgjsyhr8yq2d4jmadk35q5hlx1cbb"; + url = "https://elpa.gnu.org/packages/el-search-1.1.2.tar"; + sha256 = "1cav55nx1045c3xasi5d76yyqi68ygp9dpqv9bazrqgcpsmw6y8b"; }; packageRequires = [ emacs stream ]; meta = { @@ -712,10 +712,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.11.tar"; - sha256 = "108n09b6512y05rskq754hzwc5nzqmkq1lfrarl34my41wsc1qnf"; + url = "https://elpa.gnu.org/packages/exwm-0.12.tar"; + sha256 = "1h964w9ir8plam45c194af74g5q1wdvgwrldlmlcplcswlsn3n4z"; }; packageRequires = [ xelb ]; meta = { @@ -1351,10 +1351,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161102"; + version = "20161118"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161102.tar"; - sha256 = "12v9jhakdxcmlw9zrcrh1fwi3kh6z0qva90hpnr0zjqyj72i0wir"; + url = "https://elpa.gnu.org/packages/org-20161118.tar"; + sha256 = "1w9g8r08kaiw9f4fjsj0hbffzq85rj734j5lxvbaafbnz7dbklk1"; }; packageRequires = []; meta = { @@ -1703,10 +1703,10 @@ }) {}; spinner = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "spinner"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spinner-1.7.1.el"; - sha256 = "1fmwzdih0kbyvs8bn38mpm4sbs2mikqy2vdykfy9g20wpa8vb681"; + url = "https://elpa.gnu.org/packages/spinner-1.7.3.el"; + sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd"; }; packageRequires = []; meta = { @@ -1901,15 +1901,15 @@ license = lib.licenses.free; }; }) {}; - validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "validate"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/validate-1.0.0.el"; - sha256 = "10js4qds5xi5a89s4v4fz6f71b25g3x8jm1lcpf9s75i1q1xiysk"; + url = "https://elpa.gnu.org/packages/validate-1.0.2.el"; + sha256 = "19xhd9mxkdcisspz5q3bnvf6jjsvmhjjrpw3pq5lgyqbcz8k8dsr"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/validate.html"; license = lib.licenses.free; @@ -2049,10 +2049,10 @@ xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.11.tar"; - sha256 = "12qgbv30dizp7kadq9kg7nfyg5qfbfy14s833zg95fqqa87qg90j"; + url = "https://elpa.gnu.org/packages/xelb-0.12.tar"; + sha256 = "0i9n0f3ibj4a5pwcsvwrah9m0fz32m0x6a9wsmjn3li20v8pcb81"; }; packageRequires = [ cl-generic emacs ]; meta = { From 6cf5768356ffaab132dd37017b02a855b8842ed1 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 13 Nov 2016 16:17:54 -0500 Subject: [PATCH 032/149] melpa-packages: 2016-11-23 --- .../editors/emacs-modes/melpa-generated.nix | 2418 ++++++++++------- 1 file changed, 1471 insertions(+), 947 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 3130ded9f62c..7214f1c850d1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -880,12 +880,12 @@ ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }: melpaBuild { pname = "ace-isearch"; - version = "20160927.330"; + version = "20161107.1730"; src = fetchFromGitHub { owner = "tam17aki"; repo = "ace-isearch"; - rev = "b8c59511d7ff13ed050a80be372121d9cba9e160"; - sha256 = "1flfskn0bsz0mxfys0ipn20355v20d48l8mgf41wb49kvnnd1bmz"; + rev = "33b98ecdb3d5a966cbfc0ec7b104be5afca14f25"; + sha256 = "05a5jf9lx1g5cms5p1js7qxria5dfm310m83zmvwcdr96mfbz9ii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch"; @@ -1173,12 +1173,12 @@ addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "addressbook-bookmark"; - version = "20160925.22"; + version = "20161123.407"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "addressbook-bookmark"; - rev = "53732af6e225976f8d51c971041eed4320987c36"; - sha256 = "0qnh9bk5xgggh80wylzq06alxkj22y9p8lixncjanwhygh80vv3s"; + rev = "98bb27cea55250bbd32e44002b48cd59e436c089"; + sha256 = "0lv7jn4s0fb995z3hy2s3z22yg69zncxc9hwsmpdgh56ds1mw68i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; @@ -1319,11 +1319,11 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20161010.9"; + version = "20161110.455"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; - rev = "5d878053fcbd"; - sha256 = "1jisl6nh3c75fyzmr3azpf5sp8cdcfw8hd4aczbrgpjbii6127np"; + rev = "0e1d1b4142e7"; + sha256 = "09606q8b9qhz1szshv8aapc7450j085rjf2fv769vbivr3kshqvh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; @@ -1423,12 +1423,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "20161002.2144"; + version = "20161122.2304"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "5693e5a7b1d75faee0dd424cd89fd20b3b9d77f6"; - sha256 = "1cim833y3xh2s0vz3zawxbybb1yri8qmfhhk3iqbiw2w9gg2y4qs"; + rev = "26762b767419b13211e331251def9159ee3f8c6b"; + sha256 = "1bss5rgdp37zy4rlyx7j6rngrp9q2ijyr54n5z0r8asmd913r73q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1553,8 +1553,8 @@ src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "a7ef8e703c17c978a82f442c88d250371c5e06f7"; - sha256 = "0gfa1a17wwp66jl0v6pbp9fcn45kp3jsvpd7ha4j590ijikz2yv4"; + rev = "b2d923e51d23e84198e21b025c656bf862eaced6"; + sha256 = "0j5230nas9h6rn4wfsaf5pgd3yxxk615j68y2j01pjrrkxvrwqig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1567,15 +1567,36 @@ license = lib.licenses.free; }; }) {}; + all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "all-the-icons-dired"; + version = "20161113.1217"; + src = fetchFromGitHub { + owner = "jtbm37"; + repo = "all-the-icons-dired"; + rev = "e0244106e06a7cf769bcf36a34fff211d8f67e62"; + sha256 = "1xgp72ycnl1m1lx3cnygd0nssn6nr0x543rq1cmdxdr6snf5j152"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired"; + sha256 = "0fbl3i3wi2ka43xri0i30x561115hmv3j75vpkyzz3g1m9w006br"; + name = "all-the-icons-dired"; + }; + packageRequires = [ all-the-icons emacs ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons-dired"; + license = lib.licenses.free; + }; + }) {}; amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161103.139"; + version = "20161116.534"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "01c487419f2785a4573bdd7e49800414a6f83fe7"; - sha256 = "0fxca3mg3335n4frl332ng1zndw1j3dski7gwa4j4pixc2ihi02m"; + rev = "a50cbdd53bc0e1ed0f96a425bd29f5b706161c18"; + sha256 = "12wxjgvxhnmn27dl2p5m90nxmfkk64w1fn4zmxn2a4fpvb7y579s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1663,12 +1684,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20161028.29"; + version = "20161121.1137"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "ae336344e61c1d38480ec230d85efbe2cb17980f"; - sha256 = "1776s0gf9283amskmaqnpcpflqgvzk87n5qcishiczxijdymry7y"; + rev = "4f84759cab7746cf705f75719e701551d47de1e3"; + sha256 = "1sra3blrdkw4yd3ivsyg64vgd8207clfpqhjchja0x2n3z8792v5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1934,12 +1955,12 @@ ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-vault"; - version = "20161008.1435"; + version = "20161115.1128"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb"; - sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21"; + rev = "f4d9b3a77490071b8c59caa473bb54df86e90362"; + sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; @@ -2429,12 +2450,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20160724.1010"; + version = "20161120.943"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "cddb2a40688b1dac8e0c62595bdffc0c6b5d40a3"; - sha256 = "0h8rrh34mqms27c2nq5f7k93kjvcv9qj0z9f1jjibvxrcw9lpp4y"; + rev = "a84e23eebf26b4f0f5fe9926d8feaf01e7d6c304"; + sha256 = "12lrnv4aqwpvr40351n0qvh2d6p378qffh8fqw9x8dyzcxjyjhpr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2675,12 +2696,12 @@ assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: melpaBuild { pname = "assess"; - version = "20161012.753"; + version = "20161114.1451"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "e2e5f1cbbdeb4bdeb7a474f0ec1b038c3786b1ef"; - sha256 = "1pv8q88f5aj6qxqv0n8knfb3gk079wgk6l0nkch8518pq00vwnif"; + rev = "9521b074808d30c50d45eba7d5c186c79d165e8c"; + sha256 = "164kapf9n5gqgnsg3rrlb5r2j9sq5yn7kf1bd1vfh3i5zdlhl0wy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; @@ -2700,8 +2721,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "82428780ec96e18ae801783f8d7388749fafd5fa"; - sha256 = "17kznp00gs162b205q8mzy6abcf3jrmnqfb1vdv86rk1gzsr483q"; + rev = "54977d6c596a295f7519a0da36407c3a3e055b36"; + sha256 = "1kzah2714nppaai8cckvbryq6b10fwp025fv3kzjspf3sjf5ijva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async"; @@ -2780,12 +2801,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20161106.1438"; + version = "20161114.409"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; - sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; + rev = "62fa0dc6167bd65185ec5138bac5c60acdda2875"; + sha256 = "117a10vns47wnhihblb66ngn581ngqbhbanwhakfc5kd4xflqcaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3323,12 +3344,12 @@ auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-indent-mode"; - version = "20160426.2022"; + version = "20161118.1458"; src = fetchFromGitHub { owner = "mattfidler"; repo = "auto-indent-mode.el"; - rev = "9a0f13d93ad25b6e6b97fd566ec74ef5b6c60254"; - sha256 = "1ya7lnlgrxwrbaxlkl0bbz2m8pic6yjln0dm1mcmr9mjglp8kh6y"; + rev = "7e939f3a7b092c6c32c97d63fd88aef6cc355cdb"; + sha256 = "18c9469b53kwydhrpd8kivwvs0w0ndfbwkyxixjz9wijp0wmpri1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode"; @@ -3425,12 +3446,12 @@ auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-save-buffers-enhanced"; - version = "20130607.1949"; + version = "20161108.2310"; src = fetchFromGitHub { owner = "kentaro"; repo = "auto-save-buffers-enhanced"; - rev = "caf594120781a323ac37eab82bcf87f1ed4c9c42"; - sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2"; + rev = "461e8c816c1b7c650be5f209078b381fe55da8c6"; + sha256 = "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d221a217e9f6a686fa2a8b120a1f0b43c4482ce6/recipes/auto-save-buffers-enhanced"; @@ -3467,12 +3488,12 @@ auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: melpaBuild { pname = "auto-virtualenv"; - version = "20160220.636"; + version = "20161107.1001"; src = fetchFromGitHub { owner = "marcwebbie"; repo = "auto-virtualenv"; - rev = "e55bf927da4e29b0f4d9198f3358a87f9970c3b6"; - sha256 = "1ya5rn55sclh2w5bjy4b2b75gd6bgavfqmhdisz6afp8w4l4a2bv"; + rev = "d352bc4c9d76cb2e1680846f13bae940931d8380"; + sha256 = "1yb1g8xmh5mgkszcch2z7rzmrywl8zyyy7j8ff1agvz0ic4b9893"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ccb91515d9a8195061429ed8df3471867d211f9a/recipes/auto-virtualenv"; @@ -3880,11 +3901,11 @@ axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20161106.509"; + version = "20161120.1200"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "4d70a7ec2429"; - sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; + rev = "485778b352fd"; + sha256 = "010qb68d0vv6h3wqlmrav6qvazm8dcjgkqr9yn4j8s5x3c94a5cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -3900,12 +3921,12 @@ babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "babel"; - version = "20160629.1151"; + version = "20161122.2340"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "babel"; - rev = "bf860f4594f06729b3ff5da2102ec9e3ab8a5ccb"; - sha256 = "1d5v21ig92w30dllhp2cqbjqma2l0l87cjqqlx721qx15zfhxxxb"; + rev = "d4212e25fcbd22b8e38be13936f937a2963d34a9"; + sha256 = "0lxiavjs2fbwlqbmkl2hssjzv8a8baa8vvqqfnprhnipngkkgdaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc/recipes/babel"; @@ -4135,12 +4156,12 @@ basic-c-compile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "basic-c-compile"; - version = "20160803.527"; + version = "20161114.2134"; src = fetchFromGitHub { owner = "nick96"; repo = "basic-c-compile"; - rev = "69e1ce9078a1a54beddc6c9f786cdd521a3717bf"; - sha256 = "0r1ygnkvl3b61qw5lsji3434f2dkbsfkc1fk6rl355am9ssn3vr6"; + rev = "ccdbb2fcb605e285ca39c1781ab1e583e90f7558"; + sha256 = "03hsg0n2hvsqiziblpjal9saiyhcizldn9bkpk3cqh2bipg1fjys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile"; @@ -5132,12 +5153,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "20161024.1828"; + version = "20161109.1647"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "a6b566a4eca0dcc89a7d2af42e057b4e2561189d"; - sha256 = "1y3i9wcvxj1s7hyxb3ni0p7hmdlln1h3a1h2ddgkjw5yv2vq768q"; + rev = "cf7817de3f37ce2404ee637a655f1a511b829585"; + sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -5215,10 +5236,10 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20161027.926"; + version = "20161118.1618"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad"; + sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; @@ -5255,12 +5276,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161106.723"; + version = "20161116.1212"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "dea1f7e830b38e6b70db5a318eaa269f417444d4"; - sha256 = "0f6yrls2l37rpq932n7h5fr6688vsk32my300z66mszcqfvmr566"; + rev = "0ca91753aeb3a523b56e745f83087017ffefd5de"; + sha256 = "04zv2kl3mvn61k9zwr6j7scxv8mfi13gvnyx1hdzbrb28dw22dg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5793,12 +5814,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20161023.113"; + version = "20161115.1058"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "c1bc2a1cd7e43d51915dd736af299632061515b2"; - sha256 = "0yncgymgcdp2g094f5f6n46326gv647997i5kafii8snc0y2nxyl"; + rev = "76f45f8c821cc5f2e0da721a0ad025b625feaa70"; + sha256 = "1nx99a50g123jxrlnbpxn5i8imh8320jjsh9r067iqbj6dl3hajf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -5965,8 +5986,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "5db07c940e3acbd20111391c72edfa847e7a5409"; - sha256 = "1928m4368rrcsg242nk3i06fdd6r03aiwh8iz589j00w4761y4kq"; + rev = "794afbfa4c5a004fe8e0c5373be98671ee24c413"; + sha256 = "1jhfpcz9k2kkg19gn3v4imahaf0w01gj04yw451x8dx1m7q1jaqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6320,7 +6341,7 @@ version = "20151009.845"; src = fetchsvn { url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16552"; + rev = "16554"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { @@ -6358,12 +6379,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20161107.426"; + version = "20161116.35"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "059b1ca83e58a4ced0a0f1cd1b4e06525fdc257a"; - sha256 = "15bgxdz65wywkckwm9rxf595hc8gabqb2015hwp1n9pa8k511jkg"; + rev = "fb19a7e66f8478578edf7be71dadc1d75876248d"; + sha256 = "0ksliwv8f2dhrgr423qn4zjmwm37v3hh5wpbfbz6ij6c2lrhx6j4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6425,8 +6446,8 @@ src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "58f641960bcb152b33fcd27d41111291702e2da6"; - sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; + rev = "0a2e8436e02af6ca688b25ba90a19505a6113296"; + sha256 = "1fjsss678dj6vikm0ig5jqksjlwgnwhpaqfy3dk56gnjc49nl29v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6530,8 +6551,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07"; - sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17"; + rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; + sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6572,8 +6593,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07"; - sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17"; + rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; + sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6759,8 +6780,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "3726a19cb9b33abf3ae7b760902637ed40051836"; - sha256 = "05mfldh44j07wslbz3hq874amfld42vwkg70f0966rmlh1nz3rwm"; + rev = "26e76a63dd9b5fe3c9bddec93c3fd65e3436a595"; + sha256 = "18xr1hz602y684f1hzg3k5qnkxkymkw7r4ssbgxql6gpjqxpk918"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6799,7 +6820,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11867"; + rev = "11894"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6919,12 +6940,12 @@ chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chatwork"; - version = "20150807.1948"; + version = "20161121.555"; src = fetchFromGitHub { owner = "ataka"; repo = "chatwork"; - rev = "7a1def04735423d47e058a8137e859391a6aaf7e"; - sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb"; + rev = "70b41451e2d2751e634e84e0452b34c558463fe4"; + sha256 = "11h76qc2n2p8yz941drmi0rp13xmmlacikfygdv1n7s730ja0hgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork"; @@ -7150,12 +7171,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20161106.1712"; + version = "20161117.524"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; - sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; + rev = "2636a572b6d3b3b529658db465fc5eebc75859fb"; + sha256 = "0hyafgarsriw678arwim4n1jg31zf41yzjsmgpfcd0nn9gpb1q0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7378,12 +7399,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20161016.424"; + version = "20161121.312"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "3be082ae4a3d0b40d360648b20fb7caa14c0a9fc"; - sha256 = "00c0674gxwwn8ijg2g61mq546bzwh142cj16lm960zq2rnbc0ia0"; + rev = "adab93a7a2b00e03b75aa6086b0457a2e94cc85e"; + sha256 = "1nrpdah0n7ym0mhk59ifpndxnyi1myv6bwvk1b9m87r7mbw2zzw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7504,12 +7525,12 @@ ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ciel"; - version = "20160809.310"; + version = "20161110.2236"; src = fetchFromGitHub { owner = "cs14095"; repo = "ciel.el"; - rev = "ebe6dc68aeed627b88dafd170b023121f7def0d4"; - sha256 = "1z2hsbfkml5psj47b4i83grn96q85mpqll95nqb3n98hyc6da90a"; + rev = "1a19d08b14cd0f5a76b5681b2f80d65f06af3df4"; + sha256 = "01l5rswqh9dk626ykmdvs2imaqli9f5pkyzl9j41nhx49c3j1q6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; @@ -7567,12 +7588,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20161104.1348"; + version = "20161118.414"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; - sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; + rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd"; + sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7654,8 +7675,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "286103"; - sha256 = "09109zh6dx1af4jqdrc448wb5rmjgm6k6630l4z931aqwfw004kx"; + rev = "287759"; + sha256 = "1z80wgs7p8xhlfpdisyhhpk4ha0azpbicrp8hqlkrzn7rmlgmiij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7998,12 +8019,12 @@ clojars = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "clojars"; - version = "20160518.2135"; + version = "20161109.1448"; src = fetchFromGitHub { owner = "joshuamiller"; repo = "clojars.el"; - rev = "7243d901afa5c8d209df7c4e6a62fb2828703aaf"; - sha256 = "15hnjxc7xczidn3fl88zkb8868r0v1892pvhgzpwkh3biailfq5h"; + rev = "8f4ca8a283d4e9acaab912bb7217ffb5800b01a7"; + sha256 = "1j7ib7iyv4l8f3cgzyqz7jpwwa1bml343imqj5ynr7jzasv7pz52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f766319c3e18a41017684ea503b0382e96ab31b/recipes/clojars"; @@ -8040,12 +8061,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20161105.2359"; + version = "20161121.311"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; - sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; + rev = "116278521899f205a067c47621d97e4968aacb71"; + sha256 = "0s4cvymjxriw8zkzg0msvy9crrf0lrqg1gij2m5x2cvjhr60a0hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8065,8 +8086,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; - sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; + rev = "116278521899f205a067c47621d97e4968aacb71"; + sha256 = "0s4cvymjxriw8zkzg0msvy9crrf0lrqg1gij2m5x2cvjhr60a0hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8121,22 +8142,22 @@ license = lib.licenses.free; }; }) {}; - clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + clomacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clomacs"; - version = "20160920.42"; + version = "20161122.316"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "b4e2379b1360d777514fbacf20002aeb7c34adf6"; - sha256 = "0829phiki2fh95q9s2hqz12hhn1wprbl2vnczr02j3vqhdv992vz"; + rev = "cbc902307a158949f3060fde1d2994b5c8e6aa6c"; + sha256 = "0lb93vf8kh92c026x7mjkzx46gvddadlc6mps1kzy3vyrp0vj3p1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh"; name = "clomacs"; }; - packageRequires = [ cider emacs ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/clomacs"; license = lib.licenses.free; @@ -8275,8 +8296,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "9df1cb0fa68869f8125025f20fa8c64467aab2e8"; - sha256 = "0p3xi5jhz0k6hf1nx6srfaidckwlw2bcsvb63q9bbchaap17lpia"; + rev = "8288d16126193e86bb6880a7d7b749649ad83e2c"; + sha256 = "1667641a08jhxv6n0ni1k8pdn42bf6qg3bj5z7h9mn8kl0jsq6ha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9015,22 +9036,22 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20160829.1206"; + version = "20161113.1747"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "f2327bc7f303fcf83c3d8f9c76f61deaa110ebb5"; - sha256 = "0d0if7nksd5adybc6w9v8bg2j11gz975b869k4kd9fi3fbsv5cw3"; + rev = "1c516df435577b2c85995c1cbe80a9968d9ae6a0"; + sha256 = "0s2dkxp1lzpma0jddh4k2fn78nsnkggcsvih4faankh05jay9i7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4"; name = "company"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/company"; license = lib.licenses.free; @@ -9060,12 +9081,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20160920.1241"; + version = "20161119.1155"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "9f22c09009734bd281fcbb89d8903a04b8a72b74"; - sha256 = "0z6ix3sihzzkk4jgi1qg5ma9wczzdl55kc0y93jnfn69yk3l0ikn"; + rev = "5e8b51b21d32d3d8929fc2e82dec8f584a863399"; + sha256 = "0appxl6njgxmgpf9np5cpjym3ifgdwh0mzvsnxvx08pidrrnmm33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -9327,12 +9348,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "20161105.2138"; + version = "20161108.1800"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "af70f5d12a38919d5728a32784674e70566cbce6"; - sha256 = "0a1ak43js2ag157mvzyjvjh3z1x4r3r2541rbh5ihwlix6c5v637"; + rev = "b971ab0a66126f0d1410254ba1e21f17c2270101"; + sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -9348,12 +9369,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20160915.2229"; + version = "20161111.2147"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "a5bb9014de6ef1393cb12ff808dd4469da7ea648"; - sha256 = "15yyg0qapmkc9m53fpxzpiq2rh6cxwanh1k79v0d0qqk97dxdr3y"; + rev = "1f10d38135679f705494f23cd866ded0130e2993"; + sha256 = "0alkxdd171dwk6rnq2yc6gpljdazz7yz7q3mzs3q4rcmrvlr8h84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9436,8 +9457,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "82514c86ff1b37eb29aa979fe51238846857935d"; - sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; + rev = "5070dacabf2a80deeaf4ddb0be3761d06fce7be5"; + sha256 = "0w54cwjcyq7cr3g50kg4zy1xrkaqakb18qbdam11qvz6kix3syg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9583,8 +9604,8 @@ src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9c5161c840f30f01647c188699dacba5e51b3b44"; - sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc"; + rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50"; + sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris"; @@ -9705,12 +9726,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20160826.806"; + version = "20161113.1226"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09"; - sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4"; + rev = "41014e9018cc6f42741ce85383852930e6411f2e"; + sha256 = "00svfw08g44byzx23zb0kla6y6z05m6qlxzl0q32kkgkqvdhzb17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -9751,8 +9772,8 @@ src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; - rev = "3955ad1792e17e7af9c886aae5e4bce0c160808f"; - sha256 = "11siamfl62q2fv608p4slc72zdincp68klcm1fkvr50g808hwd7h"; + rev = "7b41cd58ffdf965480f1cf52d58d718009ba6fe7"; + sha256 = "0j6b9jqs4i05rxx6fs7rvim1snf33fi1l6dkm9lskchbykzz4adq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient"; @@ -9904,8 +9925,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; - sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; + rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; + sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9939,22 +9960,22 @@ license = lib.licenses.free; }; }) {}; - composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: + composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: melpaBuild { pname = "composer"; - version = "20161029.1317"; + version = "20161115.1102"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "47d840e03412da5db13ae2b962576f0166517581"; - sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008"; + rev = "2ea50be23557ce50de2c5a517fcd4abc980969b1"; + sha256 = "0ir0a3i7bvnf80als7bwjvr604jvhpk0gwln88kqgksvy1bh1nky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza"; name = "composer"; }; - packageRequires = [ emacs f request s ]; + packageRequires = [ emacs f request s seq ]; meta = { homepage = "https://melpa.org/#/composer"; license = lib.licenses.free; @@ -10235,12 +10256,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161104.828"; + version = "20161119.850"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; - sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; + rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; + sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10253,6 +10274,27 @@ license = lib.licenses.free; }; }) {}; + counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "counsel-bbdb"; + version = "20161105.350"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "counsel-bbdb"; + rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555"; + sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; + sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; + name = "counsel-bbdb"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-bbdb"; + license = lib.licenses.free; + }; + }) {}; counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }: melpaBuild { pname = "counsel-dash"; @@ -10491,8 +10533,8 @@ src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "a0071bf037a7f2d87097918fe5338e23f4736edd"; - sha256 = "0ch5xm2mnkd7inh7m5ir12w2b6zprzsqsl9asayhd0kpnk7r0yz4"; + rev = "06a1142d7601dd2e9f31bbcd6b33458636c6a2bd"; + sha256 = "1dmnlsdhcsvlzpfcshlk7p0yjry5626i07yl08rgjhxcgbhillf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; @@ -10797,6 +10839,27 @@ license = lib.licenses.free; }; }) {}; + csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "csv"; + version = "20161113.710"; + src = fetchFromGitLab { + owner = "u11"; + repo = "csv.el"; + rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411"; + sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv"; + sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd"; + name = "csv"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/csv"; + license = lib.licenses.free; + }; + }) {}; csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "csv-nav"; version = "20130407.1120"; @@ -11210,8 +11273,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "ccfebe9171fe65484d459aa3f0f3c1c97397c103"; - sha256 = "1ji1hra4iahy12067qzda0kbw5ry9khp6z0gbfrihzjq5rmn4h3j"; + rev = "530729168f51e071bbff6259dab6426425777e92"; + sha256 = "15nq08fhxg02ilmin6y0119y85z2y1rnllgj8g12kg71zghqwj0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11248,12 +11311,12 @@ d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "20161011.1257"; + version = "20161022.717"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "98af62e67026fee1dda9155e1a463917fc83802e"; - sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj"; + rev = "a97c92ced57224287a84e7fc48ba9aac6b2afc08"; + sha256 = "0ln38lkl8qcnpcpjqck3i6hd5zjv43g7vka3kapz2bnz4s33jn3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; @@ -11311,12 +11374,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161026.201"; + version = "20161121.123"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "a667ef6967008ae6176838efd26b3631ba63a3df"; - sha256 = "1qrvss2qw88xqv040bp143h7aab78j1kp9x5j4s6pz0ihj593ywn"; + rev = "8fd6c58d0d7ce9df77f465a456e3c3fe2e00ec0a"; + sha256 = "0bbw4bvrxfhg9fmm9fp1p3cwr1j9z9kysmk3n0jq5xryxsnpk8kl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11329,6 +11392,27 @@ license = lib.licenses.free; }; }) {}; + dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "dante"; + version = "20161120.1330"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "dante"; + rev = "9f1d1120326fa9028770b33a150c7dfee49d6de4"; + sha256 = "0n76vywm6nsmlhq9papaxnqi2mwg9sszjgzxpxz0bi1y30a392ll"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; + sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; + name = "dante"; + }; + packageRequires = [ dash emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/dante"; + license = lib.licenses.free; + }; + }) {}; darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; @@ -11413,6 +11497,27 @@ license = lib.licenses.free; }; }) {}; + darkane-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "darkane-theme"; + version = "20161111.1304"; + src = fetchFromGitHub { + owner = "FelixFortis"; + repo = "emacs-darkane-theme"; + rev = "afa346c793b74645392677b276c56b87c354b8ef"; + sha256 = "1mi2k7llbk4n05mcy80lswv5vqlfca2izslds7z0sihik8fys4m6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/826bd40f9da54e263dbad4bd861bd8227ea76656/recipes/darkane-theme"; + sha256 = "1lnjjhy70bizqlpih9aqvv6hsx8lj4qa5klbd7mrldqywab8cpib"; + name = "darkane-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/darkane-theme"; + license = lib.licenses.free; + }; + }) {}; darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkburn-theme"; @@ -11483,8 +11588,8 @@ src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f"; - sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096"; + rev = "c9a3a985ca1dec84557c45129798cfa7a3da4638"; + sha256 = "11rhwddxw64xwhghlchrmm30dsg1bs7v2l14v9lf66ck8n3xzfpk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -11521,12 +11626,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20161106.410"; + version = "20161121.55"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; - sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; + rev = "958e3fb62fd326d3743c0603b80d24ab85712c03"; + sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -11567,8 +11672,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; - sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; + rev = "958e3fb62fd326d3743c0603b80d24ab85712c03"; + sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -11581,6 +11686,27 @@ license = lib.licenses.free; }; }) {}; + dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: + melpaBuild { + pname = "dashboard"; + version = "20161121.1329"; + src = fetchFromGitHub { + owner = "rakanalh"; + repo = "emacs-dashboard"; + rev = "7db073f60a2505bf49e9b94cfedd235f1e01e471"; + sha256 = "1cryijlb79r4dlkmb0nwaamfi18cw0bfr2c1js7vvp5lqs8sb87w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; + sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p"; + name = "dashboard"; + }; + packageRequires = [ emacs page-break-lines ]; + meta = { + homepage = "https://melpa.org/#/dashboard"; + license = lib.licenses.free; + }; + }) {}; date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "date-at-point"; @@ -11752,12 +11878,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20161005.453"; + version = "20161110.548"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07"; - sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17"; + rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; + sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -11770,6 +11896,26 @@ 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; + }; + }) {}; debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "debpaste"; @@ -12706,22 +12852,22 @@ license = lib.licenses.free; }; }) {}; - dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "20160918.2130"; + version = "20161116.116"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "26aa877bed6246feeb448c659a5b676d7796197e"; - sha256 = "062zylfm18200d987m0vphaqph6syzah28ll8zz79fhqajgv6ndz"; + rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15"; + sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8"; name = "dired-k"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/dired-k"; license = lib.licenses.free; @@ -12792,10 +12938,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20161022.916"; + version = "20161120.1849"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "1j3w3gfk0lnyj576wg1mzdn2k1l0s777j8z36cvrs82z6pln6qb4"; + sha256 = "1pidj3658rrj4sn9kmjay9bb90a8p67n6gfw8gk90pqb1nxfx1v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13406,12 +13552,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20161004.450"; + version = "20161114.142"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "9e6facb25e1137ef4e1329151a7902dc2d168507"; - sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza"; + rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6"; + sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13431,8 +13577,8 @@ src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "9e6facb25e1137ef4e1329151a7902dc2d168507"; - sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza"; + rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6"; + sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -13487,22 +13633,22 @@ license = lib.licenses.free; }; }) {}; - django-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: + django-mode = callPackage ({ fetchFromGitHub, fetchurl, helm-make, lib, melpaBuild, projectile, s }: melpaBuild { pname = "django-mode"; - version = "20160926.1151"; + version = "20161109.749"; src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; - rev = "a3fdf9156a65a03e6f50c41d32b0f5a6960bba54"; - sha256 = "0z7yskxz34wncmg516qkaisbr7w3fcp9jrx80w2h68lyy8slcbmv"; + rev = "561a3a7359a1526b67688239cdee67e0425b6a01"; + sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-mode"; sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara"; name = "django-mode"; }; - packageRequires = [ projectile s ]; + packageRequires = [ helm-make projectile s ]; meta = { homepage = "https://melpa.org/#/django-mode"; license = lib.licenses.free; @@ -13515,8 +13661,8 @@ src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; - rev = "a3fdf9156a65a03e6f50c41d32b0f5a6960bba54"; - sha256 = "0z7yskxz34wncmg516qkaisbr7w3fcp9jrx80w2h68lyy8slcbmv"; + rev = "561a3a7359a1526b67688239cdee67e0425b6a01"; + sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-snippets"; @@ -13876,12 +14022,12 @@ doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161103.1722"; + version = "20161118.1805"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "6a33ec057419e14ef0494e5ed1291cff4c8723e2"; - sha256 = "0c5v0ry6bk47hb90ghry96arvdzdhfidy0d9ffslxdf0j7zfw4i1"; + rev = "4074e83f9c6426aa3b9129b1510aa97b281d9e90"; + sha256 = "0a3c3q9acxk8i94lrhg0cccz58zr34xhphfh7q1140qfvgv0h1ql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14115,12 +14261,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20160826.627"; + version = "20161119.1345"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "83e60b91c526405506c3f6167af207371e2420c8"; - sha256 = "00wlspaya7g48fh34rbn27ixixxnm2qrc6gl135d97hawv86rmrb"; + rev = "c9f8a97eba74a82a65554c9b282e86125a22ecb2"; + sha256 = "12918nidcmqnhkqhhrnhhd2sihqld5dy1v06q4j9fkrcbp4j4l4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -14157,12 +14303,12 @@ drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "drag-stuff"; - version = "20160520.1159"; + version = "20161107.2349"; src = fetchFromGitHub { owner = "rejeep"; repo = "drag-stuff.el"; - rev = "324239532b4a8b45dce778ef62e843d3ee0161aa"; - sha256 = "0vcc1pfxsjbrslh4k6d14xv4k8pvkg09kikwf7ipis12l62df6i4"; + rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db"; + sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff"; @@ -14324,7 +14470,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1768508"; + rev = "1770969"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14425,12 +14571,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20161015.1230"; + version = "20161120.1027"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "a6d6e78eb346542d0ef88ade9ade2f583caceab2"; - sha256 = "1wkzizs50k2ahdqhcr9qgnhwgy0mkxmyysfd61k5iinwjz1z1xxd"; + rev = "358f2687d1adc536b5fde9b14e24ebeb1e9f458f"; + sha256 = "1g293b0yfhg1ncbnqyjm2ccm098jd9q4yb0xj85nz78ilf91ff19"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -14509,11 +14655,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20161103.628"; + version = "20161108.348"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "18cd7ba257ca"; - sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; + rev = "befb5c650dfd"; + sha256 = "154bm7l1ra3l9lj9l1x21qi7f57k46kg24hyalrbawjw3q8c5np2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -14946,22 +15092,22 @@ license = lib.licenses.free; }; }) {}; - ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: + ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20161106.2351"; + version = "20161114.205"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "4617ea9cc952ab63dddf8a38ce21ae32442f51f0"; - sha256 = "01f71sxbif5hmgfd9696cwp541a93138d00y58szl1my0wxk0j4g"; + rev = "e4e9e261f7420763b82f509e35cb6802f83cb15f"; + sha256 = "1kcbciayn8i3cmw8bxikpdrk9z3i66h1zgnbnbjm84xvxppins61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid"; name = "ebib"; }; - packageRequires = [ dash emacs parsebib ]; + packageRequires = [ dash emacs parsebib seq ]; meta = { homepage = "https://melpa.org/#/ebib"; license = lib.licenses.free; @@ -15219,12 +15365,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "20161018.436"; + version = "20161119.419"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "7cf21be8b6d39a9ce1d6d354a47f60d460cbaa1c"; - sha256 = "0rqpw5fl0fi1n0669gsmdjsnhrfhwys9lfgfymzjbv62q3dda6qy"; + rev = "c6896c648fbc90f4d083f511353d6b165836d0e8"; + sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -15387,12 +15533,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20161105.2212"; + version = "20161108.6"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "0946f6672d95a943f1071e678aa91af6e614a143"; - sha256 = "1v5gf3jlb7pi08yjcglghsrwzvdms3r2cpgg2hzd2panwm623wz7"; + rev = "6006bdf8a524b57e54de09309e98439226ed9e33"; + sha256 = "0hc0av6s8qn3aym9bw541j9c25fxn0hds3f28aavdsj8c67d482z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15547,8 +15693,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; - sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; + rev = "c886d70c85d57e93c6c73499bc7416c66fe28bfb"; + sha256 = "06bsq8vgalblz4wwlaq6visv3ip2dbg9q094iavxnv2536mkylvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15568,8 +15714,8 @@ src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "4b97a2e213a960cf6902ad00879262c1b274e122"; - sha256 = "04y0c385w7m60wsknaxc00wb07hkdnlvncr7qgsh5hwh61ggfh6n"; + rev = "17364e05fc69cd3c9b554f9675d95bf0a3cf4104"; + sha256 = "1ikbw771j0a8y4wgx5whmgsfimw6a6bv3bc5qkl8r8ch5lph85z4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -15625,12 +15771,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161030.1637"; + version = "20161116.1344"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449"; - sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj"; + rev = "7d82b45f537cd18cbce858591d9c76a5ce6c291d"; + sha256 = "1ndnwpcyg8aqcidxc527gp90q6snls3490diijxcy7483k9z2awk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -15667,12 +15813,12 @@ eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eink-theme"; - version = "20161021.452"; + version = "20161111.854"; src = fetchFromGitHub { owner = "maio"; repo = "eink-emacs"; - rev = "b884e49afb7a89a3766bf8d9efb96bad239375f6"; - sha256 = "0mgdaw57av3wx9wr615p1abrd1mlbx4rn3a4xn5v77gv2g9xyfcr"; + rev = "de50a6296707d8db9ee0d3ffd001bae89d5e7e4a"; + sha256 = "0v3z48jnlbg3xwbv58kgi55b8q65gac66062yykcg3p7qcyx0az8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; @@ -15688,12 +15834,12 @@ ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20161019.20"; + version = "20161117.543"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "bef894ead140c69f82b7eb706c60f7731c3b9b8a"; - sha256 = "0kj117fs9sl2w3bjnmqknhb7zjxiydaqqdackjzv7ypifjbk8plv"; + rev = "646f72944d9fb792cd21346d0234650eb5dc9c87"; + sha256 = "1jm9fsbyrx7l7bmv50zalxjwrazcmjpdrrqm0y3c56ckix9fpqfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -15734,8 +15880,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "4b767b8565c5090538b1d73500dd50f2102150cb"; - sha256 = "1ddfz4b0bphixg3maa4mrbjc82q94s08pz0990b4pgqgh4als7sc"; + rev = "417fbc84e2458954969d748b1dac504f126cdecc"; + sha256 = "175xgcd2lymgyzk2fgiws1zycwcaljhjzdinimhxziz6v7007sy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16081,12 +16227,12 @@ electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-spacing"; - version = "20151209.736"; + version = "20161113.916"; src = fetchFromGitHub { owner = "xwl"; repo = "electric-spacing"; - rev = "78e4ccbb0a924a3062fa16c9b24823bb79bb1f3e"; - sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn"; + rev = "7231d6e238420c32af0dec4ad82f7ca1d17f4344"; + sha256 = "1xy9ibkvkndqxpbsia43l0g53yjf2idf99rhdcsf9xqyaknchx2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing"; @@ -16144,12 +16290,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20161030.1731"; + version = "20161122.1713"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; - sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; + rev = "d1855fb7d6d07addbf69bf3a8b4800406c711bee"; + sha256 = "08i4n6rbmykkl448ddzxn1y0pk0vblzbql30iyyykjixdc21y1fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16218,8 +16364,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; - sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; + rev = "d1855fb7d6d07addbf69bf3a8b4800406c711bee"; + sha256 = "08i4n6rbmykkl448ddzxn1y0pk0vblzbql30iyyykjixdc21y1fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -16319,12 +16465,12 @@ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20161027.2208"; + version = "20161114.1550"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "f710313f4be05ff475c16ffda77f01026512ad34"; - sha256 = "0vdlcc4mfpda5pxwwfdqwnq3jhgv9mgj6739gnb00i192jg4605g"; + rev = "5d55d0ffc5aa0d12ebcedb027d0a307564238ecd"; + sha256 = "0x6vqldg0nmgx5kzijamygmba7hlhnniyf6k1s3mdy5w8ib6vd6a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -16424,12 +16570,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20161031.51"; + version = "20161123.33"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "a842d54348846746ef249a87ac7961a9a787947f"; - sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni"; + rev = "529c20acb9efda756b69e267d73d33c66fa08293"; + sha256 = "08zl1v0k3dnn8g06l3xf1lp31fp60jpk6f3lkczi1l6ns36g11jx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17057,22 +17203,22 @@ license = lib.licenses.free; }; }) {}; - emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emamux"; - version = "20160602.653"; + version = "20161123.414"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-emamux"; - rev = "4e75121767001a587d01a71e61688d147a7c50c1"; - sha256 = "0jpyrh2qmhgp6wdf5jp3lr9shpj0mvsnfric8hqp0b5qda9hi2v8"; + rev = "573dd1cf18584a1fd240efb16c7726b6fd790b73"; + sha256 = "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux"; sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz"; name = "emamux"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/emamux"; license = lib.licenses.free; @@ -17183,15 +17329,36 @@ license = lib.licenses.free; }; }) {}; + emlib = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emlib"; + version = "20161113.829"; + src = fetchFromGitHub { + owner = "narendraj9"; + repo = "emlib"; + rev = "818254e86fccb45c7b938d149a588ceae43c29d2"; + sha256 = "0zr26za7n0s07c1gz7jxscpdwspi2rkljzcjblvgg0zy7p0g09cg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/46b3738975c8082d9eb6da9fe733edb353aa7069/recipes/emlib"; + sha256 = "02l135v3pqpf6ngfq11h4rc843iwh3dgi4rr3gcc63pjl4ws2w2c"; + name = "emlib"; + }; + packageRequires = [ cl-lib dash ]; + meta = { + homepage = "https://melpa.org/#/emlib"; + license = lib.licenses.free; + }; + }) {}; emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emmet-mode"; - version = "20160906.1919"; + version = "20161113.2158"; src = fetchFromGitHub { owner = "smihica"; repo = "emmet-mode"; - rev = "607a23d208405838325ca5203a1900682dad00ac"; - sha256 = "04b0663hxq7hyha6ccdxwdal803p91ipwhrk385qlc5i2mnx81fq"; + rev = "5af39aaef59125fd80901f275c23c89493f9d133"; + sha256 = "1csfd8ixz9gk0hkakcs5qv4f3qxg605blav3a463ipw2a8alyava"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/emmet-mode"; @@ -17206,11 +17373,11 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20160801.1349"; + version = "20161108.644"; src = fetchgit { url = "git://git.sv.gnu.org/emms.git"; - rev = "02c5183a484b12d529b0901a81604eb658bec8d3"; - sha256 = "02sl9nipa96bzn1adqsgp1nrb20iawscr8kajyhv0613r7igi177"; + rev = "cf6903c22b49b2e3efe338a9ccbd0df36b6d0cbf"; + sha256 = "05hqz1rlcl54fgnh40qy60ji60lycpgiqv6nnkzp29c7gc4sa40d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; @@ -17700,12 +17867,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20161031.246"; + version = "20161110.1316"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "0dedd95b8e9ad09be9521160a7893eb58514c992"; - sha256 = "1xsbw32fysl3pdxbnczdgczbrhl3qqghgk5mcbb1j4a7rnp4js3m"; + rev = "d46a4fda456f42f71e8a2ef91347f463f81cf2f6"; + sha256 = "0s2351irpi29ry29cvzix1603n41qp2smgfgcylq14d38xz9a0jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18211,12 +18378,12 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20161103.1834"; + version = "20161119.652"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "af00d57441e6fe92d8f03d2557f4dec0a410e5e5"; - sha256 = "1rgh2p8sz4hcqavalm48dzp1gsnccmc8zd27rv1a4xhaaihw23cl"; + rev = "57fc9c3f1ab9cfb2d6b5f20731ff7f63ee3daaa4"; + sha256 = "0hd949g9al3lifbpy36z4v9ia61zbjvj05kpb3min642m1a5361i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; @@ -18274,12 +18441,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161025.1222"; + version = "20161122.2237"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "f12edbb42f512ebeabcfb0a56e89924c21ddc529"; - sha256 = "12zmq9bsfjiigp3fdnqa349dmc8n5mb2j1szlpmzj2f4i6vm9rk3"; + rev = "427d0e47afe66d0c870c026ba5b8a93bb0b76415"; + sha256 = "0g783js3hi7i3q23mca422w3zlxv2i5f1l838ddwxyzzdzyg5if5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18316,12 +18483,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20161024.359"; + version = "20161108.47"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "3e06b82f0f29d90bff0783e7f3d1dabb435782f5"; - sha256 = "1i6zjj4pl5cdvqxv2ghcm0dml3jdm82hk3yp4l20zs49i1j3f43p"; + rev = "8fade0888ff75fafb2abb512cfb97bcb5472fec1"; + sha256 = "07jksnfp4xwl1059pj2aphc5saqbcgsfixy7bhz3k70j9zv6dgad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18690,12 +18857,12 @@ eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-up"; - version = "20161019.1214"; + version = "20161120.1117"; src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "1e6313bb62c573c0f07d3fc6dc910b7a48bc1b18"; - sha256 = "0ffs6iw0v2y2gggpr7hpzcclcdvfim98d3ln38bf1bnajfjg0fz7"; + rev = "e763b4c0bcd70252396d7825cb53bf00e60a547e"; + sha256 = "00ckk2x9k8ksjlw54sajcg13m6c9hp3m6n71awqbm9z17prnkzl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up"; @@ -19313,12 +19480,12 @@ evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-basics"; - version = "20160625.959"; + version = "20161117.1319"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "69fd9db21bb2a281d5232d45555714b195825043"; - sha256 = "16g7322ib53cd8f12mqw25j77g0q8vivnc6q483i5kvaivnbqvd4"; + rev = "5e56117af85e89659e9565abefef24fab7b567e8"; + sha256 = "0r62rpgklsc24yj57w72jq9i1c54fr4ksy99siyvkginmcink7kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; @@ -19733,12 +19900,12 @@ evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20161023.1639"; + version = "20161121.418"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "51d46747e39dc247ea4b72839421b85f53d487be"; - sha256 = "15fr19gv2rf8pvns7r0jmy1z2f08bjprqxz3hj1fzn9wgc42iwg7"; + rev = "8a56092b38755de9f314faa3b137805bd5ce5fef"; + sha256 = "1i0gfhc0pi67dl451i2n6sn20mxp7nr6py43zrahrjwakh5xqhfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -19754,12 +19921,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161104.859"; + version = "20161122.812"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "494cbf6fc0eba4cbe7b6dbd3c75add14e2aca63c"; - sha256 = "06ywfq7vwqhqf9a715wfbpvl5va7sj6dfavizi4xjzaysmg8sn29"; + rev = "6d260c2badf52dca81aa3589d16ce6684b5ecc3e"; + sha256 = "1k55xipsscs059rbsxidk7w1zlxlyslhwaag36i4i3plhh1zwl9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20321,12 +20488,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "20160923.2243"; + version = "20161122.1641"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "65293924a42c94bd6ea788caf5a33330eb78d7a5"; - sha256 = "1rhsrfd6mb3bm80yqzaangq8i2snlv2m8ia7mawnn7d4hvjk8z8z"; + rev = "f88c8aa9e3a0d7e415bec50dcdf4bc5bb8feee45"; + sha256 = "1rmdjlbh3ah1pcdsd6yzb15g15b10x0py1alfywvyc1p227lv4v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace"; @@ -20468,12 +20635,12 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20161020.1412"; + version = "20161122.50"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96"; - sha256 = "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35"; + rev = "6dd45d90a59178191e71c10c438f89b495a6c4aa"; + sha256 = "1ac62z6a7xpj0ayc9v1is7avil6r5s8rlwx39ys922qw5y281q2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -20573,12 +20740,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20161027.1213"; + version = "20161119.442"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc"; - sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2"; + rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9"; + sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -21024,12 +21191,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20161013.1040"; + version = "20161118.1128"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "433176166c561a2de8d511a1cf6fec751bcb0c57"; - sha256 = "1nvr4jh3f0qs4lpsb1sw3ih4mi5pcgn8ryxlbnax11rdcdkm625r"; + rev = "830fa2e665d7bcba8f7e7de754937c1ae6e9b60b"; + sha256 = "0qds4sqj9hppi5dfsfbpvba86fwigjprr75900rb50bb06ql4dqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -21066,12 +21233,12 @@ feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "feature-mode"; - version = "20160805.2015"; + version = "20161123.532"; src = fetchFromGitHub { owner = "michaelklishin"; repo = "cucumber.el"; - rev = "f0aaa806b52eec7ee8fe97883274ed49c28e8eb8"; - sha256 = "0ms1hmwc78vix91396ia317prw54vqjx8qv2qrcccwa8bphc0py5"; + rev = "aa06b88ad96bc556992f011b6aef9b78e99ae48b"; + sha256 = "1iybvdkszrqwz9knmfffmcknsdhnpc71961y0xb4xgad8i043n2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode"; @@ -21928,6 +22095,27 @@ license = lib.licenses.free; }; }) {}; + fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: + melpaBuild { + pname = "fluxus-mode"; + version = "20161112.1659"; + src = fetchFromGitHub { + owner = "defaultxr"; + repo = "fluxus-mode"; + rev = "512b104fbcd5f70dcdc7ae58c627340f036ae133"; + sha256 = "054wahxnx204y8bqmmq1824caidwvvnlr2l88ar4ax0l5bmhxdyg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode"; + sha256 = "1xn2aw9gxwkmr1miam63lrdx6n0qxsgph3rlaqy9cbs0vkb254an"; + name = "fluxus-mode"; + }; + packageRequires = [ emacs osc ]; + meta = { + homepage = "https://melpa.org/#/fluxus-mode"; + license = lib.licenses.free; + }; + }) {}; flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flx"; @@ -21994,12 +22182,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20161106.149"; + version = "20161117.144"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "f44a5f7d6f0da7f656b6167f566b72cdd7c62dbb"; - sha256 = "0nyp7aw0144klm5mkq21lalma25g0pqs1y2f7j7rv6phg4mmnk1x"; + rev = "a4dfb0eb5e5d59ab41646dfda06d551b15bfdf21"; + sha256 = "049r2ycy4gxzmxhfjyq9g00y2jm8byfzh2j214jig3pssx12amwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22183,12 +22371,12 @@ flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-credo"; - version = "20160902.800"; + version = "20161121.2201"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "flycheck-credo"; - rev = "cdf73c72b637ee585a90b1ff8100c81186472f3b"; - sha256 = "0a5j3zd9jn1s4as53mx4438pajzbm743xhn7aqjx9wdrdfy7gsp4"; + rev = "f773422c356c1c3b39fcece3cb7cc1257c7df517"; + sha256 = "0cq6lap4gndm801lj1q1wajpb03vz40hsdimr1n02p2k2dkrz8p3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo"; @@ -22306,6 +22494,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-demjsonlint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-demjsonlint"; + version = "20161114.2318"; + src = fetchFromGitHub { + owner = "z4139jq"; + repo = "flycheck-demjsonlint"; + rev = "1c433150fdf628dda4c9fad938bf7c79610b4460"; + sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint"; + sha256 = "0prwgi6v48ng89vvizb901iq4ysmrlh0g2b3797p1a6z2mps0k57"; + name = "flycheck-demjsonlint"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-demjsonlint"; + license = lib.licenses.free; + }; + }) {}; flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dialyzer"; @@ -22393,12 +22602,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20160905.50"; + version = "20161123.136"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "53c7ba2caed744408bbe01c24753dddc080361a7"; - sha256 = "1fp3xzq1i1z62i6qv2345la3qvniir5qvjvwhrfm7b9mx0n77alp"; + rev = "0748aa26a03437d36bf7083e6fc1af8f382dd1a3"; + sha256 = "1mmgahrq0v77i9w95jcg2n3aqqrvzd2s4w3b2mr70i23wq5y5wqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -22502,8 +22711,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-hdevtools"; - rev = "53829f0c57800615718cfce27ffa16d8ba286cee"; - sha256 = "1isx9v5xx35pglmhyhpmpg7axw0krmnl0n2qiikf499z7dd35wyn"; + rev = "eab1fc184854341a56154623a131cab6ff0ce18c"; + sha256 = "0prmrix9a95zr39ybajp7fha03wknxyhrf1kfxsms1brxsc8bqim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools"; @@ -22687,12 +22896,12 @@ flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }: melpaBuild { pname = "flycheck-package"; - version = "20161015.1803"; + version = "20161111.1451"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573"; - sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1"; + rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38"; + sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -22747,6 +22956,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }: + melpaBuild { + pname = "flycheck-plantuml"; + version = "20161122.219"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "flycheck-plantuml"; + rev = "f1628d589991c3d51965db0f14866b1202374eea"; + sha256 = "1j66y4qps1wjdagr36kgqgz1w8zcmwnpwcvgwn4gkif34n96s78l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml"; + sha256 = "01l22isiym635471628b951n025ls3lm6gfhfp6f8n8w7v1sb986"; + name = "flycheck-plantuml"; + }; + packageRequires = [ emacs flycheck plantuml-mode ]; + meta = { + homepage = "https://melpa.org/#/flycheck-plantuml"; + license = lib.licenses.free; + }; + }) {}; flycheck-pony = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pony"; @@ -22768,22 +22998,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: + flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; - version = "20160323.129"; + version = "20161112.912"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-pos-tip"; - rev = "2a92f6e2f8cf6a1019358c69c14c7ca835d02955"; - sha256 = "017869kcd4cjyv0hx4pkpfln96cxp6ra4ps7rx6xwrxa24f0bhrz"; + rev = "88b5a6d7ce0f313cbd22d554ea248aab95357d33"; + sha256 = "0jfgq346b4nh9wry3mnf4sfbv3l78kgadklvbv0nxykvlpx9c1rv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip"; sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9"; name = "flycheck-pos-tip"; }; - packageRequires = [ dash flycheck pos-tip ]; + packageRequires = [ emacs flycheck pos-tip ]; meta = { homepage = "https://melpa.org/#/flycheck-pos-tip"; license = lib.licenses.free; @@ -22792,12 +23022,12 @@ flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-purescript"; - version = "20160613.1315"; + version = "20161121.907"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "flycheck-purescript"; - rev = "a7e911f6479c66832e52a619cd27cc26435887a4"; - sha256 = "0d56x6wmb61ldf30pgyvl0kyfvgkjibdyy9r2281qfavgr0qszls"; + rev = "30f0435d5e2715053c8c6170b2bce2ae462ac819"; + sha256 = "10is8l88827g7gs8qnmyif124agxj9smfav6l53hjv3i0q3m3h6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a315aad238fa223058a495e1ca8c71da6447024c/recipes/flycheck-purescript"; @@ -22873,6 +23103,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }: + melpaBuild { + pname = "flycheck-scala-sbt"; + version = "20161122.1022"; + src = fetchFromGitHub { + owner = "rjmac"; + repo = "flycheck-scala-sbt"; + rev = "1e78ac4922a8073ba6ec78672404a2008233f9ca"; + sha256 = "0iqrr56zgk8yvjc6wvz34pjv1nki6zj8g9b8i0kha31y8pz4n2sy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt"; + sha256 = "09d6nj7rc1ba4psnb2csnmrs1mh5xnwh7gq7g6kq4y4f27wr8zcg"; + name = "flycheck-scala-sbt"; + }; + packageRequires = [ emacs flycheck sbt-mode ]; + meta = { + homepage = "https://melpa.org/#/flycheck-scala-sbt"; + license = lib.licenses.free; + }; + }) {}; flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "flycheck-stack"; @@ -22957,6 +23208,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-title"; + version = "20161112.1716"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "flycheck-title"; + rev = "524fe02e58ee2ff698c2a108306b2b79e23944a3"; + sha256 = "1yccgsa9lcm2wklrrbs5vk89zfln70k4jnvzx0lvcjsy0swq147j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title"; + sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza"; + name = "flycheck-title"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-title"; + license = lib.licenses.free; + }; + }) {}; flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; @@ -22964,8 +23236,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; - sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; + rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; + sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -23800,12 +24072,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20161106.702"; + version = "20161113.1145"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "ffd97a5a3663103aa96945bb1d2f03481ab6229f"; - sha256 = "1f5q99mhhcb75v2c06sxbg7psqclnlqci7fjaa484a8hyback24r"; + rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2"; + sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -24154,12 +24426,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20161019.2157"; + version = "20161120.1244"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "2813a7bf3dbcdf7780834b53385993620c7a9fd5"; - sha256 = "0akbznzqibcnzq59mhnpsx9hgxddg1656ns7c5lrn7pvmajw8vwm"; + rev = "312f3860aa84793bec30b3f5410b786ad3b45f2a"; + sha256 = "03b3z2qlv5rv5a47xpzlg5da1wc4hj24kpqh83j5wrpbddc8lans"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode"; @@ -24493,8 +24765,8 @@ version = "20161007.2213"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "bbcd039c6cb4f73a2e0a262eb32a7d100f4aa40b"; - sha256 = "1rjfzw4l0cykfvj1hlzayzn63iyb818i7a591fcv4sbviqcg9c65"; + rev = "0590ebf914cad5794ca22e052a5df4c93d3fb924"; + sha256 = "0k77ls6rxr6nax39b5f1gzhj3rr4yzinp354dqqvz82yc473pnb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -24838,12 +25110,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20160817.1834"; + version = "20161122.117"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "7ed838f1c91f10a590a2236dddcd09aea2f5747f"; - sha256 = "0cpmywngrb0fp5bpfy54xfh3f96hgkv79w7chc6riadapm2yvxz7"; + rev = "2ce3a7ef135f570239820d37fd6e7a338a680c27"; + sha256 = "1l9qw6zglna3wvrvayiqfl65vn19i5hrv3mrk05yj3lvi6h4wh70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -24901,12 +25173,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20161010.1358"; + version = "20161109.950"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "16035b9fa475496f7f89a57fa81455057af749a0"; - sha256 = "1rrafizrhjkai0msryjiz4c5dcdyihf0i2wmgiy8br74rwbxpyl5"; + rev = "847ccd4f86714ba145f2b19af6ddab2441f5c6cb"; + sha256 = "1g2m5r68l69i9j3pmcaccdk2qaaf4jfynhfxa7191id6gvhk3np0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -24922,12 +25194,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20161104.1437"; + version = "20161108.2042"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "e628ab784703410e1451616953fcde9878d00301"; - sha256 = "1al3m9wgqbq3lkqw81gy0h15d4jis392nfdpybf5s0bvxbpfm29l"; + rev = "e0473d2bdbdffd97c159cb610978a13d0b9dfa38"; + sha256 = "1x734lvxpppd3njydmagiw6a0khjc3mqmicv4bgw8l0yd5b2fqjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -24943,12 +25215,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20161104.1235"; + version = "20161122.1306"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "3e19cca8452e3461d7797d63511ccb77cfb0e4a7"; - sha256 = "17lmg5qlakwm09j32fpkvwcxfzrkx4l16iiw38lbrlm505qnzlh2"; + rev = "4bad5dadf32d99fb41214cac62a08b6f5c69b234"; + sha256 = "1b04ny938lvgkdza5ih17clmpxbwhwxliczq4kx0wq301djgnwp0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -25069,12 +25341,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20161102.2016"; + version = "20161119.2004"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "ed4c8a7b3c347c7c6680bd39c7f4ca632030eb74"; - sha256 = "0h5mkjipq9yw2djdq61kwp1g8bgkmqnkmgzzkg0vk1ix7crqbjif"; + rev = "a30668ac60e54199025d96a59a9f718dfe0130bb"; + sha256 = "17j66iqqnwlbaalcy45l0vy37rll59z7rd5vkckgfwlnzxn8k1pg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -25279,12 +25551,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "20160118.1656"; + version = "20161118.2026"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "9a5c382327eb9f1e11e04a1bdeeebd215ea5fd54"; - sha256 = "0gawx1fcfzvwql6awxy6vslvmmxlmggg3vlby8lqka9ywh7dbf4b"; + rev = "222ce5eff8f31ccf783fb9082734c3f6551e7c80"; + sha256 = "18wfx3n96x8dwl8fpfrkz3ad0aw6sy19hhk595df282bhz9h5995"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -25405,12 +25677,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20161011.1738"; + version = "20161108.1335"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; - sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; + rev = "6e23f2de27a5de23ba36305c7f5e823db44541ec"; + sha256 = "0vn4ibfvbnqgb5hc9sd8ysmd80ky7i1q5vhqxgiffm94ir8ihn5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25636,12 +25908,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20160607.1228"; + version = "20161115.1420"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "96a72dc0f86e420629760915db99533f4301e759"; - sha256 = "1718d20f87wypfsrxyihna7mqpy94fl44hhdw1l42v1iizk9157p"; + rev = "6e2754b02afc059d431de71724a7186f051d965a"; + sha256 = "198rqljshrjypl7a08z62lmw1q8fz38zg6k5h6jv7kz0as3md4pz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -26077,12 +26349,12 @@ gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnome-calendar"; - version = "20140112.359"; + version = "20161110.456"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gnome-calendar.el"; - rev = "58c3a3c32aff9901c679bdf9091ed934897b84a0"; - sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc"; + rev = "489f9f15f7bb35696b1cc19db75b554ae8328df2"; + sha256 = "1aca65g4rfpsm4yk5k2bj6kbb2wrf6s14m8jgv1p94mqmzkj7rlq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e497668d65f0eabd15e39b7492adb395a5a8e75/recipes/gnome-calendar"; @@ -26140,12 +26412,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20161003.332"; + version = "20161122.2133"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "783dd54a2e44dd143a2b2e427b17fa431806af4e"; - sha256 = "08fh3h4ly7zjzcnsgmpbcd5kvpmsz1ihmhiil9c38cr8acysgpzd"; + rev = "3e22988086760f62eee7b6b2a2e3e23392234b74"; + sha256 = "12mc8cvi9b92hmybzbnp0pd22dgcysxc0wklngkcj6ssq6ybzzzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -26305,12 +26577,12 @@ go = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go"; - version = "20160430.1739"; + version = "20161110.1849"; src = fetchFromGitHub { owner = "eschulte"; repo = "el-go"; - rev = "8d5e61b5e50bfb807bb45d4c979bd86a2ba67149"; - sha256 = "1i6x7larpqm5h4369pz07353lk0v6gyb5grk52xslmg8w14si52n"; + rev = "ff45fb44d9cb6579d8511d8b6156ed0b34d5ac97"; + sha256 = "14av8zcxp9r4ka0h9x73i6gzwbf231wqkin65va3agrzwaf8swz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/go"; @@ -26323,22 +26595,22 @@ license = lib.licenses.free; }; }) {}; - go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "go-add-tags"; - version = "20161005.948"; + version = "20161123.427"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-add-tags"; - rev = "c77bd5788347009d1dc14c0d5cbedd73d4544745"; - sha256 = "0ppps79749fprcbrwd1grlqaj36yi5a8vlvk040rqyhi9g3phr3c"; + rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac"; + sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; name = "go-add-tags"; }; - packageRequires = [ cl-lib emacs s ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/go-add-tags"; license = lib.licenses.free; @@ -26351,8 +26623,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "82514c86ff1b37eb29aa979fe51238846857935d"; - sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; + rev = "5070dacabf2a80deeaf4ddb0be3761d06fce7be5"; + sha256 = "0w54cwjcyq7cr3g50kg4zy1xrkaqakb18qbdam11qvz6kix3syg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -26498,8 +26770,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "adea2e5149bb976f956d994a0a9e510167481e72"; - sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; + rev = "259110bfd7acb62196b09487d0883429b444bf1b"; + sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -26515,12 +26787,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "20160626.156"; + version = "20161123.512"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "f1a8088bca73acf254b605cf421b4661b45ff2ba"; - sha256 = "0figyrv859i48s4pzm580hr0cgyzhyi26v0gzp6ws2686i20algf"; + rev = "f5dbee749009a1bd1933d8c2adb7ccda2c330374"; + sha256 = "1nb4adj32qxh4cvxlqvf9ypjymni4jbzswhnw7mzlbma4h2jkk8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -26536,12 +26808,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20161022.1435"; + version = "20161110.1750"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "adea2e5149bb976f956d994a0a9e510167481e72"; - sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; + rev = "259110bfd7acb62196b09487d0883429b444bf1b"; + sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -26557,12 +26829,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20160426.1228"; + version = "20161122.804"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "08add53262501d9432767116125a5030d9609911"; - sha256 = "1i93im43ipdkm1p83d15kfi14h4gqxgqx31z6qn1fc121916rx66"; + rev = "b3b5c98dbc86f7ae6fc631c29f55807bfb8dea89"; + sha256 = "10habaq2f6rh7fdpa5mv76zfvmls7g0n4hq5ka27g2yb30qqhllr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -26624,8 +26896,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "adea2e5149bb976f956d994a0a9e510167481e72"; - sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; + rev = "259110bfd7acb62196b09487d0883429b444bf1b"; + sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -26834,8 +27106,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "3390df4df2787994aea98de825b964ac7944b817"; - sha256 = "00kjfvbi29agwsilfapgccx4ynqrbj04whk6iflxky14zrmz044q"; + rev = "206c0f020eba0f7fbcfbc467a5eb808037df2ed6"; + sha256 = "11ygf8hswvc9rj6jp7zn8wyjlraw9qrl072grn2h4s1flblpxp53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -26897,8 +27169,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "71ec7f1e524969c19ce33cfc72e8e023f2b98ee2"; - sha256 = "0y7pgd05wbaxlc946gmly5l4jyhvh6w6aznz5cxip4vpka8s8ab7"; + rev = "db0a26320f3e930c6ea7225ed53539b4fb31310c"; + sha256 = "0kwb4vszahr7iwl1znhklsjkmqckj011z6akj9pzz33iabcah6mf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -26935,12 +27207,12 @@ google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-maps"; - version = "20130412.230"; + version = "20161120.1342"; src = fetchFromGitHub { owner = "jd"; repo = "google-maps.el"; - rev = "90151ab59e693243ca8da660ce7b9ce361ea5126"; - sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0"; + rev = "8b5f6012e28de0ae96d3162b21004308f5105c5f"; + sha256 = "18vmcda7p1ch7bvvq7abczarfz52nymc4j3ykd9d79vrxkzfzq98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps"; @@ -27146,8 +27418,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "aac2f2f2927d6a95d507538f70f94a142cd83fd2"; - sha256 = "1vik0fh9hi81d8pai9sz9h3nrn7qkyhp289hd9p8cflkz7g9cd6h"; + rev = "3a056363adc4b1a0125f5bda9a0395010d805615"; + sha256 = "01czx49dkxg5wvb2aqk474dmsnr63cmhziim2v8hrv546gp31v46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27331,12 +27603,12 @@ graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: melpaBuild { pname = "graphene"; - version = "20161009.38"; + version = "20161120.938"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7"; - sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2"; + rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed"; + sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; @@ -27862,12 +28134,12 @@ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gxref"; - version = "20161101.633"; + version = "20161116.2359"; src = fetchFromGitHub { owner = "dedi"; repo = "gxref"; - rev = "24bc54ff2f8756609089f5f48f34d718db629381"; - sha256 = "184dnbg7sddck39qhnydzaa4sxxnz6mcicjb9n1632xlyg6q5wrl"; + rev = "5fc61367185ca5e2bd5a7a92c1317c60b7edf13f"; + sha256 = "0x8wz1wrdzdyvghbng1j0kd8gv0q70vkqzqzwhyhzvmsx2x2cs97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; @@ -28240,12 +28512,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20161101.751"; + version = "20161110.316"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "cc432999b49bf9bb8844375436381b21f0344ebd"; - sha256 = "1dgkz5drnkdqm8lbf9d6qh35xlakzizm61yq6qkifhyisxlkg1rm"; + rev = "023989e46d6449532f3ab7581ac56b31f87a9448"; + sha256 = "0wx5dlq9l0r79adfg8sadclk1i2ab3vs4925nwxdx11ccyxph55l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28508,12 +28780,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161106.2328"; + version = "20161123.409"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; - sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; + rev = "0941293fb7129c83f04c584474ad1d85a6595ba3"; + sha256 = "0f9cy590kxa8m03748byvn9fzp17gziw3zbwbshkrrznj3pzr4mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28592,12 +28864,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161105.744"; + version = "20161122.1853"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "34cddd7591e2b68bc91215da8f31036d83525909"; - sha256 = "0yr35rkfidly57fklacvh03yvpb50nyhj3cb0d1yg2xmm6civ5gn"; + rev = "1e882d3b409ae46aef98f01e6bcd0bea72a2c801"; + sha256 = "1pip5hp4phi8kyr7z2w9px6p45w0xzb96rdrb6yn66cl6kafwqli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -28694,15 +28966,36 @@ license = lib.licenses.free; }; }) {}; + helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-bbdb"; + version = "20161122.522"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-bbdb"; + rev = "20513422102fea4c08a0433d728a7783bb4968c8"; + sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; + sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp"; + name = "helm-bbdb"; + }; + packageRequires = [ bbdb helm ]; + meta = { + homepage = "https://melpa.org/#/helm-bbdb"; + license = lib.licenses.free; + }; + }) {}; helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161101.2345"; + version = "20161119.412"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; - sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; + rev = "472a41231bcb1b2a610ebc0387e495b2d84538f2"; + sha256 = "0dh1b7hdvpr3l3vsqg5kaai07nqrdd5yvl4r7lxy1xa7ayl32xq3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29033,12 +29326,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20161010.59"; + version = "20161121.2111"; src = fetchFromGitHub { owner = "manuel-uberti"; repo = "helm-company"; - rev = "5202ddde359d8b3b8db242e998d0766d06db2be6"; - sha256 = "03hdnnqigg3q73mb9zbqav2d91iamkxgsbc5857jxxr04bq23ak9"; + rev = "59e93396309fe3cb60913332d384d2f4706694c3"; + sha256 = "0slp08dy9s40mqj6f64d8yw9si1a76mlhbmm3a7khf076b8ky02s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company"; @@ -29054,12 +29347,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161107.47"; + version = "20161113.908"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; - sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; + rev = "0941293fb7129c83f04c584474ad1d85a6595ba3"; + sha256 = "0f9cy590kxa8m03748byvn9fzp17gziw3zbwbshkrrznj3pzr4mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29579,12 +29872,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20161105.813"; + version = "20161111.2337"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "b0bb524d6c69d1d43729d68dbd28b67a723a4b90"; - sha256 = "0n7xsrblnl9awvljczg4a6g00bczw47q69fnmqwk76ndigyhx8n0"; + rev = "6b5abd45030d0c505bd4db7cc2a949ab5fa6d3ca"; + sha256 = "0chjyvp98g0wviisnbw07cmv3fzfmzcw2ygbn4jh5frr9kpchkf5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -29667,8 +29960,8 @@ src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "e86914b0469d390f908b44401a31b1825af0b10d"; - sha256 = "1vxfc6dh1dahxvzz5vchx5gj33f8dyz7gqa5j1xcrxs49bqca7ad"; + rev = "e42c563936c205ceedb930a687c11b4bb56447bc"; + sha256 = "1169q25paz7x3hia5px4vmn06zzss179q9179x95vx8vfr43ny08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; @@ -30041,12 +30334,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20160901.822"; + version = "20161122.241"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "742eeb6c33253b2be581e30b5d70113cd87a581d"; - sha256 = "1dmmz6ghi21kmwprcv174pq5m198cmsphg297ll1bhqczk51j9h5"; + rev = "98ce7dc709cf1468a50de18e96c028baa7f4357d"; + sha256 = "1hlya6rc8iwmfjqk2grr80y3842x3763yl7siwp5jflpzryxhk97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -30103,12 +30396,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20160807.1756"; + version = "20161109.1107"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "f1bb61049c83b281f7d6fd0d13dfb262629ed5dc"; - sha256 = "1wrcjpd6lsf4sgqw61ql2y3dcb8v27ysnchyjwyppgmsqbkrz0a9"; + rev = "11744341b10b35200ebb6789de52ce1a79336ef4"; + sha256 = "1kzv11admqzdbswhahh28imkvjhwmp3pggpf5igpi019p8v3y91c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -30271,12 +30564,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20161008.1645"; + version = "20161112.1505"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "671827a2b72ab6ee1f2736ea33a68b4bf5f93324"; - sha256 = "1z7jr7v67g9vxf7bv18vvmrdi09rvhjp8aw3malynp9iddz8hab6"; + rev = "4596ac225a90bc49d96a416d661f5da2a13b711d"; + sha256 = "0snynrrrkhm7c3g2iwr5m4lq49lxfrkf7il1rm2k56r5lbzw7mkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -30334,12 +30627,12 @@ helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pages"; - version = "20160929.2141"; + version = "20161120.1826"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "helm-pages"; - rev = "002ee736e082f792aa3f66b040902c19b81d2b5e"; - sha256 = "1lbhdwpqzj5z8yi3qma9r7p7ar2diz2qyi56mvm5qmjmnq7nqpwr"; + rev = "51dcb9374d1df9feaae85e60cfb39b970554ecba"; + sha256 = "0znmj13nshzspysnzrn2x6k9fym21n9ywkpjibljy0s05m36nbs5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a33cb19b6e71240896bbe5da07ab25f2ee11f0b/recipes/helm-pages"; @@ -30586,12 +30879,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20161030.914"; + version = "20161117.700"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "07c268d162d11d8b4254a78a1bdaf881cdc560ee"; - sha256 = "1dzlawga65z0c49xzwpya09clcg013w7fm7mhqf70cniim5mcya8"; + rev = "06ee938ee8c7c9c98a3f627c5c36de7645f5f28d"; + sha256 = "1zzidm622w3fgk9f5daj6njfjmfl1yrpdx03xrhg4raibh8j53lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -31087,6 +31380,27 @@ license = lib.licenses.free; }; }) {}; + helm-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: + melpaBuild { + pname = "helm-youtube"; + version = "20161113.1848"; + src = fetchFromGitHub { + owner = "maximus12793"; + repo = "helm-youtube"; + rev = "7a944bc25f0f9e915011e9325caf46b46fcaa1b8"; + sha256 = "0948rq6i4ibwhmi6m2k23f83yvf56vwgri1sg2060d901zd86cxy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7537f732091b96b6c1b96c0174895278eba6776a/recipes/helm-youtube"; + sha256 = "1qal5q83p06ghn482rflcfklr17mir582r0mvchxabb5ql60dy0b"; + name = "helm-youtube"; + }; + packageRequires = [ cl-lib helm request ]; + meta = { + homepage = "https://melpa.org/#/helm-youtube"; + license = lib.licenses.free; + }; + }) {}; helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-zhihu-daily"; @@ -31577,22 +31891,22 @@ license = lib.licenses.free; }; }) {}; - highlight-indent-guides = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20160708.1329"; + version = "20161118.1050"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "81a21cf1099cbbed89b321b9ec38682df6e33b4a"; - sha256 = "04vmb0596cvmv0g882nazjv2cylja6wb3k1if5d9ylg2ykqr3z2l"; + rev = "759ff84afba940b1a35c484b54da9478f8aa15fb"; + sha256 = "0rqn1yc1daxpax2qv42x72411ipj49y4s1j7abgkqh2g7fvrbdwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm"; name = "highlight-indent-guides"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/highlight-indent-guides"; license = lib.licenses.free; @@ -32176,12 +32490,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20161031.709"; + version = "20161121.848"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "912d78a9e211f588fdb59a487d6fae3e13089023"; - sha256 = "0fnd2y0w07k0rz6k3ghmk9jkx2mzdymnizrbx4ykysqdwwwnj4lw"; + rev = "413e34e748b3bbd168dec8d38f673c41232c51e2"; + sha256 = "0hniidrs8dzaq11micc0l4sdp2zrv6ry0r34c5b3w32cnb33xp47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -32552,12 +32866,12 @@ http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20161025.1120"; + version = "20161122.819"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "3b8cac5d30bf8142cdb9839292f39643be326f5b"; - sha256 = "0842l2wbk1f86lxzjsicqwxlmw639w26pr3dfk9rnymwzpm267kg"; + rev = "e1e9f7fb5240ec17ff21988993ca8dcb873ea78f"; + sha256 = "0r7nbhnw5mxwqlmb0diylfmiyrb7vvdqaa5h9hb746vf7pwqgcz0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; @@ -32675,12 +32989,12 @@ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; - version = "20151203.1314"; + version = "20161120.2203"; src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; - rev = "ed1694ca3bd1fe7d117b0176d417341915ad4f1f"; - sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl"; + rev = "8df35d81fbbd236147b8c746bd5f542bd75dbe63"; + sha256 = "0j97bfhrajki2a78pchrw5n6pcsk2gc2spk9s8fb0bmnqqpknmnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; @@ -32780,12 +33094,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20160913.216"; + version = "20161117.1028"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "dd5f703d5257e5fbedf3e2a400a68f2e7663077c"; - sha256 = "1h4lyr0mflvmv53x1w9i2dln090q2a4nfdj5p7vzpvran8hxrrwd"; + rev = "a72d68a0f6492af6201fbdb88211cb2f7488f3be"; + sha256 = "00k9q0fv5ca4g397f39fiyjzp827b7biyx2gly69xxgir44j9jgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -32947,7 +33261,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20161012.1345"; + version = "20161118.1605"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l"; @@ -33488,12 +33802,12 @@ ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-yes-or-no"; - version = "20160217.1617"; + version = "20161108.1551"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-yes-or-no"; - rev = "9ddee9e878ad62d58c9f4b3a7685f22b8e36e420"; - sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq"; + rev = "c55383b1fce5879e87e7ca6809fc60534508e182"; + sha256 = "1p50ycsn1mcq5nqa16w10hm8v2pixibvandc91mj5l7s8zspanik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e575f46b8597a34523df6b6a75da5a640f4c5a2e/recipes/ido-yes-or-no"; @@ -33983,12 +34297,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20161026.1046"; + version = "20161114.1455"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "5726c33b8d8c43974d4b367348962025c6df56b9"; - sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0"; + rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25"; + sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; @@ -34088,12 +34402,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20161015.2329"; + version = "20161121.314"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "98b530af7c3098a2c30b9c38751c3e80c37acac4"; - sha256 = "006cmqqykr09krlhwhb2wbv0f466w4wdmc6xxvn39qiqmprwv9a2"; + rev = "117d8cb2564bca1248bd71eaec8b97ff1d94668d"; + sha256 = "0wdajff7p1d1ziac6immc11jx9c4ivkj6npnjx80cyjnacj7byn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -34525,12 +34839,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20161101.256"; + version = "20161123.101"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "f0707fd914d547e88594b3208a216ddff9664a97"; - sha256 = "0xk62r0fziyybr5ivvl6yyknfv98b60nw66swz65ld9w3ld8xlpp"; + rev = "36ed2533f3c9cc22a9b54c3e8814a4e2885d0177"; + sha256 = "03yajiq3ifn9kiwrdx6zxlvycgisxm96yhalk5baysbicp6nh31r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -34546,12 +34860,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20161027.207"; + version = "20161123.613"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "fe0b045aadef5590eb33e03c1512430e5d52d639"; - sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih"; + rev = "eaa1b303d63650732a7146e2fdb1a601d791c344"; + sha256 = "1rhhdaysj7vfslwmjqs92xyqm9vggsr9m50lxn6ndhan0xlvzcb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -34714,12 +35028,12 @@ iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iplayer"; - version = "20150101.255"; + version = "20161120.1320"; src = fetchFromGitHub { owner = "csrhodes"; repo = "iplayer-el"; - rev = "48b664e36e1a8e37eeb3eee80b91ff7126ed449a"; - sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6"; + rev = "b788fffa4b36bbd558047ffa6be51b1f0f462f23"; + sha256 = "0x82mxbc6f5azzg7c4zrxz1q763k8i3y1kfb79xfspb2i64dgg5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a97667365f1c30f53a6aeeb7b909a78888eb1/recipes/iplayer"; @@ -34878,10 +35192,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161106.1457"; + version = "20161115.1908"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0bg6cy0yksklb929xxrpb6qyzkfbix7d5sgl48hfr4am0y3qgqi0"; + sha256 = "17ldy140kn4zgji12x4qaijg06r858zjwbvxjwarrv1rl2cny59m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -34896,10 +35210,10 @@ }) {}; isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-prop"; - version = "20160827.922"; + version = "20161117.1101"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; - sha256 = "065nbrc14iw4ppj6v7fp5iygi52rbd2iwm7z5kif292ffdn499zn"; + sha256 = "1i832162b6cjlygnzmi8yjjc37dxamz1mnhlli5pif9xwa5g824m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; @@ -35104,12 +35418,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161030.27"; + version = "20161118.1213"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; - sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; + rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; + sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35125,12 +35439,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161101.2345"; + version = "20161119.412"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; - sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; + rev = "472a41231bcb1b2a610ebc0387e495b2d84538f2"; + sha256 = "0dh1b7hdvpr3l3vsqg5kaai07nqrdd5yvl4r7lxy1xa7ayl32xq3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35192,8 +35506,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; - sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; + rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; + sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35396,12 +35710,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161102.1441"; + version = "20161121.1422"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "87697c66f883f07ff3cf646ff182a7edb49b957a"; - sha256 = "0cb17p1g7zm1cnxzfb520v7v430x01df0s6g8xi05y197kd99lbj"; + rev = "1ec4939d81e410c081b709505d812775bb8338e8"; + sha256 = "12yqbkfr5yds9kysjs159h6xvlx0ppf7c95fwhd4nx63ycyidg2x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -35729,22 +36043,22 @@ license = lib.licenses.free; }; }) {}; - jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20161106.1043"; + version = "20161119.911"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "28fd7e8045387c4abeecb73623afad366417de07"; - sha256 = "12qj3r7apylh0qccqsr6lqlfbrp6xz3hpqrk2gqd3b01j0hp4cwd"; + rev = "9ec9a5e6bcc22490ca06ddc05dd174fe03c6fa0d"; + sha256 = "0z6bp76q9r6h4bps340xw9vg8adm3gmdmaiya6d01ymaid7qfydn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4"; name = "jdee"; }; - packageRequires = [ emacs ]; + packageRequires = [ dash emacs flycheck memoize ]; meta = { homepage = "https://melpa.org/#/jdee"; license = lib.licenses.free; @@ -36107,12 +36421,12 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20160907.1705"; + version = "20161117.1413"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2f293bde7ad99fa1f3c8eccf2c4d4782b90c515e"; - sha256 = "1maxypb349k5aw8q72k46zr4j3wmw2c81lghpb5j2jq70ndnpj4d"; + rev = "35660f93fb624c130c8795a742bad6ff9e2dd5bd"; + sha256 = "18j0a6c7ashsbc1vsfj686pjc23igcgpvnwjrkhj0mm9afg918rq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -36212,12 +36526,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161025.1012"; + version = "20161117.1621"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "94b27217cd8305029fdfdd2f4ef660622de8a582"; - sha256 = "0p8025p7n6frmdiycr5g8fg8hs2ygszpmx51c1xla2qjhn7wcf61"; + rev = "2a796499afd95a5b9f0eb2fb338102e917f30c93"; + sha256 = "07i41zblbb733wj7wgpdwqnw0ml0mkkh053prbk8g8ghwcrm65ld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37280,8 +37594,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "e66f76fedbe7b8c042bd57eec282b6e1a88cb492"; - sha256 = "04w9gsip1h8qhppmw4g42apwnqpnfx8rcxgjvlskln97fgpf083d"; + rev = "3de25e142921667a5df95ee886b38c868dab927c"; + sha256 = "1pkfi0gz7wm5xig6im25r6f12mw34n113nn9hbwpd0vsxyl6pv5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37591,12 +37905,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20161103.932"; + version = "20161108.139"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "28ec20825e266723a5a42a630d865ae8fdfab3d4"; - sha256 = "0kc0l07c3zq48mpjkqj7sbpz3j3h5bx4z83r7954pj6s4za8cqmg"; + rev = "6c217731977a9bd66330e9cd1e2bddfda47118bd"; + sha256 = "0mqgjq6l7b7rcky86fd1mwxwnvn269b8gj6v0y72hhkk1cmrh17s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -37690,6 +38004,27 @@ license = lib.licenses.free; }; }) {}; + language-detection = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "language-detection"; + version = "20161122.2344"; + src = fetchFromGitHub { + owner = "andreasjansson"; + repo = "language-detection.el"; + rev = "14302e31a319dceb6ec78cf3d7cc93d8402e2cab"; + sha256 = "1ci5ixj0cqcbsabh4gwhicimnmlcl3wl8nv69ydvi60yfwhgq5fh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765/recipes/language-detection"; + sha256 = "1c613dj6j05idqyjd6ix7llw04d0327aicac04cicrb006km3r51"; + name = "language-detection"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/language-detection"; + license = lib.licenses.free; + }; + }) {}; latest-clojure-libraries = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latest-clojure-libraries"; @@ -38133,12 +38468,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161030.1205"; + version = "20161119.1315"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "db7181c9ffce2e5f3244344440895df4e08bbcc1"; - sha256 = "1nka98zp1xmk94vv1vxd5ymkpprs0mgss4zxny87jax8drmlbjbd"; + rev = "1d4e77898228dbed46971a3f483bbca6c526643c"; + sha256 = "0b1lwccpkzzd8gpqsbn9y4drdsgg0vp48z21mnlnkfza9hnmb1l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38197,8 +38532,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "82636b12d82b0e3be076b69bfc31bb3507ba3530"; - sha256 = "0bjx08s95xklq6qszg1p3gl62c4y3kacwvz61ywgchhxvxdwi450"; + rev = "1023ef8057335e627b7a2b20b2b144068aaab7c3"; + sha256 = "0041gwmkcjsk9c0j316hl1s588wxa7dkn8vm1fc2s9nsvhang8ab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -38510,12 +38845,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161026.1538"; + version = "20161121.56"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "fa1aaf0be0102ad5bedcea1154a62746f6457379"; - sha256 = "16hcy02jx4f3m6ps8m6sxks18a9mzagn262wcvf8vq3q1iargwai"; + rev = "30e7745dd9a14a75c2eb1651c047304369e540e1"; + sha256 = "1i46w7m1pmvws6cgmaxwq3kajz6nirrz1bw7kq03ndx03nxc20d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -38823,12 +39158,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20160521.1130"; + version = "20161122.2243"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "2670089597e586c82402767727c278e9c8edfca1"; - sha256 = "00bran2qvxqlp5081qqnwn48i48v95m3g5jgrxq0nvcgblxdv2ga"; + rev = "3fde06dde5d541b7be4536bdbebaa6cd1e01a5ad"; + sha256 = "1nmsvmkv6r0qny2l8s52hld11mv74kbksz0j4vqji624im1d659w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -38910,8 +39245,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "3e6b5bc83fc2b89b0d3624c3ba5d36af162a225c"; - sha256 = "0h1flxwsd83hrgpjz4z4plarvcvmwagvqxfpz3k05hi75c5cpcds"; + rev = "e547b01b86f262d20c875cf3e2ecf7af0bea1e8d"; + sha256 = "1ldlla2bh1073c0hy9g6zrngmpf017jnq0sap4hcw1bg1dbcwyh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -38990,12 +39325,12 @@ loccur = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loccur"; - version = "20160129.1222"; + version = "20161122.1107"; src = fetchFromGitHub { owner = "fourier"; repo = "loccur"; - rev = "fb1fbc0ff5da7a8b117542ab8083d29cd79e12b2"; - sha256 = "1npz90zf91wqf35bqd3zmkh0b538i69w8ygc78x5w2x5005aqr0p"; + rev = "08aeadc69571bddf44f2708dd75f57c7e027d32f"; + sha256 = "0wlz3skimgxbfvrd0xjj17ymm24c86847hd90wik861a4ig3wby0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72550b043794331e85bc4b124f6d8ab70d969eff/recipes/loccur"; @@ -39136,12 +39471,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20161007.1145"; + version = "20161108.1149"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "9b2f610a32557937e704b32e97f4b61abdec6845"; - sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj"; + rev = "4f1db3f2081e819dd35545497529a03466bd0397"; + sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -39445,12 +39780,12 @@ macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macrostep"; - version = "20160925.505"; + version = "20161120.1306"; src = fetchFromGitHub { owner = "joddie"; repo = "macrostep"; - rev = "e5376126947837958983364b8615c7dea6953eda"; - sha256 = "0hdn0gwfwp5ixqqcjsiz4sjq13xzkynnbz2rclg4ajl53mgknfbv"; + rev = "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267"; + sha256 = "1fm40mxdn289cyzgw992223dgrjmwxn4q8svyyxfaxjrpb38jhjz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362b5cb71e81172bc654594c08a5d0b91262851a/recipes/macrostep"; @@ -39529,12 +39864,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161105.1602"; + version = "20161123.617"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; - sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; + rev = "74f9ef2e7c7de93aa6784b55064fee0a58239b97"; + sha256 = "0z8j9537kh4567knx942hc4fhqg3xnmryhlc6xyawd97k6acv60n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -39557,12 +39892,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20161106.1441"; + version = "20161115.1528"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "aff3aa6f46f561e1cfe4f240396559097a409fb1"; - sha256 = "1mvg5qk93b7ihy7jbk6ywwp2a00qz7wwz3rd2basxj01z6glfxk4"; + rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432"; + sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -39704,12 +40039,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20161009.1506"; + version = "20161123.504"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; - sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; + rev = "74f9ef2e7c7de93aa6784b55064fee0a58239b97"; + sha256 = "0z8j9537kh4567knx942hc4fhqg3xnmryhlc6xyawd97k6acv60n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40124,12 +40459,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20161103.115"; + version = "20161121.1435"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "9c32e47b80dce357278f520593eb670abb66879d"; - sha256 = "1p5i26bcsa9vp5hapy2pxkb55yhqyhpmsi9qyqhkh9bxaqa70baf"; + rev = "6a0e74bfff0f1d74d179ebdf7894eb6e15381bd4"; + sha256 = "03hbyf0bj3lywbl919khnmhqwwkj7bcnvlhnspa8psi5xl6m05zq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -40313,12 +40648,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20161004.513"; + version = "20161122.1102"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "a5de48c4dc2cb2c8703b3ca139863f59d91086c9"; - sha256 = "1x0rv26sq7x5pd1zyc8j3xwhmg8cbm8q4aibhrnrzf9gmc54jn0l"; + rev = "c9c9bfb4490b52ff1b6ef05d4e108a04b3bfed75"; + sha256 = "1zzy47m9hxjxvqc34p99r4gda1czvcracsmkfylj1rr2frilhvsx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; @@ -40443,8 +40778,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "6332b3f567f3a09ebed8f7f01e99e503f096e2a4"; - sha256 = "1i0w27fbm9vyz8g3pv4ksmzmabflwzcb5705g5zb696kl20n6jxz"; + rev = "d5b6fdd97159b22d5a9dbc3b0db18a04089b3f2f"; + sha256 = "1pix1cz8zv3kgf103ml1y42a0l2hvakbykfpbyx81z4nw7n958lf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -40561,6 +40896,26 @@ license = lib.licenses.free; }; }) {}; + matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }: + melpaBuild { + pname = "matrix-client"; + version = "20161004.1933"; + src = fetchgit { + url = "https://fort.kickass.systems/git/rrix/matrix-client.git"; + rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d"; + sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/adeaf97d285120d7b20f1f7a21cb89eb3c40b3b6/recipes/matrix-client"; + sha256 = "05q1ggiq4nldcklpv2hndg1nx8jxl6qgi5jjc3kz736x7syb0j34"; + name = "matrix-client"; + }; + packageRequires = [ json request ]; + meta = { + homepage = "https://melpa.org/#/matrix-client"; + license = lib.licenses.free; + }; + }) {}; maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maude-mode"; @@ -40813,12 +41168,12 @@ melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "melancholy-theme"; - version = "20160929.43"; + version = "20161110.120"; src = fetchFromGitHub { owner = "techquila"; repo = "melancholy-theme"; - rev = "3477a88cdf4586203430e24a1a72bc95e5fab3f5"; - sha256 = "0kkx7iwj4bp9yknk6k6mw80bsh6d00kqjdsscr1p0srv9vqnrwba"; + rev = "bf15e39ed0579fa1cf1ceb5fb91876c2be115bfb"; + sha256 = "0wphlp2vq8clv0q9c5lrpbajzhn7pr4z6x661q6vd51z9azh3qp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme"; @@ -40978,12 +41333,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "20161017.205"; + version = "20161103.821"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "6480e585a0e9d036d11aaf28bcee97e8e9b77c2e"; - sha256 = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8"; + rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019"; + sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -41331,12 +41686,12 @@ mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mini-header-line"; - version = "20160616.327"; + version = "20161108.137"; src = fetchFromGitHub { owner = "ksjogo"; repo = "mini-header-line"; - rev = "1480c578a1f4c77365744d2487ae868a36d49d2a"; - sha256 = "0iadwh86025wnxg30q866zsb156rhf82x8b9ih229ln2v0ank6as"; + rev = "38e1f4711b57b07876aa5cdab5af741ace0aeb83"; + sha256 = "0v9s7fdy7r16m988880jxmlx7ypgwgav11fa4yixx4dximgbc2lc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line"; @@ -42092,12 +42447,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20160902.1417"; + version = "20161116.1128"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "11fa06c8fd5d5734e635427565a7fc980908b877"; - sha256 = "1vkjgmwlnhfqs4dnp6lf0vpjss5pxcmdqy29yg62igsg1xjd7whw"; + rev = "586062ec38807b709b888adf3bd80ffb5388f86c"; + sha256 = "13qx220ayf678milahq4xrhlhiljfmbscxikq0dlfdv39157ynlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -42338,12 +42693,12 @@ mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; - version = "20150601.1009"; + version = "20161121.1835"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "63056cb9b29c5d3b5ef9d22ace7633c87e1e4299"; - sha256 = "1f4ijffjpf9p1p5gvbv8yd9hiyqrdiyg4wmqrnr76yls7zbxdf1a"; + rev = "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d"; + sha256 = "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -42405,8 +42760,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "efc1eaa4361add1803ae5245c4f3dfdea106ba48"; - sha256 = "0ws529sh9xa583m8gk78gwqnz2704sz0dw9c0l9nfz0hk3h75ivk"; + rev = "b2a74bb1bab6cc3de8611b7679b4c79f45d8ddb3"; + sha256 = "08ygyinb5p9xiszmvdscnmmbiznxdz96v3rl0pw1vjmghl5v7j8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -42569,12 +42924,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20161004.1742"; + version = "20161113.1359"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "362fcac725b31570d01df6e9bad545ab636a7dc5"; - sha256 = "0fzh2sq9gki87yqar48jxa34zqqmyfjiifcmv3br97im25sjfq3p"; + rev = "14d117dce8e082eb26007abd01f0e4af3ce3b698"; + sha256 = "03lff20d10s5nzh6jddf8q31lm3c20zflwbklnbsrydm2w5j6d16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -42856,12 +43211,12 @@ multitran = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multitran"; - version = "20161017.1307"; + version = "20161122.1323"; src = fetchFromGitHub { owner = "zevlg"; repo = "multitran.el"; - rev = "0a18683644b63aaf9a55a433c23ff4c83bceb915"; - sha256 = "1fgwpzfr6bhzsbw52gvw0g4qn2fzrr9cw0a3g85p8qqkhja0cfbx"; + rev = "c0ce2e1b3706263946f9240a47c3f65ed4fc0afa"; + sha256 = "1dd82jlc865achy70ldjwkjx45p11sjj0snvf85r1dj4aywci6i5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran"; @@ -43126,12 +43481,12 @@ mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "mysql-to-org"; - version = "20160901.2358"; + version = "20161119.1256"; src = fetchFromGitHub { owner = "mallt"; repo = "mysql-to-org-mode"; - rev = "25e30a8f3582e64377c8df23531b17dcc14a84e2"; - sha256 = "0vjnah8nkhh01nq758c79rssscd3rwmfrcb02sq98mcqa0aaqk07"; + rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc"; + sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org"; @@ -43396,12 +43751,12 @@ nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nand2tetris"; - version = "20161011.1748"; + version = "20161109.1637"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9c5161c840f30f01647c188699dacba5e51b3b44"; - sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc"; + rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50"; + sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris"; @@ -43417,12 +43772,12 @@ nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }: melpaBuild { pname = "nand2tetris-assembler"; - version = "20161011.1748"; + version = "20161109.1637"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9c5161c840f30f01647c188699dacba5e51b3b44"; - sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc"; + rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50"; + sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler"; @@ -43543,8 +43898,8 @@ src = fetchFromGitHub { owner = "tiago4orion"; repo = "nash-mode.el"; - rev = "bb7ae728a16812a0ef506483b877f6221c92ca9c"; - sha256 = "1n4dxbd388ibghismc5d1nkvxwxdi4r415prsaa3qad8l9s4ivwh"; + rev = "2cd96535eb7d669a94306183e95ee37333872c1a"; + sha256 = "0wdkl56pgm6qlgqjs4kqjglnxzjsfjd0y4fiffhxc893gm0psrpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8bd080c81b163a6ddcfffc710316b9711935b4a/recipes/nash-mode"; @@ -43732,8 +44087,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "2e74d2bcab9ea91078f0ffa040ad8d9372e0a305"; - sha256 = "1n6gma3g08wvs083frbb0a7nygy5f9cfidqkbqf1xxm806ancvdz"; + rev = "9339ad5534676dac089048f9955a77c282862b25"; + sha256 = "17wq5lsrps94qgxhmk2xgp6j8lr17g8c2liz39ffvvwawcr207k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -43770,12 +44125,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161028.2314"; + version = "20161115.628"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "991e1b8cb7cc3a0bbb9aa8fb109800b46b6cf3b2"; - sha256 = "0v4l4y4zwp93dgvlca23f6y9kgkzvv7i3cmvb6s5jki5syb86r3m"; + rev = "5c7c66d6d0c14f45bbdfdf04610243c805a4c298"; + sha256 = "0wp55fpqqw0lz3n8ng0g5dydbipcxxvl679m65jla0ciqgj2fh8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44026,8 +44381,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "b7bac03427e4f13ec7681aa25d3a1111fab7a4c3"; - sha256 = "1sga2iqm3qf4qyvxm89maakkxg4dskwy0m5vfa54b95jr8616p5g"; + rev = "3082aa69b7be2a2a0607441a7a2615d78aa983d7"; + sha256 = "0i7qadg281mv6f0ccafmn7fbcg9civqv65gz8wal9v975mh5nzsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44068,8 +44423,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "eec5409a69054cf21214c3f5846ec0310fcb8228"; - sha256 = "1478xf9mp6v539r6mgpm7lfqa21xa5vd1kwybm24bdnzlq7h5pws"; + rev = "7ee43df8622cc0589d54248fb44cebe1c1d991d2"; + sha256 = "10lzqqxd7nmzlma05ralfkzg3yk8j1qxvnnk12y466q8gbxk7fca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44190,12 +44545,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20161008.1358"; + version = "20161120.1243"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50"; - sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8"; + rev = "e1f11f07bcd2e2bae8b7217b0f6795d0cb0e6b8c"; + sha256 = "0dmkmvdm5ygm2dwwf7bgwhv9qv5l0h41a00s0l7ic9bclpx5yz50"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -44232,12 +44587,12 @@ noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noctilux-theme"; - version = "20161029.810"; + version = "20161113.642"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "noctilux-theme"; - rev = "8980a500eb2613771c873c78499a1f8a580fff9c"; - sha256 = "1qfwra5q6k3p5p2i35pzs3hcksvpg1f5nk4q4qrkqb8flypfasdc"; + rev = "a3265a1be7f4d73f44acce6d968ca6f7add1f2ca"; + sha256 = "12xx0v8d97kjvlkj0ii78vxxvzgmcfc4hzv4yvxymg50rsy0zzqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a18df34c105da8c5710643cd8027402bb07c95/recipes/noctilux-theme"; @@ -44334,11 +44689,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161104.851"; + version = "20161117.425"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "343534d82dc8882b3f0e2a847ee9d10ba5392809"; - sha256 = "1gq6vj6ac5f2kxrmzh8szn5577znfaxmp9fw3zcfjdrdmw0775n4"; + rev = "518843747835903b77889da30ce8c4518a5c0574"; + sha256 = "1wc0wslpscx79cy1acjw5yl7nk0jj5gx1r6j13mc9pd5hrfh5rxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -44708,11 +45063,11 @@ ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-axiom"; - version = "20160310.1353"; + version = "20161122.1222"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "4d70a7ec2429"; - sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; + rev = "485778b352fd"; + sha256 = "010qb68d0vv6h3wqlmrav6qvazm8dcjgkqr9yn4j8s5x3c94a5cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -45110,8 +45465,8 @@ src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "450d510a5eb1fd644d0037e9f02271ca33639fb0"; - sha256 = "00i7jszlfh67xzvqnp137aaia68rkk4ri5v0fs32ym10pcj8l4dp"; + rev = "5715748b3448b1b1e4856387c5486c7b56c0699b"; + sha256 = "1jhzrlvwf02g0v4wybyry6n9dqcihv47n11m1rpmaxpg2z8551rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -45745,12 +46100,12 @@ omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omtose-phellack-theme"; - version = "20160919.2240"; + version = "20161111.1320"; src = fetchFromGitHub { owner = "franksn"; repo = "omtose-phellack-theme"; - rev = "ae389d81e84646e1bbb283f56849ef34b449e4b8"; - sha256 = "0wn0xzvc8c5dlh53fl2naa44512w04j6xjxrw17gjs0ysvbqg4ns"; + rev = "66f99633e199e65bd28641626435e8e59246529a"; + sha256 = "0imf2pcf93srm473nvaksw5pw5i4caqxb6aqfbq6xww8gdbqfazy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme"; @@ -46136,6 +46491,27 @@ license = lib.licenses.free; }; }) {}; + org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-babel-eval-in-repl"; + version = "20161120.1243"; + src = fetchFromGitHub { + owner = "diadochos"; + repo = "org-babel-eval-in-repl"; + rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122"; + sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl"; + sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6"; + name = "org-babel-eval-in-repl"; + }; + packageRequires = [ emacs eval-in-repl ]; + meta = { + homepage = "https://melpa.org/#/org-babel-eval-in-repl"; + license = lib.licenses.free; + }; + }) {}; org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-beautify-theme"; @@ -46160,12 +46536,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20161025.1203"; + version = "20161120.1201"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "fcc653735faf1ab018273d7821981090f752c838"; - sha256 = "0x8mfka6m5452r5sj7m6ypvd91cqqgyxb00rx3v8y6wbpf2nsrc8"; + rev = "cdb62dd5bf1e316d2dcc6da9661231f6c8e3be72"; + sha256 = "0clpx15lcbjsml10z87zbbi3jwzm76f01f7ikgjj8y5xxj09nhh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -46496,12 +46872,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20160907.1021"; + version = "20161119.315"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "115433394221da8071dedf7e3f056e37f097a272"; - sha256 = "1y2654ihc0py9nhl8178bmqvaqwx2wydyfqydd6vsis31hahxmnd"; + rev = "37d323034b09fe17029985aa556999acb2f9a0e5"; + sha256 = "0g77grkhy76nlxq4fblw3biiik5mpq7r444dmvwi8fslkyshfkgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -46622,12 +46998,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "20161105.719"; + version = "20161121.1655"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; - sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; + rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab"; + sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -46684,12 +47060,12 @@ org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }: melpaBuild { pname = "org-gcal"; - version = "20160805.2144"; + version = "20161115.357"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-gcal.el"; - rev = "4a5c9eb487b3206771bac0ef2016492af628fc3a"; - sha256 = "1lhy8cjzz2bkw2g0ihvh6yxaavg4g3zrvnzlqi9p2y0lcw1w65lr"; + rev = "5d3cfb2cfe3a9cd8b504d4712a60840d4df17fe6"; + sha256 = "0hjiza2p7br5wkz1xas2chlzb2d15c3fvv30232z0q5ax9w428m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal"; @@ -46709,8 +47085,8 @@ src = fetchFromGitHub { owner = "NicolasPetton"; repo = "org-gnome.el"; - rev = "1012d47886cfd30eed25b73d9f18e475e0155f88"; - sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1"; + rev = "122e14cf6f8104150a65246a9a7c10e1d7939862"; + sha256 = "0jd5zwykc6fkkaj8qhg7wgmrjn47054x242b5s03w8ylyczqbcg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4f7ebd2d2312954d098fe4afd07c3d02b4df475d/recipes/org-gnome"; @@ -46807,22 +47183,22 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20160821.1939"; + version = "20161117.637"; src = fetchFromGitHub { - owner = "baohaojun"; + owner = "ahungry"; repo = "org-jira"; - rev = "da3c987fc078ea142632bf9f050adcac719f9a9d"; - sha256 = "0zkabdqjkazcl6y4yn5c1lrhw3qny8dm51mjf18pfcfvz8fmr13c"; + rev = "2977efc1c7d7de5a8c806277e08883aa80c40930"; + sha256 = "0w34j1rql98ca2fi77p4hx3kbkd13xqq9iym72d0qmphzh8xbqmb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d83f6897d422f81eef83933c49d82fc5db1d1ae3/recipes/org-jira"; - sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; + sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; name = "org-jira"; }; - packageRequires = []; + packageRequires = [ cl-lib request ]; meta = { homepage = "https://melpa.org/#/org-jira"; license = lib.licenses.free; @@ -46835,8 +47211,8 @@ src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "8f3de8d1e60a9d1fcdd9c63e5dbe3d461448c75b"; - sha256 = "0p79wqvsnvx94fkjkrapsalgs4drkj0dbybkbgxf1r8zi1040mm2"; + rev = "c5c8724ca987da77446161c0400d444ebd5bd983"; + sha256 = "17pjhs6x2qnqrag56f7rgnraydl6nbz6y21hj981zsjy3mv899hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -46897,8 +47273,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "8dc2d7767811f7d754328da0398e49718bd797de"; - sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; + rev = "a43eaccfce3b25999d91349f2c00b209970693ab"; + sha256 = "1g9wm439gy56884lbbs9kycymsd46pziwqhr33522dw7nnxr27pi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -46917,8 +47293,8 @@ version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "8dc2d7767811f7d754328da0398e49718bd797de"; - sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; + rev = "a43eaccfce3b25999d91349f2c00b209970693ab"; + sha256 = "1g9wm439gy56884lbbs9kycymsd46pziwqhr33522dw7nnxr27pi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47018,12 +47394,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20160626.108"; + version = "20161121.2129"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "870d47a63f36f2aabe5d0d261d9b534127dedd4b"; - sha256 = "13rsv2d96hndvkllfjgip7y6477pv4hkpi3asqszkbxian4y9rjd"; + rev = "bef1e2fbcb60e85b3d27887fb0c6c988a18a0b59"; + sha256 = "1yhy98rg7zqj91hkabkf00mzgzk9cb5mvp5mad09gfy9ijkkm6sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -47089,12 +47465,12 @@ org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-pomodoro"; - version = "20160725.349"; + version = "20161119.226"; src = fetchFromGitHub { owner = "lolownia"; repo = "org-pomodoro"; - rev = "a6d867865f1a033fb5a09cca6643045d7ebac49c"; - sha256 = "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv"; + rev = "4b1d650b8d0b607a616a8c792da428334fe635f7"; + sha256 = "0z613daq1r4l0bfn9h8h69dcpczhnsgc653v0753jahmcj0hrqx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro"; @@ -47263,12 +47639,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161107.323"; + version = "20161117.630"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "40b1c4322903b30b9c44906093f3ad73f7fba142"; - sha256 = "02hm36hkcsyjp28idrsfz52imjaig9qlwsamfkww0fqf9j5vp0hs"; + rev = "72ee7410b218d39a3629f3e092e10ecb37e183db"; + sha256 = "14jf4qdi3lnm8k8cdl99bmy7zqh0brdrbz166hhlih7sn1lgsywa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -47399,12 +47775,12 @@ org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; - version = "20160407.1440"; + version = "20161120.932"; src = fetchFromGitHub { owner = "storax"; repo = "org-tfl"; - rev = "308251618e215eb78d5436e7412a0c14216fa890"; - sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94"; + rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3"; + sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; @@ -47483,12 +47859,12 @@ org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-tracktable"; - version = "20160621.1127"; + version = "20161118.529"; src = fetchFromGitHub { owner = "tty-tourist"; repo = "org-tracktable"; - rev = "b39fc45a795446b3675dd4a7c809be7bf315901b"; - sha256 = "11q85blkrfs4db0mpgn7wqfrb3ydcw4v2ccy02ba0m5dsign4wbv"; + rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a"; + sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable"; @@ -47994,12 +48370,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "20160628.111"; + version = "20161115.2350"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "2701c76a641cb3ab3c33a330bf48adfb08e17061"; - sha256 = "10d6mhb541gz042q02ysdazc2vv9wh1m2a9i35akc15978dwd5yv"; + rev = "8bbe1c700830e004f34974900b840ec2be7c589c"; + sha256 = "0pv9j3nza71kd2i9a78w1y10r965b2wrnywjk1zgvab8q9rzwxdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -48498,12 +48874,12 @@ ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ox-mediawiki"; - version = "20150923.902"; + version = "20161115.541"; src = fetchFromGitHub { owner = "tomalexander"; repo = "orgmode-mediawiki"; - rev = "973ebfc673dfb4beeea3d3ce648c917b58dcf879"; - sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji"; + rev = "9017740cbe5866e21d81838e540dec310cc0dec0"; + sha256 = "00c7l8skxjkphqpviwkgl28gqsj5cm63h64ffg09gkvp42mwjshz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki"; @@ -48603,12 +48979,12 @@ ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-reveal"; - version = "20160719.28"; + version = "20161027.226"; src = fetchFromGitHub { owner = "yjwen"; repo = "org-reveal"; - rev = "6ee0e547ddf1596496e558d1b7ab78f315f980ec"; - sha256 = "0p71pvsgyri2pgvv208pp7fizqx40asy6m60si9mhlk8smdris72"; + rev = "001567cc12d50ba07612edd1718b86a12e8c2547"; + sha256 = "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bb4024eef5dc4cc3674bbbed9d92f074d533f35/recipes/ox-reveal"; @@ -48834,12 +49210,12 @@ package-filter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-filter"; - version = "20140105.1426"; + version = "20161121.2319"; src = fetchFromGitHub { owner = "milkypostman"; repo = "package-filter"; - rev = "ba3be37e0ef3972b2d8db7c2f2cb68c460699f12"; - sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6"; + rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b"; + sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter"; @@ -48855,12 +49231,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161106.718"; + version = "20161111.1451"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "46f12c815bc791b2889292d4b32eccad9e313d1d"; - sha256 = "0dvljayxc9dkrw5w0xj92859wvh0kmvq1jl8mgf7916nafxgl0pf"; + rev = "46562bac48a22fdc8492b76d63722c1dbcfe2e63"; + sha256 = "1l0rhdlzkvx1zzif8k3y1b8wxmi3yf08k7ynzzz5dgidxdvg1bd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -48915,22 +49291,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ async, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-utils"; - version = "20160627.909"; + version = "20161115.108"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "f655efc89ea7675b6cc9990d46a9f48ca6d384b7"; - sha256 = "1q6hpfaj8hfybxmmh1v871arlv8dn77li9vgckcal4l6xf83nvpi"; + rev = "6f283b06ab87cce071fe71a9b22eb791d4da0289"; + sha256 = "0ihynkr446w065wd8psljdyrax53mcpv18l1k5kzlhp9hplykaqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = [ async epl ]; + packageRequires = [ async ]; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -48985,8 +49361,8 @@ src = fetchFromGitHub { owner = "onurtemizkan"; repo = "paganini"; - rev = "506e35c9cecfae0f9ccbb7da24d48b9d082a7901"; - sha256 = "16g4crpgskhgfzw8fx2j4ibvpdf8qi7brxbp2nhwijdag12i4wwn"; + rev = "44e3ae4c451f3b380956fea8aef8cca75279746b"; + sha256 = "0p5sml4djwr92s36nx4hd0pjwkfws4px01g0dzip34zabkm3dx4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6fbb609b411df4fe6f66a7afe27eda7d297f140/recipes/paganini-theme"; @@ -49209,12 +49585,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20161102.1351"; + version = "20161117.502"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "b693226ad827409fc1d6243a5a949d1c87c53104"; - sha256 = "050ygdhlxd7785h262vg8pdv2w0sgq36jh0wsjv9q64qmrndrklf"; + rev = "17a6690d42a1e854ec270ed930c7494077570fc8"; + sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -49354,12 +49730,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161101.932"; + version = "20161119.2133"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "fb9e9f94a8010d2167a03ea6b58a320b0925af10"; - sha256 = "0zwv0r8jzb27gnv0j4n9xxylzk42sg6w6ljvdkx9nm2qgrfq3nsv"; + rev = "01cf9c8a90ddb09e8e6e08c1346419989c8a0e52"; + sha256 = "0jqvhr4infzhcl60q8nagdz4z7rk1c29b0cv5x8bzx8wlnnbwh1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -49438,12 +49814,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20161014.255"; + version = "20161111.1320"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "beadbd50c60492248e950a7d61e22f2c3e5a2bd4"; - sha256 = "06wjq0nmxdjay0jrs5jc6j02xbqvhxbz2v529zych7llyvkbyf9r"; + rev = "b4c3bd9130044c4e106bac5ba73a50822865e258"; + sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -49814,12 +50190,12 @@ pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-homebrew"; - version = "20160725.1939"; + version = "20161122.1843"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "pcmpl-homebrew"; - rev = "c202e7ba1e17661b659292f5382831c9ce40939e"; - sha256 = "00mj94jmp5izh6fqnp2g35ksjcr0r7fzjf9xnhglk1yfllg668rj"; + rev = "eaa725fd86a6ea641f78893021d23a426d62e715"; + sha256 = "0yhy6k71sd00kxadladnkpmragpn1l7j3xl6p6385x1whh58vqph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew"; @@ -49877,12 +50253,12 @@ pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcre2el"; - version = "20151213.234"; + version = "20161120.1303"; src = fetchFromGitHub { owner = "joddie"; repo = "pcre2el"; - rev = "166a10472002010692dbc35f323ffb8110a294c5"; - sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i"; + rev = "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d"; + sha256 = "14br6ad138qx1z822wqssswqiihxiynz1k69p6mcdisr2q8yyi1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b/recipes/pcre2el"; @@ -49940,12 +50316,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20161026.1557"; + version = "20161113.514"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "9696abb82e427670b8283599365a234ddaa170b4"; - sha256 = "0jmpvwar5hks2qbqkfabqw16zj9iyl99c79h6vm2z7jypsmzc8mp"; + rev = "3c1cc818e7f32b918ac2ef3b48940f25d72e9e1e"; + sha256 = "06v3y0y9l32wqwpg80g9ii0miahvpxcx9jkhpykydvm0q0vb68ww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -50107,12 +50483,12 @@ perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perlbrew"; - version = "20130127.324"; + version = "20161108.2309"; src = fetchFromGitHub { owner = "kentaro"; repo = "perlbrew.el"; - rev = "30e14a606a08948fde5eafda2cbe1cd4eb83b3f3"; - sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26"; + rev = "3a3406c3307c92aa30f9400d430925c434a3b6f0"; + sha256 = "0kxz8ljc7w69ywp0bb15010sgrr13i1p05hcvhfr9c35l0n62r6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24bd9c2cd848f5003a244a7127e8fc5ef46bdca4/recipes/perlbrew"; @@ -50191,12 +50567,12 @@ persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: melpaBuild { pname = "persp-fr"; - version = "20161030.159"; + version = "20161108.1138"; src = fetchFromGitHub { owner = "rocher"; repo = "persp-fr"; - rev = "00db4a17977b4e9c5c3212ce94fbc106f24d9d81"; - sha256 = "0m70wawbxm0kg641qj6sdsij5d2icmmad2p977c8qpcc8qh91gs7"; + rev = "0b2a021be802d5a39f1551c0ad1d8bceaa136afa"; + sha256 = "1m1k6i1h7smfmn68k29bq3w301bwf76l0r8qhq5drd51nk0vp0dc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; @@ -50212,12 +50588,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20161025.507"; + version = "20161119.505"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a"; - sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd"; + rev = "2ab3c6b86527811794235309df6055b4a302aa76"; + sha256 = "11nzz7z9ck8g7xam75ljiw0qhk48zhbxzhfw5jzfz3ql04ws7bml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -51136,12 +51512,12 @@ plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "20161018.1025"; + version = "20161111.205"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "2b7d79688608a5f328b95610edcdd871278fbd29"; - sha256 = "1pmnz01k3n4jjkl1p31lcfh8j6g3zpr78p8f2wazdlgcl14g7pjz"; + rev = "87417ad75b215ababf153cba533575ac0273a5db"; + sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode"; @@ -51343,8 +51719,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "f837369264c119d0e96c9ba6e5960deba59eee73"; - sha256 = "12mxyg47hsgzzvqv19qlq9yhhryam62k7adll1i9n39xi6as13py"; + rev = "1d12aeb7334104f77070361492ff7cc8225503f5"; + sha256 = "15c1lij2c40xmqbq44xv6wvinjcq4j0l80rcc4yvdv8ik436phmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -51798,12 +52174,12 @@ pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pov-mode"; - version = "20120825.716"; + version = "20161114.2343"; src = fetchFromGitHub { owner = "melmothx"; repo = "pov-mode"; - rev = "e60e497f84a310814ccf97b056da77dd0f42394f"; - sha256 = "14silfng5rbdc8hnzswjmqk705pncjlk8iphjcxcm799h44pnlcr"; + rev = "9fc1db3aab7c27155674dd1a87ec62606035d074"; + sha256 = "1399fxivy15y2k4vp7vqqgsi8l1mzxc8aa2mf2x1hksgiyq60acp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89d6b4a3d7a5f3cc93e9d13d4c174b5d7de7bad1/recipes/pov-mode"; @@ -51840,12 +52216,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20160702.1931"; + version = "20161121.2320"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "d3dcfc57a36111d8e0b037d90c6ffce85ce071b2"; - sha256 = "1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar"; + rev = "67538e4dbc2f1d2f270142481eb0b0d24e8cde36"; + sha256 = "0jjv6wszsnrdi5l5qz4d50nj6p6zzyvqmn1j31zlhypbvi05isls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -51920,10 +52296,10 @@ }) {}; pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-plus"; - version = "20160523.1439"; + version = "20161114.1346"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp+.el"; - sha256 = "0yvls8sw5rvka20xlqazl46crpkw91cy9qmj6p6y53sps1rj5wzp"; + sha256 = "1fc2ii689f92255817cv0aiz0h83z1iyrgxmywpayiv58r8j3k4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+"; @@ -52395,12 +52771,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20161105.834"; + version = "20161122.728"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "b573b0656f9fc4c1afa1275c3e3d9ca9badda7f6"; - sha256 = "1frirasi53apys8jhff6ywlbl8h77nd5z2z9ir3jjb9ysrsk7kmq"; + rev = "ab07ade902e0a432aa8396664bcc2c9ec7829958"; + sha256 = "08j07j4j9nz95g571y7fvv5943y6fv8zhk5n694j6vavvh5ip4v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -52455,6 +52831,27 @@ license = lib.licenses.free; }; }) {}; + projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "projectile-git-autofetch"; + version = "20161109.1429"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "projectile-git-autofetch"; + rev = "3d4eae6493607b9a0461c5161d195659c268184b"; + sha256 = "1db4jq4vn9mk8c9ma7yma7q00hwhwba25w2hy8jyagyb83lk2zgj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; + sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n"; + name = "projectile-git-autofetch"; + }; + packageRequires = [ alert projectile ]; + meta = { + homepage = "https://melpa.org/#/projectile-git-autofetch"; + license = lib.licenses.free; + }; + }) {}; projectile-hanami = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-hanami"; @@ -52479,12 +52876,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20161024.1043"; + version = "20161118.530"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "168ab64262d5927520a838bb659ab38b4f001eee"; - sha256 = "1lkzl5svc2xff3ln2bcj9jxrvn8l00yyvd8nwjsad7ns44lfw5g2"; + rev = "0231a7bb4b70ef3ee0e6a30185e9791a028e718b"; + sha256 = "1vrhd7j4dk8pkm2vlh46hckfw63vpzrkylk3v5y2l4khg5ak66wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -52497,6 +52894,27 @@ license = lib.licenses.free; }; }) {}; + projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }: + melpaBuild { + pname = "projectile-ripgrep"; + version = "20161119.59"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "ripgrep.el"; + rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; + sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; + sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg"; + name = "projectile-ripgrep"; + }; + packageRequires = [ projectile ripgrep ]; + meta = { + homepage = "https://melpa.org/#/projectile-ripgrep"; + license = lib.licenses.free; + }; + }) {}; projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }: melpaBuild { pname = "projectile-sift"; @@ -52542,12 +52960,12 @@ projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projectile-variable"; - version = "20160910.1005"; + version = "20161109.625"; src = fetchFromGitHub { owner = "zonuexe"; repo = "projectile-variable"; - rev = "810394eabf330325a86ec6f60c69e160eb837ac3"; - sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj"; + rev = "dedd0f1669d9498d59231912c4ee80a1080ac93b"; + sha256 = "1wmwy5iamc2g5grhshss0cmxjspz83kl8iclkv42c4vc1l1nsgfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; @@ -52735,8 +53153,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "0d7199edc802299bdba39400c04f119c7db82667"; - sha256 = "11jvsdkbxlpdvli557d3rydn8hiyvrpxa0cc4k02yi2pf2hmqkdb"; + rev = "c9504715634948c9f8f306330449f296d926b74e"; + sha256 = "0pvxh58vvvgrlf6gjrhg016k7hys8wmraxd38k0kdjw4srisj319"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -52794,12 +53212,12 @@ psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20160514.2359"; + version = "20161119.2248"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "324c68a1f809f6c2a37c9e4753dd00796236ec56"; - sha256 = "1fpcb4qpd11mbv733iklnbjg7g4ka05mf5wpa2k6kr3fbvndkx37"; + rev = "33f9020e87732e14473c5fc4d986e572fd95c5f3"; + sha256 = "0ag57g4w44w90gh09w774jmwplpqn7h1lni1kwldwi7b7n3mhli7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -52966,8 +53384,8 @@ src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "efb67ed6e1c528d4fd76d7eb7e9cff2e0b819383"; - sha256 = "0r0j8fzpmd33jskyz577ry6w0ld0dbpwpwfkp3z97akjl97kgzp6"; + rev = "0a7177c8b0437f1e716da428053fa8d5113a2f51"; + sha256 = "1ma0yyf176nz3df5mxzim715g40g4v2snb51ljxax2rs1az04wxb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -53399,6 +53817,27 @@ license = lib.licenses.free; }; }) {}; + pygen = callPackage ({ dash, elpy, fetchFromGitHub, fetchurl, lib, melpaBuild, python-mode }: + melpaBuild { + pname = "pygen"; + version = "20161120.2106"; + src = fetchFromGitHub { + owner = "JackCrawley"; + repo = "pygen"; + rev = "3a5d1d1a0640865b15be05cd1eeb33bb4793b622"; + sha256 = "0fzpvdwb7hhmfmjxzvap8413bc81lrx8r3ij3yasqaxyqw3a6vy1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen"; + sha256 = "1ivg7a1ghg0bvz3idz7dzy5yb0ln3b2j7dfizg2g0fi4iwvc4czz"; + name = "pygen"; + }; + packageRequires = [ dash elpy python-mode ]; + meta = { + homepage = "https://melpa.org/#/pygen"; + license = lib.licenses.free; + }; + }) {}; pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; @@ -53448,8 +53887,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "21ecaa744484218be5c89c7108771465425542bc"; - sha256 = "1l41hyc17vlpfdnjp2bvkirfk12paabs1qwvc03x29ibylw86a23"; + rev = "23e59c80cfcba5878b7f634464a203017ab91187"; + sha256 = "1gylvfl2bd6f5n60g0l5z2ymaasgvcj1a5ar5fh46snsln5j83zl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -53591,12 +54030,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20161105.1431"; + version = "20161120.952"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "fdd052ab2d70e0acf2dcb25a5a94cf52f4c4123d"; - sha256 = "1pdva6a7jdi8aw1q2k32n0kagkldjh8fkapjdmn65rs362nqj7iq"; + rev = "ef639cf5bfa8bbe6a4321eb58534768dcc7608ca"; + sha256 = "0ay3jbpp70r6a02rwk6bll0blzv7f61k081jlby5y1g1xd753p2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -53612,12 +54051,12 @@ python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; - version = "20161020.1139"; + version = "20161107.1048"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "python-test.el"; - rev = "6f1881dc2a79873713fdd854e1af8157035a4278"; - sha256 = "1zf3k6g6jddah9dfxv0vv388xfrw1pp785zk80gyczxx1912s7f5"; + rev = "f1d24e53c2a9a77812aa10f8cc6d5a5b49b57615"; + sha256 = "0al1s7fh2l0vhcsz261aaxsn3xkrp451zynym11ifhppf1wwlp04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test"; @@ -53948,12 +54387,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20161105.1637"; + version = "20161112.1728"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "4d5c6332d24ba302913606fde3feda6abaef2ea9"; - sha256 = "1qnkb9z23diyvkkhl2q00yvb8sybpvphlfchdyzsrhylixnkq83n"; + rev = "ca5b2f2922d9ab642ee353771091f4f8dd5add83"; + sha256 = "0j9yrb3xhx4wkk2hyk9ayzh4l1mrcvmwrg52a0dm9zpq4pr8p61s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -54053,12 +54492,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20161104.550"; + version = "20161115.2210"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "b33640716d0d9930b09e671d2c62c5839fbce210"; - sha256 = "17n1fd9hjqalxffhjfzr08psarcc7ahsi0ns6clx9mwaq3fycg5g"; + rev = "cce0e4ae6527e84e2ae3deb8b3c7770dda225853"; + sha256 = "1li86qpbjg8sm9q4sl8cffc0fni6mwx8180x8zlmsxdnhqic5nvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -54158,12 +54597,12 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "20160830.245"; + version = "20161114.605"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; - rev = "14ff370e867302d7f55d7cc02dd42ac82179af6a"; - sha256 = "0mk5zsm081sdz06mf1jvvbvhsqbl11jh17csyg5wqjyx6vs0bzla"; + rev = "e680f1a8f2591af7c80cad188340601b101b5ddc"; + sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; @@ -54179,12 +54618,12 @@ rally-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "rally-mode"; - version = "20160326.902"; + version = "20161113.1954"; src = fetchFromGitHub { owner = "seanleblanc"; repo = "rally-mode"; - rev = "722b9a8e6d8a6aee5c4c4b16be0194f7bb4bfa5b"; - sha256 = "13pkp80cv1v3pjff1588cgyx18a31i668lwywll5dk4fxl4zdjvb"; + rev = "0f5e09a6abe2de7613f174b4f54863df93343134"; + sha256 = "1vrsv8ph1v853ii0i3q889xlwxnjdqz4bs3ipi502rjx6g7y5gdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0914825c6d5ad26d2a8035fc33ad98df42df3c53/recipes/rally-mode"; @@ -54326,12 +54765,12 @@ rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rbt"; - version = "20160129.1051"; + version = "20161109.1506"; src = fetchFromGitHub { owner = "joeheyming"; repo = "rbt.el"; - rev = "865c619f200afe877c56a44046f706361b676d0e"; - sha256 = "0q5giixk6pv82cf34a0mxmnzh2gdiyq6dzv4ypkkdpz6wsm2ffhx"; + rev = "402d7465f68706d051e8117b6f00ecdc18134f15"; + sha256 = "12kqw7cxv54agy7k8y550cixnv4zjpy8rhamwp36bf6nqch4ly2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt"; @@ -54960,8 +55399,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "bd962668615abcc48b4797168e948dde62b3f197"; - sha256 = "1xz82h933dxl2bj90l24h50qji4h1ivmnf657yp89dbyc42fz7zf"; + rev = "d68a46821809251d04eea062916238131130b477"; + sha256 = "0a0p57x1gizbzp793l0k7mra5qv36ml8zzpva47l34lhywd914xn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -55039,12 +55478,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20161104.804"; + version = "20161118.1715"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "a83ddbf79abb65f5cfc98d9b19815727e2395b91"; - sha256 = "1kciixx40pdd9vlzd54hxy43adk9bhcga23m2lim5q2fdj9qbyir"; + rev = "9ade146339e9883a65b109497574910d9e618aed"; + sha256 = "1ff79jyfk2aahxazsa9drsq4j4sl2n88b52ikk3dmsrl08bvvzvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -55120,6 +55559,27 @@ license = lib.licenses.free; }; }) {}; + region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "region-convert"; + version = "20161118.1859"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "right-click-context"; + rev = "10578576f6cb2945aed00fdcd585fc65cd2c5c31"; + sha256 = "07bhw6ll2ad5725rq6jlvp2v8aqhlrbsywjng5ypmcvds5dhgbsk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; + sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm"; + name = "region-convert"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/region-convert"; + license = lib.licenses.free; + }; + }) {}; region-state = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "region-state"; @@ -55206,12 +55666,12 @@ relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "relative-line-numbers"; - version = "20151006.1446"; + version = "20161112.2151"; src = fetchFromGitHub { owner = "Fanael"; repo = "relative-line-numbers"; - rev = "64157db08b0c2f5fada3209fc8d3e4b4c7429978"; - sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a"; + rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63"; + sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers"; @@ -55290,12 +55750,12 @@ repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: melpaBuild { pname = "repl-toggle"; - version = "20160119.421"; + version = "20161120.200"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f"; - sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b"; + rev = "bd2d28738368a047d5f407034f78839a7e514489"; + sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle"; @@ -55434,12 +55894,12 @@ request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20160822.1659"; + version = "20161121.600"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "12450136785fe6ff8df940f9c0601406a9fd8bc9"; - sha256 = "0kpb2fhj617kh7xzcls7i911pj61bmjfb7hr0vc1a2pgwpgrpd4y"; + rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b"; + sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; @@ -55459,8 +55919,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "12450136785fe6ff8df940f9c0601406a9fd8bc9"; - sha256 = "0kpb2fhj617kh7xzcls7i911pj61bmjfb7hr0vc1a2pgwpgrpd4y"; + rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b"; + sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -55539,12 +55999,12 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20160530.622"; + version = "20161108.2239"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "0dc6d689cd7fa080fe7c19431863bf7186f910e9"; - sha256 = "082izk2wmsdspyizfbvqw34rigvbfwq2963zf4iqlniqv05p88pd"; + rev = "dc28874f47fe47e6891803fd3a483f9577b65ee9"; + sha256 = "029y18bzk9ld2ig9666idsrig1wmnswavcj8rilxw5f8wkrh38wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -55890,12 +56350,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20161008.51"; + version = "20161116.211"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "47f4451c497588de4a198f271f4121572e7db1af"; - sha256 = "0nrn60nr30a0dqvd1aiwm9mwlkcn21qz62ziq25n5ixjy1hv8p5j"; + rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; + sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -55932,12 +56392,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20161105.833"; + version = "20161115.456"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "66086b6557fcafacf9bfdd80140e7dde4daac266"; - sha256 = "1y9inxk3kr8cygi8rnj4dns7azq1ka1yvvj7wsm6hnmm1i3wk3lx"; + rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0"; + sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -56163,12 +56623,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161028.1136"; + version = "20161115.1841"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; - sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; + rev = "1360dac22af6b227a209aa9840336bab7f1b21e2"; + sha256 = "06cnvxfvwcli2rr6wgsncp30jxmpyq0zbp2yrbxhyl7q9g875s85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56226,11 +56686,11 @@ ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "ruby-additional"; - version = "20160911.333"; + version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56665"; - sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; + rev = "56884"; + sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional"; @@ -56309,8 +56769,8 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56665"; - sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; + rev = "56884"; + sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric"; @@ -56729,8 +57189,8 @@ src = fetchFromGitHub { owner = "adamrt"; repo = "sane-term"; - rev = "034033141b2eb467e2d0b79c8ce1da1f8ff2f013"; - sha256 = "0nhs916h52hxbp479ma01p6i0zfap26n4fvyx83822pisbcd3krb"; + rev = "ef6fd08078f49f2bb3be60855d2d002bb6a5e0d2"; + sha256 = "0aazzq1yqn5mal75hxa6ifx2hnyv0lh800klqvzn26xd7i8xcfrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5df85d24ee7ed41aab983626df72641bb04dadd5/recipes/sane-term"; @@ -56872,12 +57332,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20161026.350"; + version = "20161117.1519"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "dbca1e2ae1b91ccb2bd10c4231fd01b47c0c6801"; - sha256 = "1216lmx6rwm61kcv7mfp6k1vgln4bbibx77swxr66d0a2qil8rv1"; + rev = "dd0c42a1eb739529cab2becb791badfd2c4148da"; + sha256 = "0ca9pd3si7gw7wsibryhhr9in6ymask2icv79qrdcpz4qhlhby52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -56897,8 +57357,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "54dd1b77ac33ade3efe7aa8c78f9915d850f12c3"; - sha256 = "12m86z76a157sfg3y4grizxii0747w3wxv1szlfnghqdkgc1qx69"; + rev = "dd2e9af171bd343af080b37add48a0edbf043a07"; + sha256 = "06q66m6i97i7a5qpxslgwighaqbn23gfhjjr4baxpi7cs04xyfbf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -56935,12 +57395,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20160902.525"; + version = "20161122.2325"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "387e93c70a3703e55f717d3285912ad12cfee947"; - sha256 = "0xwwarla3m9cr1mpnlhsknfvxw1xyf85cxjkzg42q12k7i0yad5w"; + rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea"; + sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -57519,8 +57979,8 @@ src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "2768b2c16dd15dcd35fcfd123c4d56f2ffd1b362"; - sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7"; + rev = "8f256be87564653aeef702b3c09f235f0bcb6ae8"; + sha256 = "031aiypx1n8hq613zq4j6gh61ajzja2j60df9mwy50a0qma34awr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -57702,12 +58162,12 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20161025.2120"; + version = "20161121.1247"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "2ae4dcbbc62a3befe63d6294b0132cf28076bf80"; - sha256 = "1cchzy8vclwi8fcic54i6hqklwd57l6j6604lii8a4gcr4mhixdx"; + rev = "4ec545214b137bd0062d53108b8a523250bda875"; + sha256 = "0hwvsxq7cba2bqanjmlln8cx63nhsq3rlg9p12lwbqrfppmlfj18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme"; @@ -58198,12 +58658,12 @@ shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shen-elisp"; - version = "20161030.1115"; + version = "20161113.1611"; src = fetchFromGitHub { owner = "deech"; repo = "shen-elisp"; - rev = "e7c3da5d817c90588ebc276bd8defa9d497baf69"; - sha256 = "00isccj80g0qdjd15bl2dnlxqvmz2p3nih6v9ljx3vs2jb43pibx"; + rev = "1828dbd81ced737a7b0bc6e3c8caf9380d5f8fdd"; + sha256 = "1paf9lyk552kl3lmfsfw9r45ab9s8iypvg20jwdw6y6p1fjcykmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp"; @@ -58862,12 +59322,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20150914.1304"; + version = "20161122.905"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "92e13cf9540128b2bbab28ac1a0a7a4c00771270"; - sha256 = "0dwc3qaqnzjsccvr3gapip4yr17fzgv4w33ydq8hjqn8rs9rqq6l"; + rev = "051068d58a724695bb067e268d317c8bfd222ba9"; + sha256 = "0pczkbmgf5slr05lrsg8q6a67hbmvl20yb9w86j205y8hq5zz4pb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -58946,12 +59406,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161104.633"; + version = "20161113.1832"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "c87637c799b19e878d65f1a6906c93b74ad1e3cc"; - sha256 = "0qqp19dwz4vbz83pkhhc5xlwqhq482v2dpmqgq1i6lh42m1xkk5k"; + rev = "70e4c3450a489185220756ea8ccef8ab453ff07f"; + sha256 = "09591nsimwavdzbdz8kj374yy8gglcc5w7gpqvxq4fnrkfda6dgd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -59030,12 +59490,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20161102.711"; + version = "20161109.640"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "14f2502cae166ea5dfbab82a04f9fbae429a211b"; - sha256 = "17f40bam7v1p5ypw2vd6gbzgbmz9jswy7sqgs8xac46ijn4n62w3"; + rev = "786c032a95cc78d3e294abe1b12e09880381efe2"; + sha256 = "1sv3x7q5b8ablzv0wf7g8sg4vk4gjggylfh0zigx9bpxk0dvj5jj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -59407,10 +59867,10 @@ }) {}; smart-compile = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-compile"; - version = "20150519.947"; + version = "20161118.403"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/smart-compile.el"; - sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd"; + sha256 = "163s97h1a9pjz3pqyn2mhh4mf05b7yycp29k5wnk3c9zc71pafvp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e6c3dd7b8e19193d070fd41c2be4bcd61f1022/recipes/smart-compile"; @@ -59698,12 +60158,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161105.1503"; + version = "20161121.358"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "5c680283c9af6d2726bbc107508cbe85a978b39f"; - sha256 = "0fwmjqgcj5q5g035zf4sf36r1ghgb8zb3xqx3a4xvb6bzmzrqa5f"; + rev = "b661715c377a02e8fb71209cd918f1188d1923d3"; + sha256 = "1g05h5fzwg63r6n85gphg4giz2cw6miqckdjbwcam098dk1igyby"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -60054,12 +60514,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20161101.1909"; + version = "20161122.1546"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "9a474fd2c8c17c330d02ba2ee32b543c80d55e2e"; - sha256 = "0dig58in7hlr2mq1j0lrpszj9y1amgwgnq99znd2zjkw80cpvv7c"; + rev = "327c168febbde24c2b39cc10d26c9cfc9189e130"; + sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -60544,12 +61004,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20161018.1249"; + version = "20161115.613"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "3da3396fea7f1dd178e8b807775ef92e46939be9"; - sha256 = "0y3d4s10yri78pkpwra0c7jnkq8hmps486kz8jldsyj84iw21anl"; + rev = "a0fbf0873d113c3f42a16c560329e43b7840f47e"; + sha256 = "0gsy0i6q4csnkdyv3hjqcap7xqjalzl167ccfligc28h07pw5zcp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -61148,10 +61608,10 @@ }) {}; sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlplus"; - version = "20141009.739"; + version = "20161110.758"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sqlplus.el"; - sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d"; + sha256 = "04wqy4ss6499rpn0rnczmn39yi78xkqslblyq4xb700xzmzn7sg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus"; @@ -61206,12 +61666,12 @@ srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; - version = "20161008.238"; + version = "20161116.2201"; src = fetchFromGitHub { owner = "tuhdo"; repo = "semantic-refactor"; - rev = "88e8ad5af2b9da89947aa75c9252163dbc917b35"; - sha256 = "0sqy1w1sda2n116xrfnblysjykg914ax9yqsj5vh40q9wdmyqjaw"; + rev = "f98172442c1a3da1a57f7d1f8d44ffedda4e3025"; + sha256 = "1dlzipvafjbnv8ih62ldfyv7yri0zz0gkfnhdlkv4l1482xdg5yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor"; @@ -61290,12 +61750,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20161031.2219"; + version = "20161120.148"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "e94c9e70ba64d231ff538db54acd4b5ecade3ed7"; - sha256 = "1igw97v0779gnk9ymk4inqmz92kkxdim5hkdhm52qk03kn7766zs"; + rev = "61a16be9fb34486b68e116dd57a4a0a057b8a3e5"; + sha256 = "1v01yl1jf93dsqn6myc2yj6z2cjr9pq2q3cawj5kn21qc53q33fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -62051,15 +62511,36 @@ license = lib.licenses.free; }; }) {}; + sudoku = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudoku"; + version = "20161110.2306"; + src = fetchFromGitHub { + owner = "zevlg"; + repo = "sudoku.el"; + rev = "77c11b5041b58fc943cf1668b44b40bae039cb5b"; + sha256 = "18nbs980y6cj6my208i80cb928rnkk5rn3zwc63prk5whjw4y77v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9861d5d4cf18466b17ac8e53f3874df5312d3f3/recipes/sudoku"; + sha256 = "14nbidjnsm9lwknmqgfr721b484z5156j723kr1wbfv70j8h9kys"; + name = "sudoku"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sudoku"; + license = lib.licenses.free; + }; + }) {}; suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161104.1314"; + version = "20161119.1334"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "fd78622bf70cf70c344513587805538c259ea45d"; - sha256 = "1bjybkvydazanwvyp5hmlrpbcyhw8bmw808ym1gavb64qzsswp2l"; + rev = "99baeba41c06f8ac67570de679405d83a8962fb0"; + sha256 = "0piwn9bpfiiv8vgk9bhrvlh25kfh1sa1a7dqpp6dsrvg1swjqwj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -62219,12 +62700,12 @@ suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suscolors-theme"; - version = "20160605.206"; + version = "20161109.1215"; src = fetchFromGitHub { owner = "TheSuspiciousWombat"; repo = "suscolors-emacs"; - rev = "15931dac6ece2a42d7be78e4d448d25d55990d54"; - sha256 = "1av0ysw3l56sf8f0fg3mldx9ifw1rd74mw92cyvqvqx1k7na5pmz"; + rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889"; + sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/100c3244cfce8691240b11bc8a1d95ede3aae4fe/recipes/suscolors-theme"; @@ -62430,8 +62911,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; - sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; + rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; + sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -62552,12 +63033,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20161104.1755"; + version = "20161109.1903"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "87dfd1e2ce093d53c0919dac7899bbf06bd96224"; - sha256 = "1ln75xg05waxahbaxlvb6vj7yi3svnni2247dzc9khi99dnwlbhf"; + rev = "cb338d7e314f4d29333f59a947ef27c9d22c6958"; + sha256 = "1sfvgk61cm0idmviadjsni9gy1kfjcdi455zynjc2181q0ax3qy9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -62779,12 +63260,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20161106.1611"; + version = "20161116.506"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "d30f58d713fad72e8e8bfa92d6b2ed5300dbf022"; - sha256 = "011n5285c2gwc3i0cxnhk5g867d1jvga6ck92y787xjxm2k688kr"; + rev = "c2f0e4024efe07af7c8aa431c3dd3640c22f39ad"; + sha256 = "01f0qr0mvqj9dh9zzk9y70kivyrdvcn45gpzakqi7vnkvqap86lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -63031,12 +63512,12 @@ tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tagedit"; - version = "20160516.754"; + version = "20161121.55"; src = fetchFromGitHub { owner = "magnars"; repo = "tagedit"; - rev = "0c72466783d7f85475df672284f93942e76c30ea"; - sha256 = "104n6dmiis6w2psm2rxah9hg5jwaqzna6973ijr5a5rxyp4rcsz7"; + rev = "b3a70101a0dcf85498c92b7fcfa7fdbac869746c"; + sha256 = "0xq9i3axlq9wgsr27nbhi5k9hxr1wahygkb73xkvxlgmvkmikcrw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8968e2cd0bd49d54a5479b2467bd4f0a97d7a969/recipes/tagedit"; @@ -63345,12 +63826,12 @@ ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ten-hundred-mode"; - version = "20160409.551"; + version = "20161028.1536"; src = fetchFromGitHub { owner = "aaron-em"; repo = "ten-hundred-mode.el"; - rev = "fc1d7cdb72c21dc1953ed2e2ecf28233b8b3e305"; - sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx"; + rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933"; + sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode"; @@ -63366,12 +63847,12 @@ term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }: melpaBuild { pname = "term-alert"; - version = "20161022.428"; + version = "20161119.145"; src = fetchFromGitHub { owner = "CallumCameron"; repo = "term-alert"; - rev = "8a0842a614aa005f97536142c14279abf0562690"; - sha256 = "11n8sna82gnnfpp4l0gbkqb16afvhydddm8kqa66ln620k8nlw1l"; + rev = "47af9e6fe483ef0d393098c145f499362a33292a"; + sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert"; @@ -63408,12 +63889,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20161106.1419"; + version = "20161110.1707"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "5272c03ddde3557838796c9b64139ef7c676091e"; - sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; + rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9"; + sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -63496,8 +63977,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "5272c03ddde3557838796c9b64139ef7c676091e"; - sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; + rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9"; + sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; @@ -63559,8 +64040,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; - sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; + rev = "c020ba5433998de5b743ca06728fffaa99d002eb"; + sha256 = "07fvmlnc2ck72cyrwgibfbsqcg7knrbar488m1i6an0lqd98gbhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -63580,8 +64061,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; - sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; + rev = "c020ba5433998de5b743ca06728fffaa99d002eb"; + sha256 = "07fvmlnc2ck72cyrwgibfbsqcg7knrbar488m1i6an0lqd98gbhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -63681,12 +64162,12 @@ test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-kitchen"; - version = "20161021.844"; + version = "20161115.1418"; src = fetchFromGitHub { owner = "jjasghar"; repo = "test-kitchen-el"; - rev = "139bddc527d0165db14d52973635f2e8c4ff2212"; - sha256 = "0x9yggqb4ibi6yzr50a09h6yi28f2b81ykx3wq0bi99mqy3qn9jb"; + rev = "9213e55e0334c2a3bb31f8cebf9b40022ca12db8"; + sha256 = "11nnc6s3ryfdrlvkf9rfya9m66l4x1d0zm4p9w1gf0vnyb5x7mfq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen"; @@ -63790,8 +64271,8 @@ src = fetchFromGitHub { owner = "novakboskov"; repo = "textx-mode"; - rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; - sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + rev = "74b701ec2d31b228a8e1e9c993edd00f5c324dca"; + sha256 = "1i4bd17kymdc9w2xd83549f0dva2asnvqcppgsg3svyab8x1aa7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; @@ -63924,10 +64405,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20161104.1310"; + version = "20161121.1523"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "0n738nry3iska0121xzwvnlmvzpvmzds7xg3fxh4vk3z3czpb5rq"; + sha256 = "0xxd6qi6xw9zn0yykyl1ys8ckpfngxkbswy00s6hf7gd9jbknkm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -64010,8 +64491,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "74c99ba38b02288daf05229cdf34e60261d2d01e"; - sha256 = "0l0ffczgpsvp6znlnnc89nxcmw6yzmxn4dbsr0px3pqz1mffgyp1"; + rev = "84d6af4cf903571319e0ebddd7beb12bc93fb752"; + sha256 = "1809p5fi1si0l4qfw99d3rkcd1jsfyrvrqwf7xxvwxwjca3zqdxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -64067,12 +64548,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161103.1005"; + version = "20161123.255"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "74c8be8c72cb7fdbdcbfda430d4d283bc32e16dc"; - sha256 = "1p6nc2rjggvf3jfsffk9danm4ah9lxhj2z61p267pb2mjs0ywkvf"; + rev = "9e5baa6ced305f440f67bcc803e24f0a03ec2b0a"; + sha256 = "1xbj704y91300g6nbr01abf9xsfrpc3qykpz5jm35ra54hnvj11c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -64604,22 +65085,22 @@ license = lib.licenses.free; }; }) {}; - toml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + toml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toml-mode"; - version = "20160910.1810"; + version = "20161107.1000"; src = fetchFromGitHub { owner = "dryman"; repo = "toml-mode.el"; - rev = "0bbf0618fde844cd2e12765c8ca566df09066445"; - sha256 = "129yws71h5wy2y4z2ayl9kys22xa4hhxkybb7hhp2b3y8wq0717z"; + rev = "f6c61817b00f9c4a3cab1bae9c309e0fc45cdd06"; + sha256 = "05b4ksay85c8y5ncax0qsvnmplwsfiw24z16a58gkarjz938hb57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode"; sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l"; name = "toml-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/toml-mode"; license = lib.licenses.free; @@ -64799,8 +65280,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; - sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; + rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd"; + sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -65459,12 +65940,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20160923.9"; + version = "20161123.6"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "588d5f3d63b77f40951630d01fd3ecb0f3672c5b"; - sha256 = "1gq4vza69ffqhjls905agsshk0mj2gfg6cmhia0d75lf6r8h6nzf"; + rev = "d5c4fb27c896e37d6adaa61f55b275ba9efa7b98"; + sha256 = "09kg5axl0aazfglzp0zm5wj3rrqkvdhiwlafliw2icrspygnk7ra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -65602,10 +66083,10 @@ }) {}; ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ucs-cmds"; - version = "20151231.1616"; + version = "20161118.1423"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el"; - sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya"; + sha256 = "08yfz2mhhfqmx2icwpwizcaqkzngddhgp4ya3ga77fziyb6xjrdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds"; @@ -65744,12 +66225,12 @@ undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: melpaBuild { pname = "undercover"; - version = "20161016.2358"; + version = "20161114.819"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "6026118ea2030fa69688dfff294843a865ddf3a3"; - sha256 = "0slml92b2i3cphjmqm738rbwk0brsxg22a8wpz6cdgm62hhxr1zd"; + rev = "465e339749f924606df71e250ae10d1f910f71a9"; + sha256 = "0p75m1v9hvdlmlpg9zk09q9zyxf1ld6njfqir6hx83lidgvs5wsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; @@ -66259,8 +66740,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "a7e716dd7e9778268337f2f9142f7d658f985511"; - sha256 = "0x2ag7amkqq8bgiz5ma31fpcwfpzx0qqs7cr6ia8rxzwiwnyb06k"; + rev = "f2015062fa5f8ff5a39d3f2db9475862f433b2d0"; + sha256 = "1l00rhh9l4b9ww5sx1vm87qnydcr59ka4w2n2faifglnsv3awzn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -66549,12 +67030,12 @@ vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-osc"; - version = "20120910.211"; + version = "20161119.1155"; src = fetchFromGitHub { owner = "aspiers"; repo = "vc-osc"; - rev = "fb01a35107be50ebb126c3573e0374e5e7d78331"; - sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4"; + rev = "8c09a0d5f69237285101554261b77d76b546a24b"; + sha256 = "153zwhljkjl0dajd1l6p5icva0bnpa2rj8byjblb3xv8rq7p1fzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a1fa5fdfdfa9ec5607524be62eb44fe82e91b0/recipes/vc-osc"; @@ -67032,12 +67513,12 @@ visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-fill-column"; - version = "20160804.1452"; + version = "20161109.337"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "d3f64e72062cdb74e698bbda8c44d47eb3133099"; - sha256 = "0g6x97d8l11zgcfqdbm5p2bxb9x4c9c7hlypbr6vl6zy1dqixaiw"; + rev = "159dcee48e7311ee816686d62e7ce36619127462"; + sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -67402,12 +67883,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161029.2147"; + version = "20161114.1527"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "8cd89d439515331a96facdcf3eb3eb424819c2e8"; - sha256 = "107p0yrfp4lpm1clzls78f8ylmr6fpjjz467pf0vyygnd5xhxf4r"; + rev = "68f000149a82a4c4ef46989e261c7541ce8bf778"; + sha256 = "0k5dcaswpr0pdps3hls14hn91r2nw6024npdn599gj67naajccfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -67591,12 +68072,12 @@ web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-beautify"; - version = "20160410.1005"; + version = "20161115.1447"; src = fetchFromGitHub { owner = "yasuyk"; repo = "web-beautify"; - rev = "9c6a09969c04cb07f5f56ac6f6c3abba5f06c871"; - sha256 = "0vzd0bmm53a0bhdbyvrqgswy453pnsfcnr71piwwhw4dp2zx32hd"; + rev = "e1b45321d8c11b404b12c8e55afe55eaa7c84ee9"; + sha256 = "03b5pj58m00lkazyvvasa4qndrkh2kjzv2y7qhxljfg5mngyg3zg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify"; @@ -67633,12 +68114,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161106.132"; + version = "20161119.924"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "bae44d506af5d4f548f1b992229e369890f2a8a4"; - sha256 = "1ygsvcsf3pddcwyaw0m19z5j8is982ypxmz96qs2h0krfq9l6vl9"; + rev = "de14f795f0256642eb03fbaf3182896619203c66"; + sha256 = "09qfc1q4954p5fxgcrkgd9rhff3f2cq1sgs6ydznqmsah5nvfcr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -67651,6 +68132,27 @@ license = lib.licenses.free; }; }) {}; + web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: + melpaBuild { + pname = "web-mode-edit-element"; + version = "20161114.954"; + src = fetchFromGitHub { + owner = "jtkDvlp"; + repo = "web-mode-edit-element"; + rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce"; + sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element"; + sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md"; + name = "web-mode-edit-element"; + }; + packageRequires = [ emacs web-mode ]; + meta = { + homepage = "https://melpa.org/#/web-mode-edit-element"; + license = lib.licenses.free; + }; + }) {}; web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-server"; @@ -67700,8 +68202,8 @@ src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "c57cd53b6036e8f9d128ffb1d80cdd898d52c2e8"; - sha256 = "1sjczh4z4fd6mlpqvd8qbkyc1pphkx1s7d953msqqfy1lvwd2v6j"; + rev = "6e34759f77b94318f079e178f7551fb16317b661"; + sha256 = "1lw4jf4jnch5c57vv5dyiwgkmqmxisbm1wx269p6nkkvb9y49qm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -67717,12 +68219,12 @@ websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20161022.2054"; + version = "20161113.1736"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "f7d3fb5409aed9f5cdb745f0e61a0c43c097588c"; - sha256 = "1dl6yirbrqhsci3wvigvcghx645slh7bb2q3hb66rcdp5j5m41zf"; + rev = "fbd9e2263d2d7168aae31d4f8bde38f511e9d2ec"; + sha256 = "04kg6njw5frp9xafjyqff57m0a2r15r7c57mnb6dw6lgazxlscgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -67948,12 +68450,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161106.950"; + version = "20161121.2003"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; - sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; + rev = "b5a9d7d1ce028ce904cb8479a10440ad6c839221"; + sha256 = "184if1gyxnvrqjd3i59kjg5sndaa0fq50l267qgbxv807w9akha3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -68050,6 +68552,27 @@ license = lib.licenses.free; }; }) {}; + whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "whizzml-mode"; + version = "20161115.1720"; + src = fetchFromGitHub { + owner = "whizzml"; + repo = "whizzml-mode"; + rev = "b5804004fb35c603468054cf179f4dd6936c8882"; + sha256 = "0x0cxwifqb8pv6j55iwxy7hdk0cvjz0zygayi494y4nhabcyp3kf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; + sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk"; + name = "whizzml-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/whizzml-mode"; + license = lib.licenses.free; + }; + }) {}; whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whole-line-or-region"; @@ -68485,8 +69008,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "9f38303df3b7"; - sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds"; + rev = "d9ebfc6c8722"; + sha256 = "038glxpcl6d9js0kaxaqmfz6xlz50z28nny9biarx1mhjvy70lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -68523,12 +69046,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20161009.917"; + version = "20161109.403"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "b2d9d6b38cbb3993d4c100b098fc7efc9274b9b4"; - sha256 = "1l42a5d7hdpa1nyvhqzas9smbgkrscylj58av7gsky6kndps89dk"; + rev = "7b6ac3acf02fcfe118685011d46bb8f6b5cc493c"; + sha256 = "0vvr6agl2db16wppgg8rcd3q9sq5c8xcc518hmxq9drdhgn1az1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -68712,12 +69235,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20161107.535"; + version = "20161122.954"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "997b7e02ab4684166162eb1bdf4b711e18017952"; - sha256 = "0nhh10rhn17a4iscl2y3c1v7axvc154s7j1cfpidjk9xc52vwz9d"; + rev = "7f4b1367ba8d86f7c2d8a47f7dd9ac87c4104620"; + sha256 = "0n0gdvhzaqkacj44ia5mnx9xcq213apmwxbkm0xhlmmirz6l336h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -69048,12 +69571,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161105.1325"; + version = "20161116.1343"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "79e004ee10d7f1d67200140f18e8a720be177273"; - sha256 = "17f5n23sp31manf58mvvyrixygza6plc0sl6n5k7lqfnlcas27d8"; + rev = "4b58d598a48f7d8203c1673ceaa05e2fa4f83b68"; + sha256 = "0b0i2vxmzr79f6va19nn6ls1gl2hv4nk8w8w6hmghcsbdi4npmg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -69069,12 +69592,12 @@ xah-find = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20160721.2030"; + version = "20161116.1515"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "fce0404fb46d9ead40f4ba02e684a48310bfb8ea"; - sha256 = "1d4116c1xviljr7qznab865fy8y0rq3pgwwybxq9wybbj14r74ms"; + rev = "44a8ccf067e86bf9db7c7e73016b23ddcb212254"; + sha256 = "02zx485l9ilfblz2ma5wqb97prbnvph9a7ija66sac2aklw19i8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -69090,12 +69613,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20161102.1328"; + version = "20161122.358"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "40b0818411a77d496418f30a55f5ad4616350f35"; - sha256 = "1p0kc5viia17l4mls9ql2486cpnj2l2rp6nxlxij8ilw901q18d7"; + rev = "cff6ab06055d59d858f85946ada505eec854b1aa"; + sha256 = "01d4lag4jcfvaafkk18ijcq91nbc1r7gdpn95gficjy0l6kf9dbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -69451,8 +69974,8 @@ src = fetchFromGitHub { owner = "NicolasPetton"; repo = "xref-js2"; - rev = "7e2bc6a8dad08a493d11d3554f6374584846b9e6"; - sha256 = "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd"; + rev = "031def02271fdbe2e0ab30515c7291a239fea4e6"; + sha256 = "1i3gsv7npf6lg7hakky6yxn96aqjdlridj74l0vhj55j2w7ia6f8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2"; @@ -69489,12 +70012,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161104.1949"; + version = "20161110.1630"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "77e058710b20cb222647151e70416ef597929518"; - sha256 = "179nkk5hi6ylckjgxi536r78fvzv39kdnlbcdi0sscfn44q1ng6k"; + rev = "34318edd4a552f194affb9858fce241747d0c79c"; + sha256 = "0kv843wl0j1zwpcxmzbbpci6yrjvyhamwxbv7568yv5hzscm0sh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -69927,12 +70450,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161026.1601"; + version = "20161110.1226"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "e6b865127783f498b61fa99ad0f5413200ac09d0"; - sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9"; + rev = "8412d71e44576c6e9f182109219a8a71cf9d4311"; + sha256 = "0x4lbg6psffpw0s4nji6iyp3iqdip5l6m2hkcg4y5va048hr4hbf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -69945,22 +70468,22 @@ license = lib.licenses.free; }; }) {}; - yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "20160719.1228"; + version = "20161108.1305"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "da42cb16c4534eb31c5946bf7f5a5710ef57256d"; - sha256 = "09ag32gbmidp12w3pay5iid6b75zwdm317hsz2kdvslik18j7r66"; + rev = "b58d17e176f77ded83860d33f4f43fcb5f7d2c9c"; + sha256 = "13as073yw6wphcs7w62zicqgva0lh4xx4f1c9sph8ip1wydkr9pg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q"; name = "yatemplate"; }; - packageRequires = [ yasnippet ]; + packageRequires = [ emacs yasnippet ]; meta = { homepage = "https://melpa.org/#/yatemplate"; license = lib.licenses.free; @@ -70008,15 +70531,15 @@ license = lib.licenses.free; }; }) {}; - ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: + ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161106.705"; + version = "20161121.5"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; - sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; + rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; + sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -70029,6 +70552,7 @@ deferred emacs let-alist + pkg-info request request-deferred s @@ -70062,12 +70586,12 @@ yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoshi-theme"; - version = "20161006.1632"; + version = "20161115.1258"; src = fetchFromGitHub { owner = "ryuslash"; repo = "yoshi-theme"; - rev = "09ce91530896f6443b5b45409bd67b5a449651c9"; - sha256 = "19kfjaqd1p1v777zgr76zpyc33i8rn7v7f5wq59cnnnswi01m8m9"; + rev = "278dba2c6846c6898ced9948505775ef71812586"; + sha256 = "03fibd99wihg811c72cn6q8w89pdivjn3305lyhzlbs69ylafz0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; @@ -70125,12 +70649,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20161027.2344"; + version = "20161114.1811"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "2ca9f1070197bd6af7807bca6a1f2099c7b3ed1c"; - sha256 = "1l7kzmhkjnfy32l0kw3xnqs3dipmsad2ckcx7plvfwfh75yrddq9"; + rev = "bc71e4ecb154e140fa688add55d26d01b5a52dea"; + sha256 = "15ymggp3j7bxwp5q4ng8g2hnym8psgjyvx5baxh4d0yc54jiq1gx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -70249,12 +70773,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: melpaBuild { pname = "zerodark-theme"; - version = "20161106.1246"; + version = "20161108.858"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "62773d94e975cafeca26b93679aaa04adfc36882"; - sha256 = "0ayxrz3n1ca4kgby09crrwdxii4py5v5icnclys6wmnigvmb4jsw"; + rev = "32873003d1c120f7f4fe1438df9a4c1c08785996"; + sha256 = "0g6yknx9gdpk8ccqcjzq4rglrrlpi8npm7klfrv3xiz48sb6igaj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -70493,22 +71017,22 @@ license = lib.licenses.free; }; }) {}; - zoom-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; - version = "20160918.2110"; + version = "20161123.405"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-zoom-window"; - rev = "1c39773c69b9833382c26101c6ff60bfa218cc09"; - sha256 = "08yw2ibn5zc40f8l3bnpp87w3nf5zzlzhi0f61a6px4ix2mqlsv4"; + rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6"; + sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3"; name = "zoom-window"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/zoom-window"; license = lib.licenses.free; From 9c826dd24cdf4ff993ad95246d8a3fa626f2ae41 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 13 Nov 2016 16:19:41 -0500 Subject: [PATCH 033/149] melpa-stable-packages: 2016-11-23 Removals: - gnome-calendar: release tag has been removed from github --- .../emacs-modes/melpa-stable-generated.nix | 705 +++++++++++------- 1 file changed, 452 insertions(+), 253 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index c7d7c5b5ed19..4df78d2202b2 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1052,12 +1052,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "2.5"; + version = "2.7"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "c610c1a85728d161d28854d7373fc13b3dec311b"; - sha256 = "1ghs3gh410c9w2v17zb93wk184lwl5izpkzrm0qn37qz8i87jqcr"; + rev = "a50cbdd53bc0e1ed0f96a425bd29f5b706161c18"; + sha256 = "12wxjgvxhnmn27dl2p5m90nxmfkk64w1fn4zmxn2a4fpvb7y579s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1292,12 +1292,12 @@ ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-vault"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb"; - sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21"; + rev = "f4d9b3a77490071b8c59caa473bb54df86e90362"; + sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; @@ -1627,12 +1627,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "1.0.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; - sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; + rev = "38ce9127285e1ff45f0f39b9da36a682103bdb96"; + sha256 = "01zwpdmq13iy3hsgijnqsg0yahjxngfbrnn1dd2x1bzpmr8hpxnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -2557,12 +2557,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "ee403848c65c6141888344144958bc979596f5d4"; - sha256 = "0414kdwgvmz0bmbaaz7zxf83rdjzmzcvvk5b332c679hk0b9kxg7"; + rev = "cf7817de3f37ce2404ee637a655f1a511b829585"; + sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -3807,12 +3807,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "5.5.2"; + version = "5.6.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "464c9de6734cb4b426137674041d695c2a7c7ef9"; - sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm"; + rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d"; + sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -3828,12 +3828,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "5.5.2"; + version = "5.6.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "464c9de6734cb4b426137674041d695c2a7c7ef9"; - sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm"; + rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d"; + sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -3933,12 +3933,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.0pre3"; + version = "3.7.0"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "adf5f253ec029aec4ee7aadb95c6f908030fb98b"; - sha256 = "1dbpxhs3ss91b9q4cvx8fl60zf7w8jad4cbm5cqpzhi6jfac5gxn"; + rev = "5cfc2e926af645840c6a0464451af18f08528879"; + sha256 = "13kxazjv6vsxsiyyr7qk0gnw4q55z0pa5icz0b4swvm96c4kywg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4080,12 +4080,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "55db9979397bd66446eb1927e08c5a22df9f0eea"; - sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf"; + rev = "81d8990085960824f700520d08027e6aca58feaa"; + sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -4185,12 +4185,12 @@ company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "212c8fc3101781a2f1c55ca61772eb75a2046e87"; - sha256 = "04ffjwhk9y6slmxgmir08ilppy3q86qzhqg7v9kp0fzkwaap5fyf"; + rev = "c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e"; + sha256 = "1jc9mnqj38lnn3yxkcixlwgqkxb7lsyzqybakk74mh3l3gr9cv8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -4227,12 +4227,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "9f22c09009734bd281fcbb89d8903a04b8a72b74"; - sha256 = "0z6ix3sihzzkk4jgi1qg5ma9wczzdl55kc0y93jnfn69yk3l0ikn"; + rev = "2e3264670c861ecbe862f7618241367ab497b5ff"; + sha256 = "0a0pb3amsxj6m8ka12ny1w9qjy3dg7vsxdsy1wg3qzanj2pdsk4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -4353,12 +4353,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "3dad255d6928e28e7a700d8cbac060f87d43d25e"; - sha256 = "1g4dxps5s93ivs0ca6blia8spchdykny12c1gygm6jh9m6k7kfvh"; + rev = "b971ab0a66126f0d1410254ba1e21f17c2270101"; + sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -4671,22 +4671,22 @@ license = lib.licenses.free; }; }) {}; - company-ycmd = callPackage ({ company, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }: + company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c"; - sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia"; + rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; + sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk"; name = "company-ycmd"; }; - packageRequires = [ company deferred s ycmd ]; + packageRequires = [ company dash deferred f let-alist s ycmd ]; meta = { homepage = "https://melpa.org/#/company-ycmd"; license = lib.licenses.free; @@ -4923,6 +4923,27 @@ license = lib.licenses.free; }; }) {}; + counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "counsel-bbdb"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "counsel-bbdb"; + rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555"; + sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; + sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; + name = "counsel-bbdb"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-bbdb"; + license = lib.licenses.free; + }; + }) {}; counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }: melpaBuild { pname = "counsel-dash"; @@ -5323,12 +5344,12 @@ d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "71ab5eb661851dd4bfa8a589b1001991ee6c3f31"; - sha256 = "0kbncsaxj93jd79sd6dkap29fz8z100wi1nk0njd568glm8q4k5g"; + rev = "98af62e67026fee1dda9155e1a463917fc83802e"; + sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; @@ -5446,6 +5467,27 @@ license = lib.licenses.free; }; }) {}; + dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: + melpaBuild { + pname = "dashboard"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "rakanalh"; + repo = "emacs-dashboard"; + rev = "7db073f60a2505bf49e9b94cfedd235f1e01e471"; + sha256 = "1cryijlb79r4dlkmb0nwaamfi18cw0bfr2c1js7vvp5lqs8sb87w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; + sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p"; + name = "dashboard"; + }; + packageRequires = [ emacs page-break-lines ]; + meta = { + homepage = "https://melpa.org/#/dashboard"; + license = lib.licenses.free; + }; + }) {}; date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "date-at-point"; @@ -5990,22 +6032,22 @@ license = lib.licenses.free; }; }) {}; - dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "57f263b42ea83c6a1cf391fcccffd0f36d213f35"; - sha256 = "1w2grc91m71k9mr4n423vbnakkqg6vc10bham869xs3yr8fs7nay"; + rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15"; + sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8"; name = "dired-k"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/dired-k"; license = lib.licenses.free; @@ -6462,12 +6504,12 @@ drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "drag-stuff"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rejeep"; repo = "drag-stuff.el"; - rev = "07332b9f4725ad11d123e0fc5593c0c1c37db381"; - sha256 = "131ww26pb97q2gyjhfrsf7nw2pi5b1kba0cgl97qc017sfhg92v6"; + rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db"; + sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff"; @@ -6588,11 +6630,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "0.3"; + version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "18cd7ba257ca"; - sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; + rev = "befb5c650dfd"; + sha256 = "154bm7l1ra3l9lj9l1x21qi7f57k46kg24hyalrbawjw3q8c5np2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7175,12 +7217,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; - sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; + rev = "4cf38946096c185ac794d594a791da23675297aa"; + sha256 = "0k6qh99jbzirgsa3qkhcxsivncbvk5wr4yag2s9c2y9akipxivrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -7593,12 +7635,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "0.19.9"; + version = "0.20.2"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "a842d54348846746ef249a87ac7961a9a787947f"; - sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni"; + rev = "529c20acb9efda756b69e267d73d33c66fa08293"; + sha256 = "08zl1v0k3dnn8g06l3xf1lp31fp60jpk6f3lkczi1l6ns36g11jx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -8016,22 +8058,22 @@ license = lib.licenses.free; }; }) {}; - emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emamux"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-emamux"; - rev = "53177ca59ed2824cc0837677af5a13a580691a71"; - sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67"; + rev = "573dd1cf18584a1fd240efb16c7726b6fd790b73"; + sha256 = "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux"; sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz"; name = "emamux"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/emamux"; license = lib.licenses.free; @@ -8643,12 +8685,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.1.5"; + version = "19.1.6"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "926391fbb8761d5833b3a6f5c9e523fcda373c6d"; - sha256 = "1bbwnpam05rcsivmrh13mkcyb04a08d1fyb4y5w0y0gdpbzn7jq9"; + rev = "2b41d8f318b7e5ec139d42fd2f01a132699be839"; + sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9208,12 +9250,12 @@ evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-basics"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "4be54df939035daa039e323a95c052f7c99b6f51"; - sha256 = "1n7nw5mzpwzp8r791qsis2f2ak5f0m2d129r0wmbyx9zykx5rm7v"; + rev = "f976bda20098c43be1418c36520a57467c8c6c13"; + sha256 = "18f1k4z7lkh237sz4p1xz4sxzs41ywmvd6dj7k9b6d9dscv3yxws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; @@ -9376,12 +9418,12 @@ evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "51d46747e39dc247ea4b72839421b85f53d487be"; - sha256 = "15fr19gv2rf8pvns7r0jmy1z2f08bjprqxz3hj1fzn9wgc42iwg7"; + rev = "4846518b5999892ceaf3ef143cc734685bca325f"; + sha256 = "0009443f7a1k2746qr7p06jv4ksq0w3sf22pjbm0jrnhaw0p66cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -9397,12 +9439,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "ccda120de2fea505147a85232c9500285edd98e8"; - sha256 = "199wcxjqyr9grvw0kahzhkh8kcg53baxhahizrknwav8mpmrvj9z"; + rev = "be2259b8cedd62011b25ddbcc1774bbbe9a66c61"; + sha256 = "0p435ykkq41nksd40qczlhz6kvs2zpkxch661wy0w93wffwnq3b9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -9880,12 +9922,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc"; - sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2"; + rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9"; + sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -10787,22 +10829,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: + flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; - version = "0.1"; + version = "0.3"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-pos-tip"; - rev = "0c2b31b615fa294f329f3cc387b464525ce3392d"; - sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8"; + rev = "3f1d5297fdff44a14ee624160eefdc678e2bd0bd"; + sha256 = "0qxx3xdgk5l793yg5ffbi5qhrxrf6akwdz93n2vibpkdjkvzyh2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip"; sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9"; name = "flycheck-pos-tip"; }; - packageRequires = [ dash flycheck pos-tip ]; + packageRequires = [ emacs flycheck pos-tip ]; meta = { homepage = "https://melpa.org/#/flycheck-pos-tip"; license = lib.licenses.free; @@ -10892,22 +10934,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, ycmd }: + flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c"; - sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia"; + rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; + sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv"; name = "flycheck-ycmd"; }; - packageRequires = [ dash emacs flycheck ycmd ]; + packageRequires = [ dash emacs flycheck let-alist ycmd ]; meta = { homepage = "https://melpa.org/#/flycheck-ycmd"; license = lib.licenses.free; @@ -11273,12 +11315,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; - sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -11294,12 +11336,12 @@ flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-helm"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; - sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -11315,12 +11357,12 @@ flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-ivy"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; - sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -11336,12 +11378,12 @@ flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-correct-popup"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; - sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -11420,12 +11462,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "0a6e9624ea5607dadd0f2cd4d3eaa2b10b788eb9"; - sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc"; + rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2"; + sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -12788,27 +12830,6 @@ license = lib.licenses.free; }; }) {}; - gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gnome-calendar"; - version = "0.2"; - src = fetchFromGitHub { - owner = "NicolasPetton"; - repo = "gnome-calendar.el"; - rev = "58c3a3c32aff9901c679bdf9091ed934897b84a0"; - sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8e497668d65f0eabd15e39b7492adb395a5a8e75/recipes/gnome-calendar"; - sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6"; - name = "gnome-calendar"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gnome-calendar"; - license = lib.licenses.free; - }; - }) {}; gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gntp"; @@ -12893,22 +12914,22 @@ license = lib.licenses.free; }; }) {}; - go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "go-add-tags"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-add-tags"; - rev = "facff8dbb65fb56874d63a63edfd072eceed7904"; - sha256 = "14bflgc9s9hslwisf4id0pc3asr5qvppwn1w14vvij3plal4mfhi"; + rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac"; + sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; name = "go-add-tags"; }; - packageRequires = [ cl-lib emacs s ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/go-add-tags"; license = lib.licenses.free; @@ -13001,12 +13022,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "d4cd57e5d1769ffe3a8078572f0be73737184099"; - sha256 = "059y2gkvvjhjbaw31zlylr0zmbafcjif01zjq13hvvghjqd6r89b"; + rev = "1827d2efe1f6023cf3954c0056aaa531124c41c1"; + sha256 = "1rcqrsvw74lrzs03bg9zslmkf5ka4a3h06b5hhdgiv4iimapz5sq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -13253,12 +13274,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "cd80b8e8a7075484941720e24faa3c9a98cfa2cc"; - sha256 = "0l6vlh8sszsxjs49xsiwfbzcbc55fmiry96g3h1p358nfrg20017"; + rev = "b9bcc6f44098b110772a4c947f0a233f207955c5"; + sha256 = "1x62skbqgjskrbsxqn1b377z1y0vp2ivf9k2f0g595lg2zfcycjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13400,12 +13421,12 @@ graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: melpaBuild { pname = "graphene"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7"; - sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2"; + rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed"; + sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; @@ -14080,12 +14101,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b8193725f2c3ab20f2907171374ee762e397739d"; - sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd"; + rev = "5ed5d1e2a8561f306333c817e52ae0b4c73680e9"; + sha256 = "1hsn2r8sw40rzc2w8vq4sr2xjm3xh2lg6j4dn068nyzszh932chi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14182,6 +14203,27 @@ license = lib.licenses.free; }; }) {}; + helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-bbdb"; + version = "1.0"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-bbdb"; + rev = "7be6ce17303422e9bc3ff1a7cb54361fcbcafc84"; + sha256 = "1ccj9gqr407mfrvp71571w3l82v96zdr956qsdbxfdda7bm3s0j7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; + sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp"; + name = "helm-bbdb"; + }; + packageRequires = [ bbdb helm ]; + meta = { + homepage = "https://melpa.org/#/helm-bbdb"; + license = lib.licenses.free; + }; + }) {}; helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; @@ -14311,12 +14353,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b8193725f2c3ab20f2907171374ee762e397739d"; - sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd"; + rev = "5ed5d1e2a8561f306333c817e52ae0b4c73680e9"; + sha256 = "1hsn2r8sw40rzc2w8vq4sr2xjm3xh2lg6j4dn068nyzszh932chi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -14689,12 +14731,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "c5e43f4083af3949c5d5afdfbbf26d01881cb0e2"; - sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf"; + rev = "742eeb6c33253b2be581e30b5d70113cd87a581d"; + sha256 = "1dmmz6ghi21kmwprcv174pq5m198cmsphg297ll1bhqczk51j9h5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -14857,12 +14899,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "c3913b6e1d19e957c0b5a2d0243388e224a42a8a"; - sha256 = "02yjnag9wr9dk93z41f0i5mqij9bz57fxkv4nddabyc18k7zfrhj"; + rev = "c8ad1d86dd375f1be433b95e2bc40876f663663f"; + sha256 = "1ia960sqkbc5bqljjb0arw54q90x36lhp0230s75xcg6m47bxpw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -15862,6 +15904,27 @@ license = lib.licenses.free; }; }) {}; + hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hungry-delete"; + version = "1.1.4"; + src = fetchFromGitHub { + owner = "nflath"; + repo = "hungry-delete"; + rev = "8df35d81fbbd236147b8c746bd5f542bd75dbe63"; + sha256 = "0j97bfhrajki2a78pchrw5n6pcsk2gc2spk9s8fb0bmnqqpknmnf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; + sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz"; + name = "hungry-delete"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/hungry-delete"; + license = lib.licenses.free; + }; + }) {}; hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hyai"; @@ -16558,12 +16621,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "0.1.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "5726c33b8d8c43974d4b367348962025c6df56b9"; - sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0"; + rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25"; + sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; @@ -17206,12 +17269,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.24"; + version = "0.25"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "c669a9b28dc09806c30864659f6ac924045a083d"; - sha256 = "0fykdci5vi84xrnghaqfs79zsi8x6kv77wx5xw6yphjksdqrp2f3"; + rev = "1ec4939d81e410c081b709505d812775bb8338e8"; + sha256 = "12yqbkfr5yds9kysjs159h6xvlx0ppf7c95fwhd4nx63ycyidg2x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -18382,12 +18445,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "e035006a486278c5ad8b8b04d14d5ef3dede64f7"; - sha256 = "16wpjry4yg3ap87kzzy387j1hxm0y7mcnh2v4a25snxcsz2cz7qv"; + rev = "9a8bea502793f5467df77cfea14ea2de07bc26bc"; + sha256 = "0izym69gnz32c4y49s0amavxzjgm1pqlks7xchr5zdz7wqs7wb25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -18809,12 +18872,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "9b2f610a32557937e704b32e97f4b61abdec6845"; - sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj"; + rev = "4f1db3f2081e819dd35545497529a03466bd0397"; + sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -19005,12 +19068,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "b5d4389aa63ab4a03776120d2bd89229aa7d5238"; - sha256 = "19w8143c4spa856xyzx8fylndbj4s9nwn27f6v1ckqxvm5l0pph0"; + rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432"; + sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -19803,12 +19866,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "6480e585a0e9d036d11aaf28bcee97e8e9b77c2e"; - sha256 = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8"; + rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019"; + sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -20306,12 +20369,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "2.2.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "53f0ba96f0417885e7d3955d8750de6763f99444"; - sha256 = "1azyrvhvyrd5n7djyh324famzab9w5c81bm3nv04p93gd92mm6zh"; + rev = "586062ec38807b709b888adf3bd80ffb5388f86c"; + sha256 = "13qx220ayf678milahq4xrhlhiljfmbscxikq0dlfdv39157ynlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -20432,12 +20495,12 @@ mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "c941d44c994e29f0c5f6c4532950eaceec0a6376"; - sha256 = "1wrdcxdlcvrhvarz71a09168bp1rd154ihs5v55dgh1sm7pv34la"; + rev = "9645c431e921317721ba8dea9ce713d235f94726"; + sha256 = "14kpj1fh3p8asnxwb0jl3b6r32b7zplxyl5hvbgkal687b1gx50w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -21062,12 +21125,12 @@ ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ninja-mode"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "b49b0fc01bb052b6ac856b1e72be9391e962398e"; - sha256 = "14jh2cg1isip8b8lls3hdj99vpqjyjqlv27r2kpq6095b78p64d9"; + rev = "717b7b4a31db6027207588c0fb89c3ead384747b"; + sha256 = "1pc4sr50wknwai33lqm92bm811yzvpyrvry9419p7wp3r6p3nmhw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -21227,11 +21290,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.23.1"; + version = "0.23.2"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "ad517e9195a29b26955999c6e11fc37c73dbc01e"; - sha256 = "0g1xybi4ndhvmnxgzxbp3x8kwg69jp3idf8x1asljcfsm6qhvr5i"; + rev = "c9ec90ae7f22d817aa0ddb5e1a0ae80715071b5e"; + sha256 = "1bhyi64qir93sd8d1c2gawc2p7d9mqfq7cn7p5hvh8bv2w3hkq14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -21946,6 +22009,27 @@ license = lib.licenses.free; }; }) {}; + org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-babel-eval-in-repl"; + version = "1.0"; + src = fetchFromGitHub { + owner = "diadochos"; + repo = "org-babel-eval-in-repl"; + rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122"; + sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl"; + sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6"; + name = "org-babel-eval-in-repl"; + }; + packageRequires = [ emacs eval-in-repl ]; + meta = { + homepage = "https://melpa.org/#/org-babel-eval-in-repl"; + license = lib.licenses.free; + }; + }) {}; org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-beautify-theme"; @@ -22075,12 +22159,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; - sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; + rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab"; + sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -22156,6 +22240,27 @@ license = lib.licenses.free; }; }) {}; + org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "org-jira"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "org-jira"; + rev = "3fc4dd52a5235fa97b0fca06b08ae443ccc43242"; + sha256 = "017k8hw2wy4fzdrkjniaqyz4mfsm60qqxrxhd1s49dfs54kch0hq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; + sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; + name = "org-jira"; + }; + packageRequires = [ cl-lib request ]; + meta = { + homepage = "https://melpa.org/#/org-jira"; + license = lib.licenses.free; + }; + }) {}; org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; @@ -22525,12 +22630,12 @@ org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "storax"; repo = "org-tfl"; - rev = "308251618e215eb78d5436e7412a0c14216fa890"; - sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94"; + rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3"; + sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; @@ -22889,12 +22994,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "0.2.2"; + version = "0.3"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "d80d2f1f2637601330837959d9d2f7e0be95df85"; - sha256 = "1s2nahkqmij148z3ijz1l6a43m5pvq9gjza9z6x24936qny05r2w"; + rev = "8bbe1c700830e004f34974900b840ec2be7c589c"; + sha256 = "0pv9j3nza71kd2i9a78w1y10r965b2wrnywjk1zgvab8q9rzwxdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -23243,22 +23348,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ async, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-utils"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "f655efc89ea7675b6cc9990d46a9f48ca6d384b7"; - sha256 = "1q6hpfaj8hfybxmmh1v871arlv8dn77li9vgckcal4l6xf83nvpi"; + rev = "e37d38b3c94ac39443f0e449f4112b654b6a8fd1"; + sha256 = "1spdffw1pi4sp70w46v1njmzgjldcn9cir74imr23fw4n00hb4fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = [ async epl ]; + packageRequires = [ async ]; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -23414,12 +23519,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "2.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "e9053ef6a7c9a433f2e5e612ba507459ded2840b"; - sha256 = "00jm904qnj9d6286gfixbcd5awwza5pv9vkisfpz6j7705bjvmap"; + rev = "17a6690d42a1e854ec270ed930c7494077570fc8"; + sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -23580,12 +23685,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "d89a0f82b9c606d59d6f3440825c1c0bb14b1455"; - sha256 = "15mk90dbwq5qbb7yv1gliq156lhc3ha576nkly4n7jl44v2f3c23"; + rev = "b4c3bd9130044c4e106bac5ba73a50822865e258"; + sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -23914,12 +24019,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "6fd464a3f5038b34751ec3d07913575906f38ab1"; - sha256 = "0v6abr2x4xnv6qi8az3ki330z7v5vc4b0ibxqzwlq9mzqlqhnpsl"; + rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a"; + sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -24292,12 +24397,12 @@ plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "2b7d79688608a5f328b95610edcdd871278fbd29"; - sha256 = "1pmnz01k3n4jjkl1p31lcfh8j6g3zpr78p8f2wazdlgcl14g7pjz"; + rev = "87417ad75b215ababf153cba533575ac0273a5db"; + sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode"; @@ -24874,15 +24979,36 @@ license = lib.licenses.free; }; }) {}; + projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "projectile-git-autofetch"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "projectile-git-autofetch"; + rev = "9692ed2a3935ee7b56e59af8b986e532839597dd"; + sha256 = "0vg0d8alxzzzkk8s564wzbb71laj48gkpbpk3qnwj5hfk14jzaqv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; + sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n"; + name = "projectile-git-autofetch"; + }; + packageRequires = [ alert projectile ]; + meta = { + homepage = "https://melpa.org/#/projectile-git-autofetch"; + license = lib.licenses.free; + }; + }) {}; projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "c3a54723005d015d5d4364e4c74617dfd10ee294"; - sha256 = "1gywkxm9qk7y5za6fzjizxlc1lvwwa4mhadcyf1pxpq2119yhqy0"; + rev = "960e9f9a978386529eab9a56663c8d79654c4cce"; + sha256 = "1xmlkvrkcrwn6jnl9mxgdyclrwxsr1b7rlikmpw1qhdrwpg86vh5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -24895,6 +25021,27 @@ license = lib.licenses.free; }; }) {}; + projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "projectile-ripgrep"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "ripgrep.el"; + rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752"; + sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; + sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg"; + name = "projectile-ripgrep"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/projectile-ripgrep"; + license = lib.licenses.free; + }; + }) {}; projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }: melpaBuild { pname = "projectile-sift"; @@ -25591,12 +25738,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "c2b6f408606c3f89ddbd19325bdbfc9a9d3d2168"; - sha256 = "1lkm0shfa7d47qmpjg1q4awazvf6ci68d98zy04r018s31isavxr"; + rev = "cce0e4ae6527e84e2ae3deb8b3c7770dda225853"; + sha256 = "1li86qpbjg8sm9q4sl8cffc0fni6mwx8180x8zlmsxdnhqic5nvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -25675,12 +25822,12 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; - rev = "a9e65cb23d3dc700f5b41ff365153ef6a259d4f0"; - sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq"; + rev = "e680f1a8f2591af7c80cad188340601b101b5ddc"; + sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; @@ -26008,15 +26155,36 @@ license = lib.licenses.free; }; }) {}; + region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "region-convert"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "right-click-context"; + rev = "31d370fce60d8cda04e1b9e4fe0e5d268fd37fe5"; + sha256 = "0bbfgz2n00dgqbij6c4kmlp3rnmf7jcjq56cmjck4nd81lkwk6j7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; + sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm"; + name = "region-convert"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/region-convert"; + license = lib.licenses.free; + }; + }) {}; relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "relative-line-numbers"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "Fanael"; repo = "relative-line-numbers"; - rev = "64157db08b0c2f5fada3209fc8d3e4b4c7429978"; - sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a"; + rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63"; + sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers"; @@ -26389,12 +26557,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "77e8aa61b5b893c037d87117943a164514c6145f"; - sha256 = "1xs8h2g02jdb05c07bk9qfvxvfchgzhccj5yhkxbnpxqmxpcskdc"; + rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752"; + sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -26536,12 +26704,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; - sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; + rev = "95ffd54ca9554f5df5ac4f65c49eb595c5aeb3c9"; + sha256 = "02ygv4bag4z1msaqzc6fqgmbz6lg7laihnq6zp76n35inqa9a4w8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -26897,8 +27065,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "387e93c70a3703e55f717d3285912ad12cfee947"; - sha256 = "0xwwarla3m9cr1mpnlhsknfvxw1xyf85cxjkzg42q12k7i0yad5w"; + rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea"; + sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -28151,12 +28319,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "0.5.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "3f02d1af5548d15a410ee745b9e7ebc09266a1ab"; - sha256 = "12s3ykb2flnbl6kvjn0yy11y0g5nq2k5arpgf7pqwj4wgx0fl8nb"; + rev = "327c168febbde24c2b39cc10d26c9cfc9189e130"; + sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -29554,12 +29722,12 @@ ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ten-hundred-mode"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "aaron-em"; repo = "ten-hundred-mode.el"; - rev = "fc1d7cdb72c21dc1953ed2e2ecf28233b8b3e305"; - sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx"; + rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933"; + sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode"; @@ -29575,12 +29743,12 @@ term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }: melpaBuild { pname = "term-alert"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "CallumCameron"; repo = "term-alert"; - rev = "3e8b39ed4d960933ffdf0308f9bf0d5ce63648e9"; - sha256 = "195jghl1c8ncl15nix275r4x61zlii90pnwgx4m9q2bnbwsz3ycm"; + rev = "47af9e6fe483ef0d393098c145f499362a33292a"; + sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert"; @@ -31008,12 +31176,12 @@ visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-fill-column"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "73da507c8f4af7a755f9b209bbb3b0343ca2517c"; - sha256 = "0hks82hdx7rfx3lwsz0zq5k9j6vpwbpgj9d6i7xhd6cwb9q95ycv"; + rev = "159dcee48e7311ee816686d62e7ce36619127462"; + sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -31260,12 +31428,12 @@ web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-beautify"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "yasuyk"; repo = "web-beautify"; - rev = "0fac5fa09cee9d45237d6d74e2760fb24c929f8a"; - sha256 = "0zpvs9yc2gxfmm0x0majhzxc0b0vmm6p6pxh92h8iq3pmr0di8yj"; + rev = "aa95055224c24f38736716809fec487cd817c38d"; + sha256 = "0vms7zz3ym53wf1zdrkbf2ky2xjr1v134ngsd0jr8azyi8siw84d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify"; @@ -31320,6 +31488,27 @@ license = lib.licenses.free; }; }) {}; + web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: + melpaBuild { + pname = "web-mode-edit-element"; + version = "2.1"; + src = fetchFromGitHub { + owner = "jtkDvlp"; + repo = "web-mode-edit-element"; + rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce"; + sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element"; + sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md"; + name = "web-mode-edit-element"; + }; + packageRequires = [ emacs web-mode ]; + meta = { + homepage = "https://melpa.org/#/web-mode-edit-element"; + license = lib.licenses.free; + }; + }) {}; webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; @@ -31746,8 +31935,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "9f38303df3b7"; - sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds"; + rev = "d9ebfc6c8722"; + sha256 = "038glxpcl6d9js0kaxaqmfz6xlz50z28nny9biarx1mhjvy70lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -32369,22 +32558,32 @@ license = lib.licenses.free; }; }) {}; - ycmd = callPackage ({ dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c"; - sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia"; + rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; + sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna"; name = "ycmd"; }; - packageRequires = [ dash deferred emacs f popup ]; + packageRequires = [ + cl-lib + dash + deferred + emacs + let-alist + pkg-info + request + request-deferred + s + ]; meta = { homepage = "https://melpa.org/#/ycmd"; license = lib.licenses.free; @@ -32537,22 +32736,22 @@ license = lib.licenses.free; }; }) {}; - zoom-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-zoom-window"; - rev = "f0eb12e389d8d2d13b5911907ef872e18230e00e"; - sha256 = "13393bd5lqpbv7m3p6ihg0ghx1w4w6mrnybx4m8hcfvcn17dr3hw"; + rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6"; + sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3"; name = "zoom-window"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/zoom-window"; license = lib.licenses.free; From 781723b423d69493b685867518d0a55a6275016f Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 20 Nov 2016 13:28:26 -0500 Subject: [PATCH 034/149] org-packages: 2016-11-23 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index bdade742b049..0b2ec7c2fd86 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161102"; + version = "20161118"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161102.tar"; - sha256 = "1mj100pnxskgrfmabj0vdmsijmr7v5ir7c18aypv92nh3fnmiz0f"; + url = "http://orgmode.org/elpa/org-20161118.tar"; + sha256 = "1lk2j93zcaamj2m2720nxsza7j35054kg72w35w9z1bbiqmv2haj"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161102"; + version = "20161118"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161102.tar"; - sha256 = "124rizp50jaqshcmrr7x2132x5sy7q81nfb37482j9wzrc9l7b95"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161118.tar"; + sha256 = "1la8qw18akqc4p7p0qi675xm3r149vwazzjc2gkik97p12ip83z7"; }; packageRequires = []; meta = { From a02be6517a568421fbfe9d40bdceb32270a28c35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Nov 2016 17:03:52 +0100 Subject: [PATCH 035/149] LTS Haskell 7.10 --- .../configuration-hackage2nix.yaml | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1958c7cc4f72..832451138ee8 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 7.9 + # LTS Haskell 7.10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -155,7 +155,7 @@ default-package-overrides: - asn1-encoding ==0.9.4 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 - - async ==2.1.0 + - async ==2.1.1 - async-dejafu ==0.1.3.0 - atndapi ==0.1.1.0 - atom-conduit ==0.3.1.2 @@ -286,7 +286,7 @@ default-package-overrides: - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 - - cgi ==3001.3.0.1 + - cgi ==3001.3.0.2 - ChannelT ==0.0.0.2 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.1 @@ -314,9 +314,9 @@ default-package-overrides: - clash-systemverilog ==0.6.10 - clash-verilog ==0.6.10 - clash-vhdl ==0.6.16 - - classy-prelude ==1.0.0.2 - - classy-prelude-conduit ==1.0.0 - - classy-prelude-yesod ==1.0.0 + - classy-prelude ==1.0.1 + - classy-prelude-conduit ==1.0.1 + - classy-prelude-yesod ==1.0.1 - clay ==0.11 - clckwrks ==0.23.19.2 - clckwrks-cli ==0.2.16 @@ -330,7 +330,7 @@ default-package-overrides: - clumpiness ==0.17.0.0 - ClustalParser ==1.1.4 - clustering ==0.2.1 - - cmark ==0.5.3.1 + - cmark ==0.5.4 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.14 @@ -351,7 +351,7 @@ default-package-overrides: - concurrent-output ==1.7.7 - concurrent-supply ==0.1.8 - conduit ==1.2.8 - - conduit-combinators ==1.0.8.1 + - conduit-combinators ==1.0.8.2 - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 @@ -853,7 +853,7 @@ default-package-overrides: - hjsonpointer ==1.0.0.2 - hjsonschema ==1.1.0.1 - hledger ==1.0.1 - - hledger-interest ==1.5 + - hledger-interest ==1.5.1 - hledger-lib ==1.0.1 - hlibgit2 ==0.18.0.15 - hlibsass ==0.1.5.0 @@ -941,7 +941,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.1.11 - http-date ==0.0.6.1 - - http-link-header ==1.0.2 + - http-link-header ==1.0.3 - http-media ==0.6.4 - http-reverse-proxy ==0.4.3.2 - http-streams ==0.8.4.0 @@ -998,7 +998,7 @@ default-package-overrides: - intero ==0.1.19 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 - - IntervalMap ==0.5.1.1 + - IntervalMap ==0.5.2.0 - intervals ==0.7.2 - invariant ==0.4 - io-choice ==0.0.6 @@ -1118,7 +1118,7 @@ default-package-overrides: - makefile ==0.1.0.5 - managed ==1.0.5 - mandrill ==0.5.2.3 - - markdown ==0.1.15 + - markdown ==0.1.16 - markdown-unlit ==0.4.0 - markup ==3.1.0 - math-functions ==0.2.0.2 @@ -1152,7 +1152,7 @@ default-package-overrides: - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - mmap ==0.5.9 - - mmorph ==1.0.6 + - mmorph ==1.0.9 - mockery ==0.3.4 - modify-fasta ==0.8.2.1 - moesocks ==1.0.0.41 @@ -1266,7 +1266,7 @@ default-package-overrides: - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.0 - - operational ==0.2.3.4 + - operational ==0.2.3.5 - operational-class ==0.3.0.0 - opml-conduit ==0.5.0.1 - optional-args ==1.0.1 @@ -1508,6 +1508,7 @@ default-package-overrides: - sampling ==0.2.0 - sandi ==0.4.0 - sandman ==0.2.0.1 + - say ==0.1.0.0 - sbv ==5.12 - scalpel ==0.3.1 - scanner ==0.2 @@ -1558,7 +1559,7 @@ default-package-overrides: - SHA ==1.6.4.2 - shake ==0.15.10 - shake-language-c ==0.10.0 - - shakespeare ==2.0.11.1 + - shakespeare ==2.0.11.2 - shell-conduit ==4.5.2 - shelly ==1.6.8.1 - shortcut-links ==0.4.2.0 @@ -1615,7 +1616,7 @@ default-package-overrides: - spool ==0.1 - spoon ==0.3.1 - sql-words ==0.1.4.1 - - sqlite-simple ==0.4.9.0 + - sqlite-simple ==0.4.10.0 - srcloc ==0.5.1.0 - stache ==0.1.8 - stack-run-auto ==0.1.1.4 @@ -1710,13 +1711,13 @@ default-package-overrides: - terminal-progress-bar ==0.0.1.4 - terminal-size ==0.3.2.1 - terminfo ==0.4.0.2 - - test-fixture ==0.4.1.0 + - test-fixture ==0.4.2.0 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - test-framework-quickcheck2 ==0.3.0.3 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - - test-simple ==0.1.8 + - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - texmath ==0.8.6.7 - text ==1.2.2.1 @@ -1743,6 +1744,7 @@ default-package-overrides: - th-printf ==0.3.1 - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 + - th-to-exp ==0.0.1.0 - th-utilities ==0.2.0.1 - these ==0.7.2 - threads ==0.5.1.4 @@ -1973,7 +1975,7 @@ default-package-overrides: - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 - - yesod-form ==1.4.8 + - yesod-form ==1.4.9 - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 From 91225b8ba209d284ea16c3d1e019865f3c28b4b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2016 10:36:22 +0100 Subject: [PATCH 036/149] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-4-g1dfbad0 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/58a16d64a7f2dfb25c26a138eb396950b10e4a25. --- .../haskell-modules/hackage-packages.nix | 845 ++++++++---------- 1 file changed, 359 insertions(+), 486 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e585dd64a3d0..65904d0d249c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9697,8 +9697,8 @@ self: { ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: mkDerivation { pname = "IntervalMap"; - version = "0.5.1.1"; - sha256 = "5a3324a4a98f2b15f871db98e2b2fe4a0f65d9de776314b955f30d4c1eda32ab"; + version = "0.5.2.0"; + sha256 = "031a491ae40c333a3227d147aae9ace42f2f4b535fcbbb991c6b4f35a1531684"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; @@ -24408,25 +24408,21 @@ self: { "amby" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, colour - , data-default, data-default-class, either, exceptions, microlens - , mtl, pretty-display, process, safe, scientific, statistics - , vector + , data-default, data-default-class, doctest, either, exceptions + , lens, mtl, mwc-random, pretty-display, process, safe, scientific + , statistics, tasty, tasty-hunit, vector, vector-algorithms }: mkDerivation { pname = "amby"; - version = "0.2.1"; - sha256 = "2430c8d5657af53a4bcc6d7856882375f0ffbcb7c360a2b8fd23cda6e2d33ffa"; - revision = "1"; - editedCabalFile = "0cf317eee0251e20650218b1f54fa76513536336ad033385510b9641837ad7be"; - isLibrary = true; - isExecutable = true; + version = "0.3.1"; + sha256 = "c13b92e077e577df6e34da03bd267f9e9c29a0f3345e6935915aabf8a3b3fda5"; libraryHaskellDepends = [ base Chart Chart-cairo Chart-diagrams colour data-default - data-default-class either exceptions microlens mtl pretty-display - process safe scientific statistics vector + data-default-class either exceptions lens mtl mwc-random + pretty-display process safe scientific statistics vector + vector-algorithms ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest tasty tasty-hunit vector ]; homepage = "https://github.com/jsermeno/amby#readme"; description = "Statistical data visualization"; license = stdenv.lib.licenses.bsd3; @@ -24520,8 +24516,8 @@ self: { }: mkDerivation { pname = "amqp-worker"; - version = "0.2.1"; - sha256 = "f3b89e4286f84b4d1029d4750184831b2fcb5f194446fb1b1d938824abcf08a4"; + version = "0.2.2"; + sha256 = "4d45b13eb6d58763f7da1d058ebca6163e37775c25898869811c684719d975e4"; libraryHaskellDepends = [ aeson amqp base bytestring data-default exceptions monad-control mtl resource-pool split text transformers-base @@ -27004,23 +27000,6 @@ self: { }) {}; "async" = callPackage - ({ mkDerivation, base, HUnit, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.1.0"; - sha256 = "93c37611f9c68b5cdc8cd9960ae77a7fbc25da83cae90137ef1378d857f22c2f"; - libraryHaskellDepends = [ base stm ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/simonmar/async"; - description = "Run IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "async_2_1_1" = callPackage ({ mkDerivation, base, HUnit, stm, test-framework , test-framework-hunit }: @@ -27035,7 +27014,6 @@ self: { homepage = "https://github.com/simonmar/async"; description = "Run IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-ajax" = callPackage @@ -30383,8 +30361,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.2.0.0"; - sha256 = "439458c5caab3657ce8ba8dc075097a905b4cb83f07c4a6846a248f9432ff7b8"; + version = "0.2.0.1"; + sha256 = "2e8abcb38c557c256d871f5df7566d02e74741bec24d86d2a65c97d6c1dc3b40"; libraryHaskellDepends = [ attoparsec base bytestring time ]; homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; @@ -37542,8 +37520,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.1.0.1"; - sha256 = "d1ea0a6ebb07b3bdc7ac50ccf3300888b0c4d48d53640593e2748e3e1433ead4"; + version = "3.1.0.2"; + sha256 = "c137dece9554219a980a74f0aaa3d44c13f83b6312c8802f4766702250514a95"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -38787,25 +38765,6 @@ self: { }) {}; "cgi" = callPackage - ({ mkDerivation, base, bytestring, containers, doctest, exceptions - , mtl, multipart, network, network-uri, parsec, QuickCheck, time - , xhtml - }: - mkDerivation { - pname = "cgi"; - version = "3001.3.0.1"; - sha256 = "96859110c72904089d8b3ac5fe493ac6f47aeafd1b30ffd1efce649442cc4752"; - libraryHaskellDepends = [ - base bytestring containers exceptions mtl multipart network - network-uri parsec time xhtml - ]; - testHaskellDepends = [ base doctest QuickCheck ]; - homepage = "https://github.com/cheecheeo/haskell-cgi"; - description = "A library for writing CGI programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cgi_3001_3_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, doctest, exceptions , mtl, multipart, network, network-uri, parsec, QuickCheck, time , xhtml @@ -38822,7 +38781,6 @@ self: { homepage = "https://github.com/cheecheeo/haskell-cgi"; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-undecidable" = callPackage @@ -40394,37 +40352,6 @@ self: { }) {}; "classy-prelude" = callPackage - ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim - , hashable, hspec, lifted-async, lifted-base, monad-unlift - , mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, safe-exceptions - , semigroups, stm, text, time, time-locale-compat, transformers - , transformers-base, unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "1.0.0.2"; - sha256 = "a4fa52c6b571df5cc98c1cebf97b41085104a17b2e23c2221cd2061ec7a9c262"; - libraryHaskellDepends = [ - async base basic-prelude bifunctors bytestring chunked-data - containers deepseq dlist exceptions ghc-prim hashable lifted-async - lifted-base monad-unlift mono-traversable - mono-traversable-instances mtl mutable-containers primitive - safe-exceptions semigroups stm text time time-locale-compat - transformers transformers-base unordered-containers vector - vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude_1_0_1" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift @@ -40457,28 +40384,6 @@ self: { }) {}; "classy-prelude-conduit" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; - version = "1.0.0"; - sha256 = "248b3a30c6da08400039b5a9485039319e059c52927edf2a1dbcd6a9089da22e"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "classy-prelude together with conduit functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude-conduit_1_0_1" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -40501,26 +40406,6 @@ self: { }) {}; "classy-prelude-yesod" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "1.0.0"; - sha256 = "12ac3f4b72302cf18a7ebd5a836eb8cfe22729cbcd1f0a723db047c2b80a9ce2"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude-yesod_1_0_1" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -41389,19 +41274,6 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, bytestring, HUnit, text }: - mkDerivation { - pname = "cmark"; - version = "0.5.3.1"; - sha256 = "4ae12da7e712d10a662a8323e7bc513daa1abf3ad4d055054b5f19b1122ca124"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - homepage = "https://github.com/jgm/commonmark-hs"; - description = "Fast, accurate CommonMark (Markdown) parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark_0_5_4" = callPackage ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; @@ -41412,7 +41284,6 @@ self: { homepage = "https://github.com/jgm/cmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -43147,6 +43018,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "concrete-haskell" = callPackage + ({ mkDerivation, base, bytestring, hashable, QuickCheck, text + , thrift, unordered-containers, vector + }: + mkDerivation { + pname = "concrete-haskell"; + version = "0.1.0.0"; + sha256 = "68312cbefd0aa617b253c5e4d89dbdd71a394c74dfee9eb20426222fff017e40"; + libraryHaskellDepends = [ + base bytestring hashable QuickCheck text thrift + unordered-containers vector + ]; + homepage = "https://github.com/hltcoe"; + description = "Library for the Concrete data format"; + license = "GPL"; + }) {}; + "concrete-relaxng-parser" = callPackage ({ mkDerivation, base, cmdargs, containers, hxt, hxt-charproperties , hxt-curl, hxt-relaxng, hxt-tagsoup @@ -43578,34 +43466,6 @@ self: { }) {}; "conduit-combinators" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; - version = "1.0.8.1"; - sha256 = "cf347790f173dce64ebf7ef1b364686fee2d890bfa38caa9145494a5909a7637"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-combinators_1_0_8_2" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers , directory, filepath, hspec, monad-control, mono-traversable, mtl @@ -43631,7 +43491,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-connection" = callPackage @@ -43859,6 +43718,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "config-ini" = callPackage + ({ mkDerivation, base, directory, ini, megaparsec, QuickCheck, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "config-ini"; + version = "0.1.1.0"; + sha256 = "ef88423e53604474a4e1b2bfb0f0824efed740af25f2b1841577838bc96d10ac"; + revision = "1"; + editedCabalFile = "8665338f86052e9963fe0472b0c1e30c865e14f8450d16bc35519bf5e07f2032"; + libraryHaskellDepends = [ + base megaparsec text transformers unordered-containers + ]; + testHaskellDepends = [ + base directory ini QuickCheck text unordered-containers + ]; + homepage = "https://github.com/aisamanra/config-ini"; + description = "A library for simple INI-based configuration files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "config-manager" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, parsec , temporary, test-framework, test-framework-hunit, text, time @@ -46546,6 +46426,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cron_0_4_2" = callPackage + ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat + , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers-compat + }: + mkDerivation { + pname = "cron"; + version = "0.4.2"; + sha256 = "31f186b9237c802260a7c1468e9b81006c086df1d6ad3d0d6ef51d9d2e8d07d3"; + revision = "1"; + editedCabalFile = "5f6737e07b84d324ea03dc18096622a49b649c5eb372ef64e504695d442b0bde"; + libraryHaskellDepends = [ + attoparsec base mtl mtl-compat old-locale semigroups text time + ]; + testHaskellDepends = [ + attoparsec base generics-sop quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck text time transformers-compat + ]; + homepage = "http://github.com/michaelxavier/cron"; + description = "Cron datatypes and Attoparsec parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cron-compat" = callPackage ({ mkDerivation, attoparsec, base, cron, derive, hspec , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text @@ -47169,9 +47073,9 @@ self: { }: mkDerivation { pname = "cryptonite-openssl"; - version = "0.2"; - sha256 = "bbf6787c33edb287359fc48802512ab2d5c95b02bd6c1a759d7f9bc157703fcb"; - libraryHaskellDepends = [ base bytestring memory ]; + version = "0.3"; + sha256 = "43c8f8b4259f103be4408734f604c55a0053e60d302890174ba4773828bdee26"; + libraryHaskellDepends = [ base bytestring cryptonite memory ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring cryptonite tasty tasty-hunit tasty-kat @@ -49334,6 +49238,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-has" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "data-has"; + version = "0.1.0.0"; + sha256 = "8b5b4a68965b8c31ef10cc2ae37e7c4d09ae44ee0790002adb8ccf1ad6a48ab2"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/winterland1989/data-has"; + description = "Simple extensible product"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-hash" = callPackage ({ mkDerivation, array, base, containers, QuickCheck , test-framework, test-framework-quickcheck2 @@ -52353,8 +52269,10 @@ self: { pname = "diagrams-boolean"; version = "0.1.0"; sha256 = "c0b174cc23e6dc461e6ec6a68797a9552933e7d800e3e66ce85ef1ccf151b69e"; + revision = "2"; + editedCabalFile = "49fa3d3493471de57b921c41b986c3537a9cd30cf1f42eb7170a13293c70d596"; libraryHaskellDepends = [ base cubicbezier diagrams-lib ]; - description = "boolean operations on Diagrams paths"; + description = "deprecated, part of diagrams-contrib since 1.4"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -53870,12 +53788,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_2_7_0" = callPackage + "directory_1_2_7_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.7.0"; - sha256 = "4ae59ebd9969f300e579c2b62fb072954a297b2f53fcd5d58bab363535ce7040"; + version = "1.2.7.1"; + sha256 = "cf3c0984238ac5bb67706b03f86f823feb50d46092ed6ec6e523b89a1d0836cf"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -55275,24 +55193,24 @@ self: { }) {}; "dom-parser" = callPackage - ({ mkDerivation, base, data-default, hspec, lens, mtl, semigroups - , shakespeare, text, transformers, xml-conduit + ({ mkDerivation, base, data-default, hspec, lens, mtl, open-union + , semigroups, shakespeare, text, transformers, type-fun + , xml-conduit, xml-lens }: mkDerivation { pname = "dom-parser"; - version = "0.0.1"; - sha256 = "5ade4315c5e59bfbaf1e078a1171c6f3109d4f3bd3c394d7ef923140e253f86b"; - revision = "1"; - editedCabalFile = "1157c5f603c43f5a4bd0ea7f45da822b989db065324bbecb2e14659473eb766f"; + version = "0.1.1"; + sha256 = "e001c486adb3b2c6c6ab18e70205dc759ea018b6db084f8668bb424b623e4e03"; libraryHaskellDepends = [ - base lens mtl semigroups shakespeare text transformers xml-conduit + base lens mtl open-union semigroups shakespeare text transformers + type-fun xml-conduit xml-lens ]; testHaskellDepends = [ - base data-default hspec shakespeare text xml-conduit + base data-default hspec lens semigroups shakespeare text + xml-conduit ]; - homepage = "https://github.com/s9gf4ult/dom-parser"; - description = "Simple monad for parsing DOM"; - license = stdenv.lib.licenses.bsd3; + description = "Simple monadic DOM parser"; + license = stdenv.lib.licenses.mit; }) {}; "dom-selector" = callPackage @@ -55893,6 +55811,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "drawille_0_1_2_0" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck }: + mkDerivation { + pname = "drawille"; + version = "0.1.2.0"; + sha256 = "b8188ee87a06c168974c9655188450eb86c331c556decb31cf084efa846237df"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + homepage = "https://github.com/yamadapc/haskell-drawille#readme"; + description = "A port of asciimoo's drawille to haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dresdner-verkehrsbetriebe" = callPackage ({ mkDerivation, aeson, base, bytestring, HTTP, old-locale , optparse-applicative, time, unordered-containers, vector @@ -57768,8 +57700,8 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck }: mkDerivation { pname = "electrum-mnemonic"; - version = "0.1.2"; - sha256 = "638a29ecaf2e3fb9123e01c959c4299bbcc487dadb3743821123d6280e775cd3"; + version = "0.1.3"; + sha256 = "c05e2ddd4b18a0f8202e523032ed8cacd3cd57549c533154fb0bbc604b27aaf6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; @@ -61906,8 +61838,8 @@ self: { pname = "feed"; version = "0.3.11.1"; sha256 = "ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983"; - revision = "3"; - editedCabalFile = "0baffc9bcab66296a904d211d4254f625811dc28eda4f1be0692cc2b219a6bdd"; + revision = "4"; + editedCabalFile = "ecce0a16a0d695b1c8ed80af4ea59e33c767ad9c6bdac5898e7cae20bd5da8c6"; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -83810,8 +83742,8 @@ self: { }: mkDerivation { pname = "hasql-class"; - version = "0.0.0.1"; - sha256 = "90db8a197d6755401f0431fa9586aa3f1744d411fe714ec8bfd2b51f5540c9de"; + version = "0.0.1.0"; + sha256 = "f46dc9cd83ba0f121f8c67c10cf25d199218b4d303aed008084655fdb60aa681"; libraryHaskellDepends = [ base bytestring contravariant data-default-class generics-eot hasql text time vector @@ -84655,27 +84587,29 @@ self: { }) {}; "hbro" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, cond, containers - , data-default-class, directory, dyre, errors, exceptions - , fast-logger, filepath, glib, gtk3, lens, lifted-async - , lifted-base, monad-control, monad-logger, mtl, network-uri - , optparse-applicative, pango, parsec, process, random, resourcet - , safe, semigroups, stm-chans, text, time, transformers - , transformers-base, unix, uuid, webkitgtk3, zeromq4-haskell + ({ mkDerivation, base, bytestring, chunked-data, cond, containers + , data-default-class, directory, dyre, errors, fast-logger + , filepath, glib, gtk3, lens, lifted-async, lifted-base + , monad-control, monad-logger, monadIO, mono-traversable, mtl + , network-uri, optparse-applicative, pango, parsec, process, random + , resourcet, safe, safe-exceptions, semigroups, stm-chans, text + , time, transformers, transformers-base, unix, uuid, webkitgtk3 + , zeromq4-haskell }: mkDerivation { pname = "hbro"; - version = "1.5.0.0"; - sha256 = "8f66263f288dba0e90cce6d6b9d2682b71acc46c2790128cba78b984c7990d6f"; + version = "1.6.0.0"; + sha256 = "0572d35613f0b6e199f563375fb71991fe46ebfa7881bcee591a2054629febce"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring classy-prelude cond containers data-default-class - directory dyre errors exceptions fast-logger filepath glib gtk3 - lens lifted-async lifted-base monad-control monad-logger mtl - network-uri optparse-applicative pango parsec process random - resourcet safe semigroups stm-chans text time transformers - transformers-base unix uuid webkitgtk3 zeromq4-haskell + base bytestring chunked-data cond containers data-default-class + directory dyre errors fast-logger filepath glib gtk3 lens + lifted-async lifted-base monad-control monad-logger monadIO + mono-traversable mtl network-uri optparse-applicative pango parsec + process random resourcet safe safe-exceptions semigroups stm-chans + text time transformers transformers-base unix uuid webkitgtk3 + zeromq4-haskell ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/k0ral/hbro"; @@ -84686,19 +84620,20 @@ self: { "hbro-contrib" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , classy-prelude, containers, directory, glib, gtk3, hbro, lens - , monad-control, mtl, network-uri, pango, parsec, process - , resourcet, safe, text, time, transformers-base, unix, webkitgtk3 + , chunked-data, containers, directory, filepath, glib, gtk3, hbro + , lens, monad-control, mono-traversable, mtl, network-uri, pango + , parsec, process, resourcet, safe, safe-exceptions, text, time + , transformers-base, unix, webkitgtk3 }: mkDerivation { pname = "hbro-contrib"; - version = "1.5.0.0"; - sha256 = "0331c2024f52cfbefba781095e8309fd20cd32082a9a8887c3fcb4f52fc76fbc"; + version = "1.6.0.0"; + sha256 = "7ca63236aa588f4ac538ffb17840fca1039c36eefb2f56317b1614170c9b1603"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring classy-prelude containers - directory glib gtk3 hbro lens monad-control mtl network-uri pango - parsec process resourcet safe text time transformers-base unix - webkitgtk3 + aeson aeson-pretty base bytestring chunked-data containers + directory filepath glib gtk3 hbro lens monad-control + mono-traversable mtl network-uri pango parsec process resourcet + safe safe-exceptions text time transformers-base unix webkitgtk3 ]; homepage = "https://github.com/k0ral/hbro-contrib"; description = "Third-party extensions to hbro"; @@ -86351,15 +86286,15 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.0"; - sha256 = "152db4b8297ed5eafb9c9f974806b39f790325b337d48e0a5724227360106b1b"; + version = "1.0.0.1"; + sha256 = "f25a727b6df685596b78d1a82c60da8433b3afb8a3c0766ece241700578fa5b7"; libraryHaskellDepends = [ base blaze-html blaze-markup containers parsec shakespeare template-haskell text ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/heterocephalus#readme"; - description = "A flexible and type safe template engine for Haskell"; + description = "A type safe template engine for collaborating with front end development tools"; license = stdenv.lib.licenses.mit; }) {}; @@ -88609,24 +88544,6 @@ self: { }) {}; "hledger-interest" = callPackage - ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time - }: - mkDerivation { - pname = "hledger-interest"; - version = "1.5"; - sha256 = "77fb04190160de91eb791f2326691133e1be26c0984fabf30581ba1f0af3fab1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal Decimal hledger-lib mtl text time - ]; - homepage = "http://github.com/peti/hledger-interest"; - description = "computes interest for a given account"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "hledger-interest_1_5_1" = callPackage ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time }: mkDerivation { @@ -88641,7 +88558,6 @@ self: { homepage = "http://github.com/peti/hledger-interest"; description = "computes interest for a given account"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -88702,6 +88618,8 @@ self: { pname = "hledger-ui"; version = "1.0.5"; sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875"; + revision = "1"; + editedCabalFile = "3189cd365d74e481da18730d14c0ac538f435a331cfe76d519e37214f94adf54"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91485,6 +91403,8 @@ self: { pname = "hpqtypes"; version = "1.5.1.1"; sha256 = "b99c214d7cc83573f5bf295837b42a13a4057dc9cab701b25798086f0d54795a"; + revision = "1"; + editedCabalFile = "6915ef5e4cd5c22aee26cf85b2d6b86947ada1b0c39d39b6cadcc6bf572e454c"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class exceptions lifted-base monad-control mtl resource-pool text text-show time @@ -96592,27 +96512,6 @@ self: { }) {}; "http-link-header" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-conversion, errors, hspec, hspec-attoparsec - , network-uri, QuickCheck, text - }: - mkDerivation { - pname = "http-link-header"; - version = "1.0.2"; - sha256 = "618b33aa9518cfae4d63e3d79689642bde5eecfa33c83ea1d1e3aa33420f8685"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion errors network-uri - text - ]; - testHaskellDepends = [ - base hspec hspec-attoparsec QuickCheck text - ]; - 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; - }) {}; - - "http-link-header_1_0_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, errors, hspec, hspec-attoparsec , http-api-data, network-uri, QuickCheck, text @@ -96631,7 +96530,6 @@ self: { 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-listen" = callPackage @@ -104352,7 +104250,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "jose_0_5_0_0" = callPackage + "jose_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , byteable, bytestring, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances @@ -104361,8 +104259,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.5.0.0"; - sha256 = "cb2da4049b288be97e1a7530fbf0ff86cf98a3277b13cd84ba352519741b36ce"; + version = "0.5.0.1"; + sha256 = "be03e97bad8c492bc6e268d917b0c0ea18f12a971a94be8e8c28af636d52c84f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109120,6 +109018,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "latex-function-tables" = callPackage + ({ mkDerivation, base, bifunctors, HaTeX, lens, mtl, process + , semigroups, template-haskell, th-printf + }: + mkDerivation { + pname = "latex-function-tables"; + version = "0.1.0.0"; + sha256 = "7145b64e438624e8c5a3590c67f113df5010f8f28feb33aaa95602ef75939af4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors HaTeX lens mtl semigroups template-haskell + th-printf + ]; + executableHaskellDepends = [ base HaTeX process template-haskell ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/nfm2017#readme"; + description = "Function table specifications in latex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lattices" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, QuickCheck , semigroups, tagged, tasty, tasty-quickcheck, transformers @@ -111597,10 +111516,10 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.1.0.1"; - sha256 = "ff237dba6477c1ef1328c36785563422fbf3aae1acd31cf5aca139d8a0b4adbd"; + version = "0.2.0.0"; + sha256 = "99e027c01da96c907a94b8bd57a7e36597d57b4786aa4835b1b66e921bad21d3"; revision = "1"; - editedCabalFile = "c917ace1221a02587e65c9224c1b39fd6999b9c6f712138312def89981bcd3d4"; + editedCabalFile = "2da156de9e6cffcbd1b9910c4d177250d27a18bf77bdae54bf8560c26b1b89b7"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear semigroups vector vector-space @@ -113262,7 +113181,7 @@ self: { "log" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , bloodhound, bytestring, cond, deepseq, exceptions, hpqtypes + , bloodhound, bytestring, deepseq, exceptions, hpqtypes , http-client, http-types, lifted-base, monad-control, monad-time , mtl, old-locale, process, random, semigroups, split, stm, tasty , tasty-hunit, text, text-show, time, transformers @@ -113270,14 +113189,13 @@ self: { }: mkDerivation { pname = "log"; - version = "0.5.5"; - sha256 = "9a1b6443e83b249bb20feed413f47fe8b33b1d36b3e6982cae70cdcf158137fc"; + version = "0.6"; + sha256 = "7b059a5130d7a7ec87109bdb118223ba281135ccdbc68551ff4123da4181176a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring - cond deepseq exceptions hpqtypes http-client lifted-base - monad-control monad-time mtl old-locale semigroups split stm text - text-show time transformers transformers-base unordered-containers - vector + deepseq exceptions hpqtypes http-client lifted-base monad-control + monad-time mtl old-locale semigroups split stm text text-show time + transformers transformers-base unordered-containers vector ]; testHaskellDepends = [ aeson base bloodhound bytestring exceptions http-client http-types @@ -115828,30 +115746,6 @@ self: { }) {}; "markdown" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , conduit, conduit-extra, containers, data-default, directory - , filepath, hspec, text, transformers, xml-conduit, xml-types - , xss-sanitize - }: - mkDerivation { - pname = "markdown"; - version = "0.1.15"; - sha256 = "5bf44c4a0df5a9c43dc7fcac86cbbd586c703e1a5f8ba6a77ea8f8207152e628"; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup conduit conduit-extra - containers data-default text transformers xml-conduit xml-types - xss-sanitize - ]; - testHaskellDepends = [ - base blaze-html conduit conduit-extra containers directory filepath - hspec text transformers - ]; - homepage = "https://github.com/snoyberg/markdown"; - description = "Convert Markdown to HTML, with XSS protection"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "markdown_0_1_16" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , conduit, conduit-extra, containers, data-default, directory , filepath, hspec, text, transformers, xml-conduit, xml-types @@ -115873,7 +115767,6 @@ self: { homepage = "https://github.com/snoyberg/markdown"; description = "Convert Markdown to HTML, with XSS protection"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markdown-kate" = callPackage @@ -118750,19 +118643,6 @@ self: { }) {}; "mmorph" = callPackage - ({ mkDerivation, base, mtl, transformers, transformers-compat }: - mkDerivation { - pname = "mmorph"; - version = "1.0.6"; - sha256 = "14c391b111af4cc10917a9340897ae2a5718f5b0b7e6bc13f379445c58fe0dc5"; - libraryHaskellDepends = [ - base mtl transformers transformers-compat - ]; - description = "Monad morphisms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmorph_1_0_9" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -118773,7 +118653,6 @@ self: { ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmtl" = callPackage @@ -120366,6 +120245,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "money" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "money"; + version = "0.1.0"; + sha256 = "b3d078e6bf2201dfe7d524776fb7c3cee47b4f4d06d493c6f9bb9d3fb2407f9c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/jpvillaisaza/money"; + description = "Money"; + license = stdenv.lib.licenses.mit; + }) {}; + "mongoDB" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, containers, cryptohash @@ -122772,8 +122664,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.7.0.0"; - sha256 = "c4ab3b07780ab7ba3df4ec5c9575d717456433ea7af5ab0af4aae346af22ceda"; + version = "0.7.1.0"; + sha256 = "0d0107914bc3f869eac868e1ad66a1ceba97cd68e2f5b9a595eecab24840edeb"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -125322,10 +125214,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.4.2"; - sha256 = "547a786039d88cbb0aa6ba355c8930245232121a06b63bbf005f725bc8f93ffa"; - revision = "1"; - editedCabalFile = "d02abcd1d1c9458ec03f8966a90143cd4353a41ed4e4d42f2f55f194abc01305"; + version = "0.2.5.0"; + sha256 = "160e9f29ddc659a39c96de3971de7086528f608e372912a3f4e5b5f11a94590b"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -126748,13 +126638,15 @@ self: { }) {}; "obdd" = callPackage - ({ mkDerivation, array, base, containers, mtl, random }: + ({ mkDerivation, array, base, containers, mtl, process, random }: mkDerivation { pname = "obdd"; - version = "0.3.3"; - sha256 = "bf9aa0cc89f4964df7e9fe61d1c5e3b37d6e04f3750a9c98025c21d45a24f1b5"; - libraryHaskellDepends = [ array base containers mtl random ]; - testHaskellDepends = [ base containers ]; + version = "0.6.1"; + sha256 = "0db47df8588a5ffd6a925cf4d21c3e313aac9ec8ced2461dfddbfafb38ba1053"; + libraryHaskellDepends = [ + array base containers mtl process random + ]; + testHaskellDepends = [ array base containers ]; homepage = "https://github.com/jwaldmann/haskell-obdd"; description = "Ordered Reduced Binary Decision Diagrams"; license = "GPL"; @@ -127013,6 +126905,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oeis_0_3_8" = callPackage + ({ mkDerivation, base, HTTP, HUnit, network, network-uri + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "oeis"; + version = "0.3.8"; + sha256 = "4be72f80596045a51e56f8d810b5a044689f117b38a614bd9645e97dd3e39c93"; + libraryHaskellDepends = [ base HTTP network network-uri ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "off-simple" = callPackage ({ mkDerivation, base, parsec3, vector }: mkDerivation { @@ -127640,16 +127549,16 @@ self: { }) {}; "open-union" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, type-fun }: mkDerivation { pname = "open-union"; - version = "0.1.0.1"; - sha256 = "1ceb46a9eeb6114a5eb8eeb3805a9d4f218c88cd2f24e42c25271b348b3a7fb6"; + version = "0.2.0.0"; + sha256 = "e9835d4e736afcedda90ff1e21ab6446266c1aa925b453ebf2292561dab48bbe"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/RobotGymnast/open-union"; + libraryHaskellDepends = [ base type-fun ]; + executableHaskellDepends = [ base type-fun ]; + homepage = "https://github.com/bfopa/open-union"; description = "Extensible, type-safe unions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -128258,14 +128167,12 @@ self: { ({ mkDerivation, base, mtl, random }: mkDerivation { pname = "operational"; - version = "0.2.3.4"; - sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810"; - revision = "2"; - editedCabalFile = "8cff8abd98ae819678745b9d6071c51acaa281f386a13c166ef3c27161e372f1"; + version = "0.2.3.5"; + sha256 = "91d479063ae7ed3d0a6ae911bdee550fbf31cf341910f9778046b484c55b4af4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ base random ]; + executableHaskellDepends = [ base mtl random ]; homepage = "http://wiki.haskell.org/Operational"; description = "Implementation of difficult monads made easy with operational semantics"; license = stdenv.lib.licenses.bsd3; @@ -129673,20 +129580,18 @@ self: { ({ mkDerivation, base, bytestring, containers, data-accessor , data-accessor-template, data-accessor-transformers, data-default , directory, filepath, hspec, mtl, pandoc, pandoc-types, process - , roman-numerals, syb, template-haskell, yaml + , roman-numerals, syb, template-haskell, utility-ht, yaml }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.3.0"; - sha256 = "b6b4200023da4835cf50a2c9a247a837282ccf16e1684336b5a15d17b9ad085e"; - revision = "1"; - editedCabalFile = "d2e8585033cbfcb5d232c01e6df4f9ba073d1249613847c238d433b011015693"; + version = "0.2.4.1"; + sha256 = "2aa2266ac3916677c18bd9a88b99f32622c22c983abaed3598020913ca3912ed"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-accessor data-accessor-template data-accessor-transformers data-default mtl pandoc pandoc-types - roman-numerals syb template-haskell yaml + roman-numerals syb template-haskell utility-ht yaml ]; executableHaskellDepends = [ base bytestring containers data-default mtl pandoc pandoc-types @@ -129696,7 +129601,7 @@ self: { base bytestring containers data-accessor data-accessor-template data-accessor-transformers data-default directory filepath hspec mtl pandoc pandoc-types process roman-numerals syb template-haskell - yaml + utility-ht yaml ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; @@ -133343,8 +133248,10 @@ self: { ({ mkDerivation, base, process, unix }: mkDerivation { pname = "pid1"; - version = "0.1.0.0"; - sha256 = "2b8e4bcdb1ce5c1dd5734d4406edd899e72e0afbe83758ff77590508a39d6cd2"; + version = "0.1.0.1"; + sha256 = "163b6dc85426558ad1a897675bf7f560389addf172c8e5858f817342ee7345c8"; + revision = "1"; + editedCabalFile = "f3213f1c04a1daa726ee2f6ceda69d843b80f4726759ef2fe2e23c4f34342746"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process unix ]; @@ -134721,12 +134628,12 @@ self: { "playlists" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, filepath - , hlint, hspec, optparse-applicative, text, word8 + , hspec, optparse-applicative, text, word8 }: mkDerivation { pname = "playlists"; - version = "0.3.0.0"; - sha256 = "8bb2141f2e996d7d4ab376e53fd00c0abfdfc05b00abc53b8c44573720e089bc"; + version = "0.4.0.0"; + sha256 = "38a4cb8370ced24a7ac198f16b509799993e9798ccfb9fc3448ee8e14bd71688"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134735,13 +134642,32 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text ]; - testHaskellDepends = [ base bytestring doctest hlint hspec ]; + testHaskellDepends = [ + base bytestring doctest filepath hspec text + ]; homepage = "https://github.com/pjones/playlists"; description = "Library and executable for working with playlist files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "playlists-http" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, either, exceptions + , http-client, mtl, playlists, text + }: + mkDerivation { + pname = "playlists-http"; + version = "0.1.0.0"; + sha256 = "9f3360bd4adcf45c0bd85eecc717c8093f8d8c71adcf8cff5d961c6cea1c15e3"; + libraryHaskellDepends = [ + attoparsec base bytestring either exceptions http-client mtl + playlists text + ]; + homepage = "https://github.com/pjones/playlists-http"; + description = "Library to glue together playlists and http-client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plist" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, hxt }: mkDerivation { @@ -135369,11 +135295,11 @@ self: { ({ mkDerivation, base, containers, hspec, lens, mtl }: mkDerivation { pname = "polar-shader"; - version = "0.2.0.0"; - sha256 = "a251680f9d717394cb91e758d51ab8a69889be619325aff378d80b21742867f5"; + version = "0.3.0.0"; + sha256 = "426c5bb67fdb5be0e648678fa9d03800e714d5f89123b93d72fb8c7b7c01af24"; libraryHaskellDepends = [ base containers lens mtl ]; testHaskellDepends = [ base containers hspec ]; - description = "High-level shader compiler for Polar Game Engine"; + description = "High-level shader compiler framework"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138442,8 +138368,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.2.2"; - sha256 = "255082b7c52f4892e2e7aa4b5f68ffe0da897025b59e3cbcd6b8e3f3f20354fe"; + version = "3.2.3"; + sha256 = "078b51c15e4dbce6f55cd26eeb82ed6307e3c47661ab6518f421a1c95e60a11a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145773,8 +145699,8 @@ self: { pname = "rest-core"; version = "0.39"; sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404"; - revision = "2"; - editedCabalFile = "62fec3ffbc0dfaf26d82ad0689dfe74384f2e565ec0c2bff897cd4c71be74583"; + revision = "3"; + editedCabalFile = "3b6cf8a675a2bf1f3e22fcf1a39e1658ce112e21b918ad28ace73cdf5dc70aa2"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -145854,8 +145780,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "1"; - editedCabalFile = "32caced8ad0a5273fc9c13ae65f75a37b790ad430d3923febf567616f5eb8e95"; + revision = "2"; + editedCabalFile = "9eb0c067b4a15b128d75c240694fc31504664107c88b9b80f925ef669eac632a"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -147263,6 +147189,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rotating-log_0_4_2" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, old-locale + , time, time-locale-compat + }: + mkDerivation { + pname = "rotating-log"; + version = "0.4.2"; + sha256 = "6ef0ae7ecb9e30387b4088edc173fbb90b8c8b7514f9f7b8b6d92f7d95f754ec"; + libraryHaskellDepends = [ + base bytestring directory filepath old-locale time + time-locale-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath time time-locale-compat + ]; + homepage = "http://github.com/Soostone/rotating-log"; + description = "Size-limited, concurrent, automatically-rotating log writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "roundRobin" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, tasty , tasty-quickcheck @@ -150730,8 +150677,8 @@ self: { ({ mkDerivation, base, containers, doctest, smallcheck }: mkDerivation { pname = "semiring-num"; - version = "0.5.3.1"; - sha256 = "f61b090bad8407b1ba50a136a5f14fdac92e4eb69f1aa0ce2d67f318ab33df20"; + version = "0.5.4.0"; + sha256 = "f96f42f4cb9bc0c34f4cc0e41178ad23c60fd4f5ff6f1059df5d352df54564e5"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest smallcheck ]; homepage = "https://github.com/oisdk/semiring-num"; @@ -152426,8 +152373,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.7.0.2"; - sha256 = "0461cc7635c72f2c75770f029811a1c1e72f3245bc4be2fd1beaaee1cd84759b"; + version = "0.7.0.3"; + sha256 = "8b3892b6572677b74d1351b8dd9f274a0428c0bcdd2a0ab599ce96edfe7c2a8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153434,32 +153381,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.11.1"; - sha256 = "bc3d6c5bb3cbef9a0aa67bbf5f08b20cf77bc9e29d8e7da5a3768016a0361d5e"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - homepage = "http://www.yesodweb.com/book/shakespearean-templates"; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_11_2" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, time, transformers @@ -153482,7 +153403,6 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -157509,8 +157429,8 @@ self: { }: mkDerivation { pname = "snaplet-sqlite-simple-jwt-auth"; - version = "0.1.1.0"; - sha256 = "64afbefedfc6eda854c4b34e8bd8e69be84d2042aa81cfe0305d53ddf1b62fd2"; + version = "0.2.0.0"; + sha256 = "fc58870fc0cee74f9d4138c909937350faa7d1924a1da8e0f76b4a5ccdf31203"; libraryHaskellDepends = [ aeson attoparsec base bcrypt bytestring clientsession containers directory either errors jwt lens mtl snap snap-core @@ -159354,8 +159274,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.90.0"; - sha256 = "6df57f02d8002e4f80cf0531adef08b6dc112b51861c2d5dec38afefa5582ef7"; + version = "1.90.1"; + sha256 = "5feb5f23458155f317808992af1de5cb1e86ee6d89a0ce0371efe3dfd130926b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159529,27 +159449,6 @@ self: { }) {inherit (pkgs) sqlite;}; "sqlite-simple" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text - , time, transformers - }: - mkDerivation { - pname = "sqlite-simple"; - version = "0.4.9.0"; - sha256 = "81dfe4a1dd69d2f0334d3be10ba1d6ce91a9ba0602e69170dfbecb84b11f60a3"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite text time transformers - ]; - testHaskellDepends = [ - base base16-bytestring bytestring direct-sqlite HUnit text time - ]; - homepage = "http://github.com/nurpax/sqlite-simple"; - description = "Mid-Level SQLite client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sqlite-simple_0_4_10_0" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text , time, transformers @@ -159568,7 +159467,6 @@ self: { homepage = "http://github.com/nurpax/sqlite-simple"; description = "Mid-Level SQLite client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlite-simple-errors" = callPackage @@ -164451,8 +164349,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "system-info"; - version = "0.1.0.2"; - sha256 = "31c047baaa70679f3ffab275de83a6bf2de7e144a8a2d9ec49f36cf0c6c19a5c"; + version = "0.1.0.3"; + sha256 = "9d31bad4a6ea7abdb6bef5e929388a58d200982964042cc4aa991c81066dc8b8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -167028,23 +166926,6 @@ self: { }) {}; "test-fixture" = callPackage - ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl - , template-haskell, transformers - }: - mkDerivation { - pname = "test-fixture"; - version = "0.4.1.0"; - sha256 = "bddd2b518151218d9848b46f233c70719711a45fd7357ecc3a5eb1d551d437a4"; - libraryHaskellDepends = [ base data-default mtl template-haskell ]; - testHaskellDepends = [ - base hspec hspec-discover mtl transformers - ]; - homepage = "http://github.com/cjdev/test-fixture#readme"; - description = "Test monadic side-effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "test-fixture_0_4_2_0" = callPackage ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl , template-haskell, th-to-exp, transformers }: @@ -167060,7 +166941,6 @@ self: { homepage = "http://github.com/cjdev/test-fixture#readme"; description = "Test monadic side-effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework" = callPackage @@ -167409,24 +167289,6 @@ self: { }) {}; "test-simple" = callPackage - ({ mkDerivation, base, executable-path, mtl, process, QuickCheck - , state-plus, template-haskell - }: - mkDerivation { - pname = "test-simple"; - version = "0.1.8"; - sha256 = "8e8bacb6299e82d1f3f3643144e24ce574b99b2f052bd630930a4c2e62267895"; - libraryHaskellDepends = [ - base mtl QuickCheck state-plus template-haskell - ]; - testHaskellDepends = [ - base executable-path mtl process QuickCheck - ]; - description = "Simple Perl inspired testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "test-simple_0_1_9" = callPackage ({ mkDerivation, base, executable-path, mtl, process, QuickCheck , state-plus, template-haskell }: @@ -167442,7 +167304,6 @@ self: { ]; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testPkg" = callPackage @@ -174044,6 +173905,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ua-parser_0_7_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, file-embed + , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck + , text, yaml + }: + mkDerivation { + pname = "ua-parser"; + version = "0.7.2"; + sha256 = "469afe9d9c7d7de7405b316a388639858b515840f74ba0b4c48985559922df55"; + libraryHaskellDepends = [ + aeson base bytestring data-default file-embed pcre-light text yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default file-embed filepath HUnit + pcre-light tasty tasty-hunit tasty-quickcheck text yaml + ]; + description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uacpid" = callPackage ({ mkDerivation, base, containers, directory, filepath, hslogger , mtl, network, process, regex-compat, time, time-locale-compat @@ -183818,6 +183700,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-isogen" = callPackage + ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck + , semigroups, template-haskell, text, xml-conduit-writer + }: + mkDerivation { + pname = "xml-isogen"; + version = "0.1.0"; + sha256 = "ae66671939e101c38154f04f603b00ed31451477a55d183ae299316315005eae"; + libraryHaskellDepends = [ + base dom-parser lens mtl QuickCheck semigroups template-haskell + text xml-conduit-writer + ]; + description = "Generate XML-isomorphic types"; + license = stdenv.lib.licenses.mit; + }) {}; + "xml-lens" = callPackage ({ mkDerivation, base, case-insensitive, containers, lens, text , xml-conduit @@ -185387,8 +185285,8 @@ self: { }: mkDerivation { pname = "yeshql"; - version = "0.3.0.2"; - sha256 = "644a83935a015b792d879dfa301bbb18beeea8515c2acd8d516a2cf6697fcbb7"; + version = "0.3.0.3"; + sha256 = "b405093850400d551cc9d443cedcd28e7b0ff4b9e724ee00d4b21c4852d80f0b"; libraryHaskellDepends = [ base containers filepath HDBC parsec template-haskell ]; @@ -186217,30 +186115,6 @@ self: { }) {}; "yesod-form" = 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.8"; - sha256 = "c6f2f83dd361569f830c95671b70c7510b485840d20b9ade6c747de127088f0b"; - 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; - }) {}; - - "yesod-form_1_4_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -186262,7 +186136,6 @@ self: { 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 From ce6abb9495b6cf22f3b1ac74df713cc2a999276f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 23 Nov 2016 17:35:20 +0100 Subject: [PATCH 037/149] nixopsUnstable: init at 2016-11-23 --- pkgs/tools/package-management/nixops/generic.nix | 3 +++ pkgs/tools/package-management/nixops/unstable.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 9c4c2600fb40..87ed6295977f 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -14,6 +14,7 @@ python2Packages.buildPythonApplication { pythonPath = with python2Packages; [ prettytable boto + boto3 hetzner libcloud azure-storage @@ -22,6 +23,8 @@ python2Packages.buildPythonApplication { azure-mgmt-resource azure-mgmt-storage adal + pysqlite # Go back to builtin sqlite once Python 2.7.13 is released + datadog ]; doCheck = false; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index bba392e30e76..fb5791be2397 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,9 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.4"; + version = "2016-11-23"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd"; + # Hydra doesn't serve production outputs anymore :( + url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2"; + sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f52b376758..899519a9c018 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17163,7 +17163,7 @@ in nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = nixops;# callPackage ../tools/package-management/nixops/unstable.nix { }; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; From bbe5f99e0b429b2e4270ac6bfd02894512870a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 23 Nov 2016 13:01:32 +0100 Subject: [PATCH 038/149] qemu: add curl to buildInputs Enables support for accessing files over HTTP: qemu-system-x86_64 -drive media=cdrom,file=http://host/path.iso,readonly Increases the closures size from 445 to 447 MiB. --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ad8f94b52af2..ec1f8cf1c966 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib , ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex -, bison, lzo, snappy, libaio, gnutls, nettle +, bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ python zlib pkgconfig glib ncurses perl pixman vde2 texinfo libuuid flex bison makeWrapper lzo snappy - gnutls nettle + gnutls nettle curl ] ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] ++ optionals seccompSupport [ libseccomp ] From 8df969734a5a3df616a334a20175fcbd020439e3 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Wed, 23 Nov 2016 09:09:29 -0800 Subject: [PATCH 039/149] rust-bindgen: init at 0.19.1 (#19847) --- .../tools/rust/bindgen/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/rust/bindgen/default.nix diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix new file mode 100644 index 000000000000..adecf7f3bd13 --- /dev/null +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages }: + +with rustPlatform; + +# Future work: Automatically communicate NIX_CFLAGS_COMPILE to bindgen's tests and the bindgen executable itself. + +buildRustPackage rec { + name = "rust-bindgen-${version}"; + version = "0.19.1"; + + src = fetchFromGitHub { + owner = "Yamakaky"; + repo = "rust-bindgen"; + rev = "${version}"; + sha256 = "0pv1vcgp455hys8hb0yj4vrh2k01zysayswkasxq4hca8s2p7qj9"; + }; + + buildInputs = [ llvmPackages.clang-unwrapped ]; + + configurePhase = '' + export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" + ''; + + depsSha256 = "0rlmdiqjg9ha9yzhcy33abvhrck6sphczc2gbab9zhfa95gxprv8"; + + doCheck = false; # A test fails because it can't find standard headers in NixOS + + meta = with stdenv.lib; { + description = "C binding generator"; + homepage = https://github.com/Yamakaky/rust-bindgen; + license = with licenses; [ bsd3 ]; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0adfd97ca90d..551b8eaba85c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5221,6 +5221,7 @@ in rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; + rust-bindgen = callPackage ../development/tools/rust/bindgen { }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; From 278196e854a92ac79f77051436ef7df246a05a7d Mon Sep 17 00:00:00 2001 From: montag451 Date: Wed, 23 Nov 2016 21:01:40 +0100 Subject: [PATCH 040/149] git-annex-remote-rclone: init at 0.4 --- .../git-and-tools/default.nix | 2 ++ .../git-annex-remote-rclone/default.nix | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 8aad853ca10e..994dcb38f805 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -45,6 +45,8 @@ rec { git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; + git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; + # support for bugzilla git-bz = callPackage ./git-bz { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix new file mode 100644 index 000000000000..d1996b72154d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, rclone, makeWrapper }: + +stdenv.mkDerivation rec { + name = "git-annex-remote-rclone-${version}"; + version = "0.4"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "DanielDent"; + repo = "git-annex-remote-rclone"; + sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp git-annex-remote-rclone $out/bin + wrapProgram "$out/bin/git-annex-remote-rclone" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/DanielDent/git-annex-remote-rclone; + description = "Use rclone supported cloud storage providers with git-annex"; + license = licenses.gpl3; + maintainers = [ maintainers.montag451 ]; + }; +} From dc9f2c903e6fced76e9e7760c674d38909fd75a6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 23 Nov 2016 16:48:58 -0500 Subject: [PATCH 041/149] gradle: 3.2 -> 3.2.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 8d9308e7fcff..c129d4448a9c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.2"; + name = "gradle-3.2.1"; nativeVersion = "0.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0d9911011hg0rsqs7r4fz1xjrx0h43qji8s7f0vw0v926xlb68ak"; + sha256 = "1286wqycc7xnrkn6n37r5g19ajv6igqhavdh9pjxqmry9mjs6hwq"; }; }; From be95ceaff2b73ff836171f9822b81767d9a8cee6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:49:18 +0300 Subject: [PATCH 042/149] treewide: quote URLs in my packages --- .../audio/deadbeef/plugins/mpris2.nix | 2 +- .../display-managers/sddm/default.nix | 2 +- pkgs/applications/graphics/yed/default.nix | 2 +- pkgs/applications/misc/octoprint/default.nix | 2 +- .../pidgin-plugins/pidgin-latex/default.nix | 2 +- pkgs/applications/video/avidemux/default.nix | 2 +- .../xmonad-log-applet/default.nix | 2 +- pkgs/data/fonts/xits-math/default.nix | 2 +- pkgs/development/libraries/SDL_ttf/default.nix | 2 +- pkgs/development/libraries/cppzmq/default.nix | 2 +- .../libraries/double-conversion/default.nix | 4 ++-- pkgs/development/libraries/folly/default.nix | 2 +- pkgs/development/libraries/libaacs/default.nix | 13 +++++-------- .../libraries/libbdplus/default.nix | 14 +++++--------- .../libraries/libbluray/default.nix | 7 +++---- pkgs/development/libraries/libburn/default.nix | 2 +- .../development/libraries/libisofs/default.nix | 2 +- .../libraries/libvdpau-va-gl/default.nix | 2 +- pkgs/development/libraries/libxls/default.nix | 2 +- .../development/libraries/opendkim/default.nix | 6 ++++-- pkgs/development/libraries/qpdf/default.nix | 2 +- .../libraries/science/math/ipopt/default.nix | 4 ++-- pkgs/development/libraries/vc/0.7.nix | 2 +- pkgs/development/libraries/vcg/default.nix | 2 +- pkgs/development/libraries/xlslib/default.nix | 4 ++-- .../tools/analysis/swarm/default.nix | 2 +- pkgs/games/crawl/default.nix | 2 +- .../dwarf-fortress/dwarf-therapist/default.nix | 8 ++++---- pkgs/games/dwarf-fortress/unfuck.nix | 2 +- pkgs/games/quake3/ioquake/default.nix | 2 +- pkgs/games/scorched3d/default.nix | 2 +- pkgs/games/the-powder-toy/default.nix | 2 +- pkgs/games/wesnoth/default.nix | 2 +- pkgs/games/wesnoth/dev.nix | 2 +- pkgs/misc/drivers/m33-linux/default.nix | 2 +- .../linux/mkinitcpio-nfs-utils/default.nix | 2 +- pkgs/os-specific/linux/pam_pgsql/default.nix | 2 +- .../mail/dovecot/plugins/antispam/default.nix | 2 +- pkgs/tools/compression/lbzip2/default.nix | 2 +- pkgs/tools/misc/ltunify/default.nix | 2 +- pkgs/tools/networking/network-manager/l2tp.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 18 +++++++++--------- 43 files changed, 70 insertions(+), 76 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 1504cce1d582..12e8b3cccaed 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; - homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/; + homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3f8d5aec4aa1..9fd56a49b5f5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -57,7 +57,7 @@ let meta = with stdenv.lib; { description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; + homepage = "https://github.com/sddm/sddm"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ttuegel ]; }; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index afb48c697b5c..4221b75374cc 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - homepage = http://www.yworks.com/en/products/yfiles/yed/; + homepage = "http://www.yworks.com/en/products/yfiles/yed/"; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index fa0097272ffb..986c8b5130ce 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -28,7 +28,7 @@ let meta = with stdenv.lib; { description = "SockJS python server implementation on top of Tornado framework"; - homepage = http://github.com/mrjoes/sockjs-tornado/; + homepage = "http://github.com/mrjoes/sockjs-tornado/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 4a53513061ae..d4dba663e6da 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/pidgin-latex/; + homepage = "http://sourceforge.net/projects/pidgin-latex/"; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 96017a7ba19c..6b20ce8870d7 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -43,7 +43,7 @@ let ; meta = { - homepage = http://fixounet.free.fr/avidemux/; + homepage = "http://fixounet.free.fr/avidemux/"; description = "Free video editor designed for simple video editing tasks"; maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index f27e7a953dd2..b09dfebfd127 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-paths.patch ]; meta = with stdenv.lib; { - homepage = http://github.com/alexkay/xmonad-log-applet; + homepage = "http://github.com/alexkay/xmonad-log-applet"; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 773aa74ce390..8e834d79061f 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/khaledhosny/xits-math; + homepage = "https://github.com/khaledhosny/xits-math"; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 1f290bf7044f..4875d9ab5a1a 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; - homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html; + homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 9da83ca913e7..22c8633f0da5 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/zeromq/cppzmq; + homepage = "https://github.com/zeromq/cppzmq"; license = licenses.bsd2; description = "C++ binding for 0MQ"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 049a799c44fa..c6f7684ecf39 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "2.0.1"; name = "double-conversion-${version}"; + version = "2.0.1"; src = fetchFromGitHub { owner = "google"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = https://github.com/google/double-conversion; + homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index af8b1cb87373..67a47eeaab0f 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source C++ library developed and used at Facebook"; - homepage = https://github.com/facebook/folly; + homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 229eca5e5972..fc27f3a2c6b5 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -7,15 +7,12 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay -let baseName = "libaacs"; - version = "0.8.1"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "libaacs-${version}"; + version = "0.8.1"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2"; sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm"; }; @@ -24,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = https://www.videolan.org/developers/libaacs.html; + homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 1f47e5f8dcd4..4531546f33fd 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -7,16 +7,12 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay - -let baseName = "libbdplus"; - version = "0.1.2"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "libbdplus-${version}"; + version = "0.1.2"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2"; sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; }; @@ -25,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ]; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbdplus.html; + homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 729fc27a0d37..c5bf7fd7f982 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -18,12 +18,11 @@ assert withFonts -> freetype != null; # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - baseName = "libbluray"; + name = "libbluray-${version}"; version = "0.9.2"; - name = "${baseName}-${version}"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; }; @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbluray.html; + homepage = "http://www.videolan.org/developers/libbluray.html"; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index cedc376972b6..3b5b8156942d 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 85e32cc1af1f..71b9d2d5c336 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 8065df5c5b52..4efecf30fd5e 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; meta = with stdenv.lib; { - homepage = https://github.com/i-rinat/libvdpau-va-gl; + homepage = "https://github.com/i-rinat/libvdpau-va-gl"; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 0d7115144449..96e2ca872850 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract Cell Data From Excel xls files"; - homepage = http://sourceforge.net/projects/libxls/; + homepage = "http://sourceforge.net/projects/libxls/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 7f4b5ba2e328..f412346456c6 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -2,7 +2,9 @@ , perl, makeWrapper }: stdenv.mkDerivation rec { - name = "opendkim-2.10.3"; + name = "opendkim-${version}"; + version = "2.10.3"; + src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = http://www.opendkim.org/; + homepage = "http://www.opendkim.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 8f886421d55b..5aa1d0350fc7 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://qpdf.sourceforge.net/; + homepage = "http://qpdf.sourceforge.net/"; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.artistic2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 9ea3a54f2b0b..5e16fcb1b547 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - version = "3.12.6"; name = "ipopt-${version}"; + version = "3.12.6"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software package for large-scale nonlinear optimization"; - homepage = https://projects.coin-or.org/Ipopt; + homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index d6dd61db83c0..2beaa616f2d8 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.7.5"; name = "Vc-${version}"; + version = "0.7.5"; src = fetchFromGitHub { owner = "VcDevel"; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 59fadbbbc1f8..9e85ad7413d0 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://vcg.isti.cnr.it/vcglib/install.html; + homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 3a45447119ca..44f57cae7e11 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { - version = "2.5.0"; name = "xlslib-${version}"; + version = "2.5.0"; src = fetchurl { url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = http://sourceforge.net/projects/xlslib/; + homepage = "http://sourceforge.net/projects/xlslib/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index a67d9b8d42e8..91d4155d093d 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Verification script generator for Spin"; - homepage = http://spinroot.com/; + homepage = "http://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 2a1e9232c230..23a9253b6bd4 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source, single-player, role-playing roguelike game"; - homepage = http://crawl.develz.org/; + homepage = "http://crawl.develz.org/"; longDescription = '' Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting in dungeons filled with dangerous and unfriendly monsters diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index c13bfd4d3f2d..57610fb1c1c8 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { rm $out/bin/dwarftherapist ''; - meta = { + meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; - maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ the-kenny abbradar ]; + license = licenses.mit; + platforms = platforms.linux; homepage = "https://github.com/splintermind/Dwarf-Therapist"; }; } diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 89000115f4ab..d5055b40728c 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; - homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; + homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index f03b8dde13e8..a73093ad2fc0 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ioquake3.org/; + homepage = "http://ioquake3.org/"; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index be921bf11892..dd4069e1c11c 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lopenal" ]; meta = with stdenv.lib; { - homepage = http://scorched3d.co.uk/; + homepage = "http://scorched3d.co.uk/"; description = "3D Clone of the classic Scorched Earth"; license = licenses.gpl2Plus; platforms = platforms.linux; # maybe more diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index e07117172ce6..f72307e0172f 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; - homepage = http://powdertoy.co.uk/; + homepage = "http://powdertoy.co.uk/"; platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 46dd24acbb7b..a7352f0a75c4 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = http://www.wesnoth.org/; + homepage = "http://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ kkallio abbradar ]; platforms = platforms.linux; diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index a7e621460b66..ccd5a4778ab4 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = http://www.wesnoth.org/; + homepage = "http://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 492488f675f2..cb78bd3498a9 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Linux; + homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index f4e7ad1f2344..8887237b3046 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://archlinux.org/; + homepage = "https://archlinux.org/"; description = "ipconfig and nfsmount tools for root on NFS, ported from klibc"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 42949a3557a6..10383a13e7e3 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { - version = "0.7.3.2"; name = "pam_pgsql-${version}"; + version = "0.7.3.2"; src = fetchFromGitHub { owner = "pam-pgsql"; diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix index 1a1ba1ad4486..b972192da7a7 100644 --- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://wiki2.dovecot.org/Plugins/Antispam; + homepage = "http://wiki2.dovecot.org/Plugins/Antispam"; description = "An antispam plugin for the Dovecot IMAP server"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index cf616a21e0aa..cc6453e801e6 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://lbzip2.org/; + homepage = "http://lbzip2.org/"; description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index cf28fa051326..8066cdd9bc5a 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for working with Logitech Unifying receivers and devices"; - homepage = https://lekensteyn.nl/logitech-unifying.html; + homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 5e09bb7229f8..591994ddccf6 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/seriyps/NetworkManager-l2tp; + homepage = "https://github.com/seriyps/NetworkManager-l2tp"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 92eba09281ce..dd5278ce4d8a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10077,7 +10077,7 @@ let self = _self // overrides; _self = with self; { # tests fail; look unfinished doCheck = false; meta = { - homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; + homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efdd8e67f965..26bbf15fe515 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1456,7 +1456,7 @@ in { propagatedBuildInputs = with self; [ unidecode regex ]; meta = with stdenv.lib; { - homepage = https://github.com/dimka665/awesome-slugify; + homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; license = licenses.gpl3; platforms = platforms.all; @@ -8698,7 +8698,7 @@ in { }; meta = { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; @@ -8723,7 +8723,7 @@ in { ''; meta = { - homepage = https://launchpad.net/pypolicyd-spf/; + homepage = "https://launchpad.net/pypolicyd-spf/"; description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; @@ -8926,7 +8926,7 @@ in { }; meta = { - homepage = http://bmsi.com/python/milter.html; + homepage = "http://bmsi.com/python/milter.html"; description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; @@ -9081,7 +9081,7 @@ in { }; meta = { - homepage = http://sarge.readthedocs.org/; + homepage = "http://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; platform = platforms.all; @@ -11047,7 +11047,7 @@ in { doCheck = false; meta = { - homepage = http://github.com/miracle2k/flask-assets; + homepage = "https://github.com/maxcountryman/flask-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; @@ -11092,7 +11092,7 @@ in { propagatedBuildInputs = with self; [ flask blinker nose ]; meta = { - homepage = http://packages.python.org/Flask-Principal/; + homepage = "http://packages.python.org/Flask-Principal/"; description = "Identity management for flask"; license = licenses.bsd2; platforms = platforms.all; @@ -11131,7 +11131,7 @@ in { propagatedBuildInputs = with self; [ flask ]; meta = { - homepage = http://github.com/smurfix/flask-script; + homepage = "http://github.com/smurfix/flask-script"; description = "Scripting support for Flask"; license = licenses.bsd3; platforms = platforms.all; @@ -13369,7 +13369,7 @@ in { }; meta = { - homepage = https://github.com/jlhutch/pylru; + homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; license = licenses.gpl2; platforms = platforms.all; From bfad987ee142eb020b548cdb14e941d272c48af3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:53:11 +0300 Subject: [PATCH 043/149] deadbeef-mpris2-plugin: 1.8 -> 1.10 --- pkgs/applications/audio/deadbeef/plugins/mpris2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 12e8b3cccaed..871621d3bb1b 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, deadbeef, glib }: stdenv.mkDerivation rec { - version = "1.8"; name = "deadbeef-mpris2-plugin-${version}"; + version = "1.10"; src = fetchurl { url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1xg880zlxbqz7hs5g7xwc128l08j8c3isn45rdi138hi4fqbyjfi"; + sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75"; }; nativeBuildInputs = [ pkgconfig ]; From c3c460781c6598fa97bf2c18b5f876a9c3d994b2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:53:25 +0300 Subject: [PATCH 044/149] svox: 2016-01-25 -> 2016-10-20 --- pkgs/applications/audio/svox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 90e7d41a97b9..d7072e961635 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "svox-${version}"; - version = "2016-01-25"; + version = "2016-10-20"; src = fetchgit { url = "https://android.googlesource.com/platform/external/svox"; - rev = "dfb9937746b1828d093faf3b1494f9dc403f392d"; - sha256 = "1gkfj5avikzmr2vv8bhf83n15jcbz4phz5j13l0qnh3gjzh4f1bk"; + rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d"; + sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g"; }; postPatch = '' From 748a0d473e8fa33608636db37e82a6e5e9b0964d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:53:40 +0300 Subject: [PATCH 045/149] krita: 3.0 -> 3.0.1.1 --- pkgs/applications/graphics/krita/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index f29d09b8ef7b..fded09545e1f 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, extra-cmake-modules, makeQtWrapper +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, makeQtWrapper , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash @@ -8,12 +8,11 @@ stdenv.mkDerivation rec { name = "krita-${version}"; - version = "3.0"; + version = "3.0.1.1"; - src = fetchgit { - url = "http://phabricator.kde.org/diffusion/KRITA/krita.git"; - rev = "refs/tags/v${version}"; - sha256 = "0aas86667ncp8jz00c8qk7bm26g76l65cysh06wxr8kxbvqynrdn"; + src = fetchurl { + url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; + sha256 = "0v58p9am2gsrgn5nhynvdg1a7v8d9kcsswb1962r8ijszm3fav5k"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; From c05206dbe6c8d95a3983ae5e8d4183f40530e0f6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:53:53 +0300 Subject: [PATCH 046/149] yed: 3.16.1 -> 3.16.2.1 --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 4221b75374cc..d97a970df2a5 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.16.1"; + version = "3.16.2.1"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "0h7ykcpvsikjfap51hpcz6z814riiwyps585j2i1yv9dmsbqdi7j"; + sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 1e331cdc6b60b83b1511f4bf4bc0064ceca75f22 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:54:13 +0300 Subject: [PATCH 047/149] octoprint.sockjs-tornado: 1.0.2 -> 1.0.3 --- pkgs/applications/misc/octoprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 986c8b5130ce..f25f5a532d50 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -16,11 +16,11 @@ let sockjs-tornado = pythonPackages.buildPythonPackage rec { name = "sockjs-tornado-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; }; # This is needed for compatibility with OctoPrint From 83436c61a32eb0a73a20c7d8f19997b4a86806bc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:54:32 +0300 Subject: [PATCH 048/149] octoprint: 1.2.15 -> 1.2.17 --- pkgs/applications/misc/octoprint/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index f25f5a532d50..71705b005453 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -37,13 +37,13 @@ let in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.2.15"; + version = "1.2.17"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "0qfragp7n8m7l5l30s5fz1x7xzini2sdh2y3m1ahs7ay8zp4xk56"; + sha256 = "1di2f5npwsfckx5p2fl23bl5zi75i0aksd9qy4sa3zmw672337fh"; }; # We need old Tornado @@ -67,6 +67,7 @@ in pythonPackages.buildPythonApplication rec { -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ -e 's,markdown>=[^"]*,markdown,g' \ -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ + -e 's,Flask-Login>=[^"]*,Flask-Login,g' \ -e 's,rsa>=[^"]*,rsa,g' \ -e 's,PyYAML>=[^"]*,PyYAML,g' \ setup.py From f6d21e08006f85b5664c6b7c8f19769379141c7e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:54:59 +0300 Subject: [PATCH 049/149] octoprint-plugins.m33-fio: 1.7 -> 1.11 --- .../misc/octoprint/m33-fio-one-library.patch | 41 +++++++++++-------- pkgs/applications/misc/octoprint/plugins.nix | 4 +- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch index 968983696feb..cbfb6111ec51 100644 --- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch @@ -1,18 +1,18 @@ -From 62b4fabd1d4ee7a584a565d48c7eaec6e80fe0bd Mon Sep 17 00:00:00 2001 +From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov -Date: Fri, 12 Aug 2016 23:41:22 +0300 +Date: Wed, 23 Nov 2016 00:40:48 +0300 Subject: [PATCH] Build and use one version of preprocessor library --- - octoprint_m33fio/__init__.py | 66 +----------------------------------------- - shared library source/Makefile | 59 +++---------------------------------- - 2 files changed, 5 insertions(+), 120 deletions(-) + octoprint_m33fio/__init__.py | 67 ++---------------------------------------- + shared library source/Makefile | 62 +++----------------------------------- + 2 files changed, 6 insertions(+), 123 deletions(-) diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index da539f5..b0a17ad 100755 +index f9f84c4..b365024 100755 --- a/octoprint_m33fio/__init__.py +++ b/octoprint_m33fio/__init__.py -@@ -979,71 +979,7 @@ class M33FioPlugin( +@@ -1061,71 +1061,8 @@ class M33FioPlugin( # Check if using shared library or checking if it is usable if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : @@ -81,19 +81,20 @@ index da539f5..b0a17ad 100755 - - # Set shared library - self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib") -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") ++ # Set shared library ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") # Check if shared library was set if self.sharedLibrary : diff --git a/shared library source/Makefile b/shared library source/Makefile -index a43d657..0b254aa 100755 +index 887899b..4c74f5c 100755 --- a/shared library source/Makefile +++ b/shared library source/Makefile -@@ -1,62 +1,11 @@ - # Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 +@@ -1,68 +1,14 @@ +-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 -LIBRARY_NAME = preprocessor +-TARGET_PLATFORM = LINUX64 +LIBRARY_NAME = libpreprocessor - TARGET_PLATFORM = LINUX64 VER = .1 -ifeq ($(TARGET_PLATFORM), LINUX32) @@ -122,19 +123,19 @@ index a43d657..0b254aa 100755 - -ifeq ($(TARGET_PLATFORM), PI) - PROG = $(LIBRARY_NAME)_arm1176jzf-s.so -- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ +- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ - CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - -ifeq ($(TARGET_PLATFORM), PI2) - PROG = $(LIBRARY_NAME)_arm_cortex-a7.so -- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ +- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ - CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - -ifeq ($(TARGET_PLATFORM), ARM7) - PROG = $(LIBRARY_NAME)_arm7.so -- CC = ~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ +- CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ - CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - @@ -151,11 +152,17 @@ index a43d657..0b254aa 100755 - CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) -endif +PROG = $(LIBRARY_NAME).so -+CC = g++ +CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) SRCS = preprocessor.cpp gcode.cpp vector.cpp CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared + + all: +- $(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) ++ $(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) + + clean: + rm -f ../octoprint_m33fio/static/libraries/$(PROG) -- -2.9.2 +2.10.2 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 09f9e654b94c..8f0152457632 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,13 +12,13 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.7"; + version = "1.11"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "14sqvgrpf3zvgycjj7f3m7m2flx06zq4h0yhq4g18av0zbsrv7yp"; + sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl"; }; patches = [ From e28ab857be1d2ed6cc411b513ce3185351ab08b6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:55:17 +0300 Subject: [PATCH 050/149] urxvt-tabbedex: 2016-08-09 -> 2016-08-17 --- .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index 901afab78bca..194bb8397fb5 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "urxvt-tabbedex-2016-08-09"; + name = "urxvt-tabbedex-2016-08-17"; src = fetchFromGitHub { owner = "mina86"; repo = "urxvt-tabbedex"; - rev = "ac220eb3984e151ba14dce08f446bc7bc8ca29a2"; - sha256 = "1b5mff5137jb5ysklsmfp5ql3m4g1z3bdhk0nwhz2hgwz40ap6k8"; + rev = "089d0cb724eeb62fa8a5dfcb00ced7761e794149"; + sha256 = "0a5jrb7ryafj55fgi8fhpy3gmb1xh5j7pbn8p5j5k6s2fnh0g0hq"; }; nativeBuildInputs = [ perl ]; From 1a9ce1d9d0f30cb07ba1d762af99ea76958d91cf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:55:44 +0300 Subject: [PATCH 051/149] tdesktop: 0.10.1 -> 0.10.19 --- .../telegram/tdesktop/default.nix | 117 +++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 60 insertions(+), 61 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 130fe644143e..c07258a78371 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,60 +1,59 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats +{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake +, qtbase, qtimageformats, qtwayland , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 -, libwebp, libunity, dee, libdbusmenu-glib, libva +, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland +, xcbutilrenderutil, icu, libSM, libICE, libproxy -, pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms -, libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16 -, xproto, libX11, inputproto, sqlite, dbus +, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon +, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11 +, inputproto, sqlite, dbus }: let system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - packagedQt = "5.6.0"; + packagedQt = "5.6.2"; # Hacky: split "1.2.3-4" into "1.2.3" and "4" systemQt = (builtins.parseDrvName qtbase.version).name; + qtLibs = [ qtbase qtimageformats qtwayland ]; in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "0.10.1"; + version = "0.10.19"; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "08isxwif6zllglkpd9i7ypxm2s4bibzqris48607bafr88ylksdk"; + sha256 = "1p07kxfmcd90sx9bq046x03h1h807vs0pn64lfghr6m6ln8z44s3"; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "9ce7be9efed501f988bb099956fa63729f2c25ea"; - sha256 = "1wp6lqscpm2byizchm0bj48dg9bga02r9r69ns10zxk0gk0qvvdn"; + rev = "99bb0519f14e23fafb6884fe296d34b6f8bed5c3"; + sha256 = "0z5m3binbl06kk34plmfblhqz6hlnkbnjb93sam0c6c995k3sz82"; }; buildInputs = [ breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk - dee libdbusmenu-glib libva + dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy + libSM libICE # Qt dependencies libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon libpng libjpeg freetype harfbuzz pcre16 xproto libX11 - inputproto sqlite dbus libwebp + inputproto sqlite dbus libwebp wayland ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gyp cmake ]; + + patches = [ "${tgaur}/aur-fixes.diff" ]; enableParallelBuilding = true; - qmakeFlags = [ - "CONFIG+=release" - "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE" - "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" - "INCLUDEPATH+=${breakpad}/include/breakpad" - "QT_TDESKTOP_VERSION=${systemQt}" - ]; - - qtSrcs = [ qtbase.src qtimageformats.src ]; + qtSrcs = builtins.map (x: x.src) qtLibs; + qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs); qtPatches = qtbase.patches; buildCommand = '' @@ -62,15 +61,23 @@ in stdenv.mkDerivation rec { cd "$sourceRoot" patchPhase - sed -i 'Telegram/Telegram.pro' \ - -e 's,CUSTOM_API_ID,,g' \ - -e 's,/usr,/does-not-exist,g' \ - -e 's, -flto,,g' \ - -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \ - -e 's, -static-libstdc++,,g' \ - -e '/LIBS += .*libxkbcommon.a/d' - export qmakeFlags="$qmakeFlags QT_TDESKTOP_PATH=$PWD/../qt" + sed -i Telegram/gyp/Telegram.gyp \ + -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g' + + sed -i Telegram/gyp/telegram_linux.gypi \ + -e 's,/usr,/does-not-exist,g' \ + -e 's,-flto,,g' + + sed -i Telegram/gyp/qt.gypi \ + -e 's,${packagedQt},${systemQt},g' + + gypFlagsArray=( + "-Dlinux_path_qt=$PWD/../qt" + "-Dlinux_lib_ssl=-lssl" + "-Dlinux_lib_crypto=-lcrypto" + "-Dlinux_lib_icu=-licuuc -licutu -licui18n" + ) export QMAKE=$PWD/../qt/bin/qmake ( mkdir -p ../Libraries @@ -79,7 +86,7 @@ in stdenv.mkDerivation rec { tar -xaf $i done cd qtbase-* - # This patch is outdated but the fixes doesn't feel very important + # This patch is often outdated but the fixes doesn't feel very important patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true for i in $qtPatches; do patch -p1 < $i @@ -89,8 +96,8 @@ in stdenv.mkDerivation rec { export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \ -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ - -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \ - -openssl-linked -dbus-linked -system-sqlite -verbose -no-gtkstyle \ + -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \ + -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \ ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \ -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2" export dontAddPrefix=1 @@ -101,39 +108,29 @@ in stdenv.mkDerivation rec { buildPhase make install ) - - ( cd qtimageformats-* - $QMAKE - buildPhase - make install - ) + for i in $qtNames; do + ( cd $i-* + $QMAKE + buildPhase + make install + ) + done ) - ( mkdir -p Linux/obj/codegen_style/Debug - cd Linux/obj/codegen_style/Debug - $QMAKE $qmakeFlags ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro - buildPhase + ( cd Telegram/gyp + gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake ) - ( mkdir -p Linux/obj/codegen_numbers/Debug - cd Linux/obj/codegen_numbers/Debug - $QMAKE $qmakeFlags ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro - buildPhase - ) - ( mkdir -p Linux/DebugIntermediateLang - cd Linux/DebugIntermediateLang - $QMAKE $qmakeFlags ../../Telegram/MetaLang.pro + + ( cd out/Release + export ASM=$(type -p gcc) + cmake . + # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry. + buildPhase || true + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h" buildPhase ) - ( mkdir -p Linux/ReleaseIntermediate - cd Linux/ReleaseIntermediate - $QMAKE $qmakeFlags ../../Telegram/Telegram.pro - pattern="^PRE_TARGETDEPS +=" - grep "$pattern" "../../Telegram/Telegram.pro" | sed "s/$pattern//g" | xargs make - buildPhase - ) - - install -Dm755 Linux/Release/Telegram $out/bin/telegram-desktop + install -Dm755 out/Release/Telegram $out/bin/telegram-desktop mkdir -p $out/share/applications $out/share/kde4/services sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551b8eaba85c..ae90f5832c79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14798,7 +14798,9 @@ in taskserver = callPackage ../servers/misc/taskserver { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + inherit (pythonPackages) gyp; + }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; From 79b0a9bf39846d551554960c8d3415543730a947 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:55:57 +0300 Subject: [PATCH 052/149] avidemux: 2.6.12 -> 2.6.15 --- pkgs/applications/video/avidemux/default.nix | 4 ++-- .../video/avidemux/dynamic_install_dir.patch | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 6b20ce8870d7..01687b588677 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -14,11 +14,11 @@ }: let - version = "2.6.12"; + version = "2.6.15"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn"; + sha256 = "0mr2nll81ki9d1s68klhm19jmr15450wjaws1p0b0y2qqwyrprdh"; }; common = { diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/pkgs/applications/video/avidemux/dynamic_install_dir.patch index f2f963e51694..803cde02ec2e 100644 --- a/pkgs/applications/video/avidemux/dynamic_install_dir.patch +++ b/pkgs/applications/video/avidemux/dynamic_install_dir.patch @@ -1,12 +1,12 @@ -diff -ru3 avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp ---- avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-25 15:26:00.368213627 +0300 -+++ avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-26 02:32:56.163550537 +0300 -@@ -393,7 +393,7 @@ - - return ADM_getRelativePath(buffer, base1, base2, base3); - #else -- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3); -+ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3); - #endif - } - +diff -ru3 avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp +--- avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:13:41.406566362 +0300 ++++ avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:14:33.433566147 +0300 +@@ -92,7 +92,7 @@ + + char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3) + { +- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3); ++ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3); + } + const std::string ADM_getI8NDir(const std::string &flavor) + { From a5f972fa73ab0daeb19e47a4f0db43ee0a27e2d2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:56:15 +0300 Subject: [PATCH 053/149] xits-math: build from source --- pkgs/data/fonts/xits-math/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 8e834d79061f..12f8c1c741e9 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, python2Packages, fontforge }: stdenv.mkDerivation rec { name = "xits-math-${version}"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg"; }; - phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]); + + postPatch = '' + rm *.otf + ''; installPhase = '' mkdir -p $out/share/fonts/opentype From 396bc049c0cdd9eb40aafdcdbf19e7ebcbb284c1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:56:51 +0300 Subject: [PATCH 054/149] cppzmq: 2016-07-18 -> 2016-11-16 --- pkgs/development/libraries/cppzmq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 22c8633f0da5..b1860872df36 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "2016-07-18"; + version = "2016-11-16"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; - rev = "92d2af6def80a01b76d5e73f073c439ad00ab757"; - sha256 = "0lnwh314hh5ifad2sa2nz1g1ld1jc4vplm7clyvx304sjjvbvl27"; + rev = "8b52a6ffacce27bac9b81c852b81539a77b0a6e5"; + sha256 = "12accjyjzfw1wqzbj1qn6q99bj5ba05flsvbanyzflr3b4971s4p"; }; installPhase = '' From eddd7c3da20804169640be615a12a7dbef3aa043 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:57:27 +0300 Subject: [PATCH 055/149] folly: 2016.08.08.00 -> 2016.11.21.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 67a47eeaab0f..1e070ca25995 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2016.08.08.00"; + version = "2016.11.21.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0f9xdi8w2mbn6gxjfvpzh8i22ca8p11a2ss6qkw31yhdgd3s9087"; + sha256 = "1f7j73avj00mmzz8wyh9rl1k9i0cvk77d0nf9c80vzr2zfk9f31x"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From 31a02c14f38cafb8c01dfc54bc545370d8e22728 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:57:40 +0300 Subject: [PATCH 056/149] libburnia: 1.4.4 -> 1.4.6 --- pkgs/development/libraries/libburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index 3b5b8156942d..5738245a0bd1 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libburn-${version}"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "053x1sj6r5pj5396g007v6l0s7942cy2mh5fd3caqx0jdw6h9xqv"; + sha256 = "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx"; }; meta = with stdenv.lib; { From 8e72dc3d468bd7c6dbdecf73c315ba90ef6c3926 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:58:04 +0300 Subject: [PATCH 057/149] libisofs: 1.4.4 -> 1.4.6 --- pkgs/development/libraries/libisofs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 71b9d2d5c336..8885092d0e7d 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "1zdx56k847c80ds5yf40hh0a26lkqrc0v11r589dqlm6xvzg0614"; + sha256 = "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql"; }; buildInputs = [ attr zlib ]; From 9b4e170f72db7d7239249a7048fe9b0d1e17a728 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 17:58:19 +0300 Subject: [PATCH 058/149] libproxy: add networkmanager and PAC support --- pkgs/development/libraries/libproxy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 36c486ce53d2..97929d29b377 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, glib }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +, dbus, networkmanager, spidermonkey_1_8_5 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -14,9 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs nativeBuildInputs = [ pkgconfig cmake ]; - propagatedBuildInputs = [ zlib ] - # now some optional deps, but many more are possible - ++ [ glib ]; + + buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ]; meta = with stdenv.lib; { platforms = platforms.linux; From e0c500e6285835c95d8e88aff0f3a164d0c86e17 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:02:08 +0300 Subject: [PATCH 059/149] libvdpau-va-gl: 0.4.0 -> 0.4.2 --- pkgs/development/libraries/libvdpau-va-gl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 4efecf30fd5e..ae2492beba6b 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libvdpau-va-gl-${version}"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "i-rinat"; repo = "libvdpau-va-gl"; rev = "v${version}"; - sha256 = "1y511jxs0df1fqzjcvb6zln7nbmchv1g6z3lw0z9nsf64ziycj8k"; + sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 91fd6b04aaefaa08dca97b5cfdfaccd9ade359ab Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:02:30 +0300 Subject: [PATCH 060/149] libquvi: specify glib dependency --- pkgs/applications/video/quvi/library.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 3fa426d9f6f9..26e0d9479541 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt}: +{ stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { name = "libquvi-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ]; + buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { description = "Web video downloader"; From ca26c4e45cf2e32bfa89353d00c242c828a2eaa2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:03:08 +0300 Subject: [PATCH 061/149] qt56: 5.6.1 -> 5.6.2 --- pkgs/development/libraries/qt-5/5.6/fetch.sh | 4 +- .../libraries/qt-5/5.6/qtbase/default.nix | 1 - pkgs/development/libraries/qt-5/5.6/srcs.nix | 282 +++++++++--------- 3 files changed, 139 insertions(+), 148 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh index b5b76d3e6740..3aa539cda033 100644 --- a/pkgs/development/libraries/qt-5/5.6/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.6/fetch.sh @@ -1,3 +1,3 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/ \ - http://download.qt.io/community_releases/5.6/5.6.1/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/ \ + http://download.qt.io/community_releases/5.6/5.6.2/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index bb245548d5b9..cb63f0b50f53 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -115,7 +115,6 @@ stdenv.mkDerivation { -widgets -opengl desktop -qml-debug - -nis -iconv -icu -pch diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix index c6deca1150dc..3f6c3ae66997 100644 --- a/pkgs/development/libraries/qt-5/5.6/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix @@ -1,269 +1,261 @@ -# DO NOT EDIT! This file is generated automatically by manifest.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { - qtwebkit = { - version = "5.6.1"; - src = fetchurl { - url = "${mirror}/community_releases/5.6/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz"; - sha256 = "1akjqvjavl0vn8a8hnmvqc26mf4ljvwjdm07x6dmmdnjzajvzkzm"; - name = "qtwebkit-opensource-src-5.6.1.tar.xz"; - }; - }; qt3d = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qt3d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1nxpcjsarcp40m4y18kyy9a5md56wnafll03j8c6q19rba9bcwbf"; - name = "qt3d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz"; + sha256 = "0hg91j3brsbh75why6j0527z5myk1r9s7q9z45q6qp0gdvdqc5x2"; + name = "qt3d-opensource-src-5.6.2.tar.xz"; }; }; qtactiveqt = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtactiveqt-opensource-src-5.6.1-1.tar.xz"; - sha256 = "00bj9c0x3ax34gpibaap3wpchkv4wapsydiz01fb0xzs1fy94nbf"; - name = "qtactiveqt-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtactiveqt-opensource-src-5.6.2.tar.xz"; + sha256 = "1a3mai3d0l2a8gyjkjng1r7y9y27yppxc5rdzxsgc4kq58rflghw"; + name = "qtactiveqt-opensource-src-5.6.2.tar.xz"; }; }; qtandroidextras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtandroidextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0xhm4053y9hqnz5y3y4rwycniq0mb1al1rds3jx636211y039xhk"; - name = "qtandroidextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtandroidextras-opensource-src-5.6.2.tar.xz"; + sha256 = "164mkmzswqwjzhs9cwdq361yb60bx6is37740jglrjxgss1phmhr"; + name = "qtandroidextras-opensource-src-5.6.2.tar.xz"; }; }; qtbase = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtbase-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0fbwprlhqmdyhh2wb9122fcpq7pbil530iak482b9sy5gqs7i5ij"; - name = "qtbase-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz"; + sha256 = "11z73qgzbyj1cwjdkng94cz46wam8frsw0bs705gx0nrqn9swvig"; + name = "qtbase-opensource-src-5.6.2.tar.xz"; }; }; qtcanvas3d = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "13127xws6xfkkk1x617bgdzl96l66nd0v82dibdnxnpfa702rl44"; - name = "qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz"; + sha256 = "1bd01ag2p1445ffckyyi3sxi4vssflp95kmbrj99dy83dc04sn6p"; + name = "qtcanvas3d-opensource-src-5.6.2.tar.xz"; }; }; qtconnectivity = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtconnectivity-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0sr6sxp0q45pacs25knr28139xdrphcjgrwlksdhdpsryfw19mzi"; - name = "qtconnectivity-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz"; + sha256 = "1ygdmd7fh2fhhyv58zxl1lglr85iajs9gv6c0pv64gbhw0ijjrqv"; + name = "qtconnectivity-opensource-src-5.6.2.tar.xz"; }; }; qtdeclarative = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-opensource-src-5.6.1-1.tar.xz"; - sha256 = "094gx5mzqzcga97y7ihf052b6i5iv512lh7m0702m5q94nsn1pqw"; - name = "qtdeclarative-opensource-src-5.6.1-1.tar.xz"; - }; - }; - qtdeclarative-render2d = { - version = "5.6.1-1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0kqmb3792rg9fx12m64x87ahcrh0g9krg77mv0ssx3g4gvsgcibc"; - name = "qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz"; + sha256 = "1nh989jp2gdp5bxa62n3g1whs2pzrl44sh4ca6x9icrnpj3ak1h0"; + name = "qtdeclarative-opensource-src-5.6.2.tar.xz"; }; }; qtdoc = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdoc-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1yf3g3h72ndrp88h8g21mzgqdz2ixwkvpav03i3jnrgy2pf7nssp"; - name = "qtdoc-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtdoc-opensource-src-5.6.2.tar.xz"; + sha256 = "0s78c5bpj4lcx63x2y5a6scxv6sszvs4dlj4qy86jkwmm7m1wsgn"; + name = "qtdoc-opensource-src-5.6.2.tar.xz"; }; }; qtenginio = { - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtenginio-opensource-src-1.6.1.tar.xz"; - sha256 = "17hsrhzy9zdvpbzja45aac6jr7jzzjl206vma96b9w73rbgxa50f"; - name = "qtenginio-opensource-src-1.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtenginio-opensource-src-1.6.2.tar.xz"; + sha256 = "1hywpl1x9lbpqqjdw5wwwhx0gg0j7y260iqaz47anxaa466w7zwh"; + name = "qtenginio-opensource-src-1.6.2.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0560800fa9sd6dw1vk0ia9vq8ywdrwch2cpsi1vmh4iyxgwfr71b"; - name = "qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz"; + sha256 = "0pp71gqfgbl5ra15jp8kr4p3sl9gs7cv4x6vjv9i5a3j5jn0z7qy"; + name = "qtgraphicaleffects-opensource-src-5.6.2.tar.xz"; }; }; qtimageformats = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtimageformats-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1p98acvsm3azka2by1ph4gdb31qbnndrr5k5wns4xk2d760y8ifc"; - name = "qtimageformats-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz"; + sha256 = "1r27s5dy9c016ia5xgpbs7nfvmmrnd051dmsrv5r7hyscaz57cag"; + name = "qtimageformats-opensource-src-5.6.2.tar.xz"; }; }; qtlocation = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtlocation-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0my4pbcxa58yzvdh65l5qx99ln03chjr5c3ml5v37wfk7nx23k69"; - name = "qtlocation-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz"; + sha256 = "0fnj51f6fll1z1xsfp3g73al70hsg993gh1k7aa0y8nhdqh9b2bs"; + name = "qtlocation-opensource-src-5.6.2.tar.xz"; }; }; qtmacextras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmacextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "07j26d5g7av4c6alggg5hssqpvdh555zmn1cpr8xrhx1hpbdnaas"; - name = "qtmacextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtmacextras-opensource-src-5.6.2.tar.xz"; + sha256 = "05chq7dqgvlfzpqf1y9inxp0kx6hfzwbc5kswpp6gsnsyfln6ll5"; + name = "qtmacextras-opensource-src-5.6.2.tar.xz"; }; }; qtmultimedia = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmultimedia-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0paffx0614ivjbf87lr9klpbqik6r1pzbc14l41np6d9jv3dqa2f"; - name = "qtmultimedia-opensource-src-5.6.1-1.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.6.1-1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtquickcontrols2-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0wfa2xcqsvx3zihd5nb9f9qhq0xn14c03sw1qdymzfsryqwmk4ac"; - name = "qtquickcontrols2-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz"; + sha256 = "1bwcpc1s6yjvgpqbn22k4mdfjy9lhs89bbzwlgj5psy0qskp16nb"; + name = "qtmultimedia-opensource-src-5.6.2.tar.xz"; }; }; qtquickcontrols = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtquickcontrols-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0cjzf844r7wi32ssc9vbw1a2m9hnr8c0i1p7yyljy962ifplf401"; - name = "qtquickcontrols-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz"; + sha256 = "0b0h8svlzvq23kcmam7ng697bzcq4x3haymmn7gj40p15clz5l2y"; + name = "qtquickcontrols-opensource-src-5.6.2.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.6.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz"; + sha256 = "1hgydll95by0rvfpv3sprxq0hkdrpacynaaq2jzaw0a7m881gp09"; + name = "qtquickcontrols2-opensource-src-5.6.2.tar.xz"; }; }; qtscript = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtscript-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1gini9483flqa9q4a4bl81bh7g5s408bycqykqhgbklmfd29y5lx"; - name = "qtscript-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz"; + sha256 = "03hi2j64l0mgs8p0w1jaz53zsa4lfpbgskydaxxiiqnaf6rgcvp0"; + name = "qtscript-opensource-src-5.6.2.tar.xz"; }; }; qtsensors = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsensors-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0kcrvf6vzn6g2v2m70f9r3raalzmfp48rwjlqhss3w84jfz3y04r"; - name = "qtsensors-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz"; + sha256 = "09rl0njijl3cgh6l3pfij2rhnsg10axkl37llkbz1wmlma0r1057"; + name = "qtsensors-opensource-src-5.6.2.tar.xz"; }; }; qtserialbus = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialbus-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0li4g70s5vfb517ag0d6405ymsknvvny1c8x66w7qs8a8mnk1jq5"; - name = "qtserialbus-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz"; + sha256 = "09pqr9f6kl3wq4858vksbzxnrrnqxblivmayjf126lwi2q4n14mk"; + name = "qtserialbus-opensource-src-5.6.2.tar.xz"; }; }; qtserialport = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialport-opensource-src-5.6.1-1.tar.xz"; - sha256 = "135cbgghxk0c6dblmyyrw6znfb9m8sac9hhyc2dm6vq7vzy8id52"; - name = "qtserialport-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz"; + sha256 = "0xpkjkn6w0g3p7hmm12b2c96f7q98rmk2dcn321x4arcmldjhxmg"; + name = "qtserialport-opensource-src-5.6.2.tar.xz"; }; }; qtsvg = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsvg-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1w0jvhgaiddafcms2nv8wl1klg07lncmjwm1zhdw3l6rxi9071sw"; - name = "qtsvg-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz"; + sha256 = "0kmwr3fphs7ddgxmqzy53f8p2hbp1gfmjdaig5vswc8vcszn38zp"; + name = "qtsvg-opensource-src-5.6.2.tar.xz"; }; }; qttools = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttools-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0haic027a2d7p7k8xz83fbvci4a4dln34360rlwgy7hlyy5m4nip"; - name = "qttools-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz"; + sha256 = "1dz1i5wwhgb9li095mnmc33mwpbd8nf7sdrc2x3pl9c6hwqv8ayv"; + name = "qttools-opensource-src-5.6.2.tar.xz"; }; }; qttranslations = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttranslations-opensource-src-5.6.1-1.tar.xz"; - sha256 = "03sdzci4pgq6lmxwn25v8x0z5x8g7zgpq2as56dqgj7vp6cvhn8m"; - name = "qttranslations-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qttranslations-opensource-src-5.6.2.tar.xz"; + sha256 = "08d4xyk7njkdbd3m48dzmvdm8ma3s4x8h4jm1ip20wqngi23nybx"; + name = "qttranslations-opensource-src-5.6.2.tar.xz"; }; }; qtwayland = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwayland-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1fnvgpi49ilds3ah9iizxj9qhhb5rnwqd9h03bhkwf0ydywv52c4"; - name = "qtwayland-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwayland-opensource-src-5.6.2.tar.xz"; + sha256 = "11kciqnqfyzjfnx1m666g35v98jdazsg083h9fv2g5kiyjck2p03"; + name = "qtwayland-opensource-src-5.6.2.tar.xz"; }; }; qtwebchannel = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebchannel-opensource-src-5.6.1-1.tar.xz"; - sha256 = "10kys3ppjkj60fs1s335fdcpdsbxsjn6ibvm6zph9gqbncabd2l7"; - name = "qtwebchannel-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz"; + sha256 = "0lhskzqcijz9x6h8p80ff5dd6ni7zqm23nzljdqbggaibzpzs3kh"; + name = "qtwebchannel-opensource-src-5.6.2.tar.xz"; }; }; qtwebengine = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebengine-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0k708a34zwkj6hwx3vv5kdvnv3lfgb0iad44zaim5gdpgcir03n8"; - name = "qtwebengine-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebengine-opensource-src-5.6.2.tar.xz"; + sha256 = "0h4pyc7r2fx8qsiw3663jd1hg1fid5yv7wil06njpcm8w541c2ig"; + name = "qtwebengine-opensource-src-5.6.2.tar.xz"; + }; + }; + qtwebkit = { + version = "5.6.2"; + src = fetchurl { + url = "${mirror}/community_releases/5.6/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz"; + sha256 = "0rirszy092pmdvy4vzqkk4p9wwxv8qx4zkp84rxkd5ah3j5np2jj"; + name = "qtwebkit-opensource-src-5.6.2.tar.xz"; }; }; qtwebsockets = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebsockets-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1fz0x8570zxc00a22skd848svma3p2g3xyxj14jq10559jihqqil"; - name = "qtwebsockets-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz"; + sha256 = "0ddsnnp3sn423ryqqa1060cqlbdcp7ncj3zhabifaswfzyxx9n9w"; + name = "qtwebsockets-opensource-src-5.6.2.tar.xz"; }; }; qtwebview = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebview-opensource-src-5.6.1-1.tar.xz"; - sha256 = "19954snfw073flxn0qk5ayxyzk5x6hwhpg4kn4nrl1zygsw3y49l"; - name = "qtwebview-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebview-opensource-src-5.6.2.tar.xz"; + sha256 = "1mjix4w71x1w86ykcdhsl7gg7xv9dn2pw6yiaxrp6pxvvk73cyjs"; + name = "qtwebview-opensource-src-5.6.2.tar.xz"; }; }; qtwinextras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwinextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "03zkwqrix2nfqkwfn8lsrpgahzx1hv6p1qbvhkqymzakkzjjncgg"; - name = "qtwinextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwinextras-opensource-src-5.6.2.tar.xz"; + sha256 = "1s375b1bf8cqs73mg8chwvj0npr01hpyrwv75srqnxkp61avi1gr"; + name = "qtwinextras-opensource-src-5.6.2.tar.xz"; }; }; qtx11extras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtx11extras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0yj5yg2dqkrwbgbicmk2rpqsagmi8dsffkrprpsj0fmkx4awhv5y"; - name = "qtx11extras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz"; + sha256 = "1v8cnhas3rynqz7b8wryry2qhblrnmnd3v39gdki1hzfz8fdxzvi"; + name = "qtx11extras-opensource-src-5.6.2.tar.xz"; }; }; qtxmlpatterns = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1966rrk7f6c55k57j33rffdjs77kk4mawrnnl8yv1ckcirxc3np1"; - name = "qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz"; + sha256 = "1k428wj8iffm6rrbvwbw0hksr99xqsxww8iahbk8r38qpzpg6vbw"; + name = "qtxmlpatterns-opensource-src-5.6.2.tar.xz"; }; }; } From d9fba1d0a3bab6fee56456f646c4db9c3b15d99a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:03:35 +0300 Subject: [PATCH 062/149] vc: 1.2.0 -> 1.3.0 --- pkgs/development/libraries/vc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index aff0795daec0..c37ff7331118 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "1.2.0"; name = "Vc-${version}"; + version = "1.3.0"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "0qlfvcxv3nmf5drz5bc9kynaljr513pbn7snwgvghm150skmkpfl"; + sha256 = "18vi92xxg0ly0fw4v06fwls11rahmg5z8xf65jxxrbgf37vc1wxi"; }; nativeBuildInputs = [ cmake ]; From 7e1d5eb17df4e4abad5449e41f0a6afdb92d0f0a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:04:18 +0300 Subject: [PATCH 063/149] crawl: 0.18.1 -> 0.19.1 --- pkgs/games/crawl/crawl_purify.patch | 49 +++++++++++++---------------- pkgs/games/crawl/default.nix | 25 ++++++++------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index bfd79844bcb6..766b633057d3 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,6 +1,6 @@ -diff -ru3 crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile crawl-ref-0.18.1-src/crawl-ref/source/Makefile ---- crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.18.1-src/crawl-ref/source/Makefile 2016-09-04 17:25:54.310929928 +0300 +diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile +--- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile 2016-11-23 15:37:15.303077886 +0300 @@ -285,7 +285,7 @@ LIBZ := contrib/install/$(ARCH)/lib/libz.a @@ -10,27 +10,22 @@ diff -ru3 crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile crawl-ref-0.18.1-sr else # This is totally wrong, works only with some old-style setups, and # on some architectures of Debian/new FHS multiarch -- excluding, for -@@ -957,9 +957,9 @@ - SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\ - {\ - fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ -- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ -+ for dir in ${dejavu_fonts}/share/fonts;\ - do [ -d $$dir ] && echo $$dir; done;\ -- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) -+ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null) - ifneq (,$(SYS_PROPORTIONAL_FONT)) - ifeq (,$(COPY_FONTS)) - DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" -@@ -982,9 +982,9 @@ - SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\ - {\ - fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ -- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ -+ for dir in ${dejavu_fonts}/share/fonts;\ - do [ -d $$dir ] && echo $$dir; done;\ -- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) -+ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null) - ifneq (,$(SYS_MONOSPACED_FONT)) - ifeq (,$(COPY_FONTS)) - DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" +diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font +--- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300 +@@ -1,6 +1,6 @@ + #! /bin/sh + +-FONTDIRS="/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts" ++FONTDIRS="${fontsPath}/share/fonts" + + name=$1 + [ "$name" ] || { echo "Usage: $0 " >&2; exit 100; } +@@ -11,6 +11,6 @@ + for dir in $FONTDIRS; do + [ -d "$dir" ] && echo "$dir" + done +- } | xargs -I% find % \( -type f -o -type l \) -iname "$name" -print \ ++ } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \ + | head -n1 + } 2>/dev/null diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 23a9253b6bd4..dc84b18547bd 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush +{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses +, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush, advancecomp , tileMode ? false }: stdenv.mkDerivation rec { - name = "crawl-${version}" + (if tileMode then "-tiles" else ""); - version = "0.18.1"; + name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; + version = "0.19.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1cg5mxhx0lfhadls6n8avcpkjx08nqf1y085li97zqxl3gjaj64j"; + sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96"; }; patches = [ ./crawl_purify.patch ]; - nativeBuildInputs = [ pkgconfig which perl pngcrush ]; + nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] - ++ stdenv.lib.optionals tileMode - [ libpng SDL2 SDL2_image freetype mesa ]; + ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype mesa ]; preBuild = '' cd crawl-ref/source @@ -33,11 +32,13 @@ stdenv.mkDerivation rec { rm -rf contrib ''; - makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" - "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] - ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; + fontsPath = lib.optionalString tileMode dejavu_fonts; - postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else ""; + makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" + "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" + ] ++ lib.optional tileMode "TILES=y"; + + postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles"; enableParallelBuilding = true; From a6fd30822f229e316352be614d53400ee851884d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:04:57 +0300 Subject: [PATCH 064/149] dwarf-fortress-packages.dfhack: 0.43.03-r1 -> 0.43.05-alpha2 --- pkgs/games/dwarf-fortress/default.nix | 6 +- pkgs/games/dwarf-fortress/dfhack/default.nix | 14 +-- .../dfhack/use-system-libraries.patch | 85 ++++++++++++------- pkgs/games/dwarf-fortress/wrapper/dfhack.in | 2 +- 4 files changed, 64 insertions(+), 43 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 64109279060a..4006880ed828 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -7,9 +7,9 @@ let self = rec { dwarf-fortress-original = callPackage ./game.nix { }; - dfhack = callPackage_i686 ./dfhack { - inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT; - protobuf = with pkgsi686Linux; protobuf.override { + dfhack = callPackage ./dfhack { + inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; + protobuf = with pkgs; protobuf.override { stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; }; }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 176971920071..b587d049fd0c 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,12 +5,15 @@ }: let - dfVersion = "0.43.03"; - version = "${dfVersion}-r1"; + dfVersion = "0.43.05"; + # version = "${dfVersion}-r1"; + # rev = "refs/tags/${version}"; + version = "${dfVersion}-alpha2"; + rev = "13eb5e702beb6d8e40c0e17be64cda9a8d9d1efb"; + sha256 = "18i8qfhhfnfrpa519akwagn73q2zns1pry2sdfag63vffxh60zr5"; - rev = "refs/tags/${version}"; # revision of library/xml submodule - xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0"; + xmlRev = "84f6e968a9ec5515f9dbef96b445e3fc83f83e8b"; fakegit = writeScriptBin "git" '' #! ${stdenv.shell} @@ -35,8 +38,7 @@ in stdenv.mkDerivation rec { # Beware of submodules src = fetchgit { url = "https://github.com/DFHack/dfhack"; - inherit rev; - sha256 = "0m5kqpaz0ypji4c32w0hhbsicvgvnjh56pqvq7af6pqqnyg1nzcx"; + inherit rev sha256; }; patches = [ ./use-system-libraries.patch ]; diff --git a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch index e33fec9f87ec..bc73d114d828 100644 --- a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch +++ b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch @@ -1,8 +1,7 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 956edfc..fb0e6bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -160,8 +160,6 @@ ELSEIF(MSVC) +diff -ru3 dfhack-ae59b4f/CMakeLists.txt dfhack-ae59b4f-new/CMakeLists.txt +--- dfhack-ae59b4f/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/CMakeLists.txt 2016-11-23 15:21:56.134538785 +0300 +@@ -202,8 +202,6 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od") ENDIF() @@ -11,9 +10,9 @@ index 956edfc..fb0e6bc 100644 ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL) if(APPLE) -@@ -182,10 +180,8 @@ else() - set(ZLIB_ROOT /usr/lib/i386-linux-gnu) +@@ -297,10 +295,8 @@ endif() + find_package(ZLIB REQUIRED) -include_directories(depends/protobuf) include_directories(depends/lua/include) @@ -22,10 +21,9 @@ index 956edfc..fb0e6bc 100644 # Support linking against external tinyxml # If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml" -diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt -index d8442b1..b47dc2a 100644 ---- a/depends/CMakeLists.txt -+++ b/depends/CMakeLists.txt +diff -ru3 dfhack-ae59b4f/depends/CMakeLists.txt dfhack-ae59b4f-new/depends/CMakeLists.txt +--- dfhack-ae59b4f/depends/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/depends/CMakeLists.txt 2016-11-23 15:21:56.134538785 +0300 @@ -1,7 +1,6 @@ #list depends here. add_subdirectory(lua) @@ -34,7 +32,7 @@ index d8442b1..b47dc2a 100644 # Don't build tinyxml if it's being externally linked against. if(NOT TinyXML_FOUND) -@@ -9,7 +8,6 @@ if(NOT TinyXML_FOUND) +@@ -9,7 +8,6 @@ endif() add_subdirectory(tthread) @@ -42,46 +40,67 @@ index d8442b1..b47dc2a 100644 # build clsocket static and only as a dependency. Setting those options here overrides its own default settings. OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) -diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index d3e3480..5d4b572 100644 ---- a/library/CMakeLists.txt -+++ b/library/CMakeLists.txt -@@ -223,10 +223,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS}) +diff -ru3 dfhack-ae59b4f/library/CMakeLists.txt dfhack-ae59b4f-new/library/CMakeLists.txt +--- dfhack-ae59b4f/library/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/library/CMakeLists.txt 2016-11-23 15:22:24.995519136 +0300 +@@ -236,14 +236,14 @@ ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} + OUTPUT ${PROJECT_PROTO_TMP_FILES} - COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ + COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ - --cpp_out=dllexport_decl=DFHACK_EXPORT:${CMAKE_CURRENT_SOURCE_DIR}/proto/ + --cpp_out=dllexport_decl=DFHACK_EXPORT:${CMAKE_CURRENT_SOURCE_DIR}/proto/tmp/ ${PROJECT_PROTOS} + COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/depends/copy-if-different.pl + ${PROJECT_PROTO_TMP_FILES} + ${CMAKE_CURRENT_SOURCE_DIR}/proto/ + COMMENT "Generating core protobufs" - DEPENDS protoc-bin ${PROJECT_PROTOS} + DEPENDS ${PROJECT_PROTOS} ) - # Merge headers into sources -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index c24b940..afeb888 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -47,11 +47,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}") + ADD_CUSTOM_TARGET(generate_proto_core DEPENDS ${PROJECT_PROTO_TMP_FILES}) +diff -ru3 dfhack-ae59b4f/plugins/CMakeLists.txt dfhack-ae59b4f-new/plugins/CMakeLists.txt +--- dfhack-ae59b4f/plugins/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/plugins/CMakeLists.txt 2016-11-23 15:22:47.291503960 +0300 +@@ -60,7 +60,7 @@ ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} + OUTPUT ${PROJECT_PROTO_TMP_FILES} - COMMAND protoc-bin -I=${dfhack_SOURCE_DIR}/library/proto/ + COMMAND protoc -I=${dfhack_SOURCE_DIR}/library/proto/ -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ - --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ + --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/tmp/ ${PROJECT_PROTOS} +@@ -68,7 +68,7 @@ + ${PROJECT_PROTO_TMP_FILES} + ${CMAKE_CURRENT_SOURCE_DIR}/proto/ + COMMENT "Generating plugin protobufs" - DEPENDS protoc-bin ${PROJECT_PROTOS} + DEPENDS ${PROJECT_PROTOS} ) - add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}) + ADD_CUSTOM_TARGET(generate_proto DEPENDS ${PROJECT_PROTO_TMP_FILES}) -diff --git a/plugins/stockpiles/CMakeLists.txt b/plugins/stockpiles/CMakeLists.txt -index 713c3d6..dd2d4cb 100644 ---- a/plugins/stockpiles/CMakeLists.txt -+++ b/plugins/stockpiles/CMakeLists.txt -@@ -33,8 +33,8 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS}) +diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt +--- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt 2016-11-23 15:29:09.907286546 +0300 +@@ -1,3 +1,4 @@ ++IF(FALSE) + IF (APPLE) + SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib) + SET(RUBYLIB_INSTALL_NAME "libruby.dylib") +@@ -48,6 +49,7 @@ + "482c1c418f4ee1a5f04203eee1cda0ef") + ENDIF() + ENDIF() ++ENDIF() + + IF (APPLE OR UNIX) + SET(RUBYAUTOGEN ruby-autogen-gcc.rb) +diff -ru3 dfhack-ae59b4f/plugins/stockpiles/CMakeLists.txt dfhack-ae59b4f-new/plugins/stockpiles/CMakeLists.txt +--- dfhack-ae59b4f/plugins/stockpiles/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/plugins/stockpiles/CMakeLists.txt 2016-11-23 15:21:56.134538785 +0300 +@@ -33,8 +33,8 @@ #Generate sources from our proto files and store them in the source tree ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in index d53769ca4b61..c8d8d287403b 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -8,4 +8,4 @@ done cd "$DF_DIR" LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \ - LD_PRELOAD=$env_dir/hack/libdfhack.so exec $env_dir/libs/Dwarf_Fortress "$@" + LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@" From 809c6f0c982b79837f352e87ef93177bfe7b42bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:05:24 +0300 Subject: [PATCH 065/149] dwarf-fortress-packages.cla-theme: 43.04-v23 -> 43.05-v23 --- pkgs/games/dwarf-fortress/themes/cla.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 3933d62b1d38..d5b6ac6c6865 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cla-theme-${version}"; - version = "43.04-v23"; + version = "43.05-v23"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "0a88jkcli9iq0prg5w0xh1cyms0b7dnc9rdahn7wy7fyakyp7s27"; + sha256 = "1i74lyz7mpfrvh5g7rajxldhw7zddc2kp8f6bgfr3hl5l8ym5ci9"; }; installPhase = '' From ccaec3a88bfedab62c8842ac7a13ac23a8379f1f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:05:38 +0300 Subject: [PATCH 066/149] dwarf-fortress-packages.phoebus-theme: 43.03 -> 43.05c --- pkgs/games/dwarf-fortress/themes/phoebus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 01ae192e75e6..57f00e89b998 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "43.03"; + version = "43.05c"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "1mga5w3mks3bm6qch7azffr51g3q26za7hnas4qmxfs3m56bjav7"; + sha256 = "0wiz9rd5ypibgh8854h5n2xwksfxylaziyjpbp3p1rkm3r7kr4fd"; }; installPhase = '' From 798f8e42262500379f655434746544e963f8daf0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:06:26 +0300 Subject: [PATCH 067/149] ioquake3: 2016-08-11 -> 2016-11-02 --- pkgs/games/quake3/ioquake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index a73093ad2fc0..81077d9461f3 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2016-08-11"; + version = "2016-11-02"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "1cf0b21cda562bade9152958f1525e5ac281ab9c"; - sha256 = "104yrgi9dnfb493pm9wvk2kn80nazcr1nllb5vd7di66jnvcjks0"; + rev = "1c1e1f61f180596c925a4ac0eddba4806d1369cd"; + sha256 = "1sx78hzvcbc05g2ikxcmnm6lq7bhgd86dzxnfzqpibcvgrlgsmy1"; }; nativeBuildInputs = [ which pkgconfig ]; From 0070d0fc9bfa92f56bdc879f5ff3b450afcdb45b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:06:36 +0300 Subject: [PATCH 068/149] wesnoth-dev: 1.13.5 -> 1.13.6 --- pkgs/games/wesnoth/dev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index ccd5a4778ab4..0b335812ff03 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.5"; + version = "1.13.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "15hvf06r7086plwmagh89plcxal2zql8k4mg0yf1zgwjvdz284dx"; + sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1"; }; nativeBuildInputs = [ cmake pkgconfig ]; From e98b91f0e442e4dc6a7e42577ebd293d747c31a5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:06:54 +0300 Subject: [PATCH 069/149] uwsgi: 2.0.13.1 -> 2.0.14 --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index ac2130d2917c..4994894a0388 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.13.1"; + version = "2.0.14"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "0zwdljaljzshrdcqsrr2l2ak2zcmsps4glac2lrg0xmb28phrjif"; + sha256 = "11r829j4fyk7y068arqmwbc9dj6lc0n3l6bn6pr5z0vdjbpx3cr1"; }; nativeBuildInputs = [ python3 pkgconfig ]; From a44cfd6e0d31f661174cec3a7dc23bc0fa222389 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:07:04 +0300 Subject: [PATCH 070/149] virtualglLib: 2.5 -> 2.5.1 --- pkgs/tools/X11/virtualgl/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 5707679c03c1..c9530a5cdd98 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; - version = "2.5"; + version = "2.5.1"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l"; + sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; From 3223e61e6be004081aa60205626f261535a6aa7b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:07:19 +0300 Subject: [PATCH 071/149] grub4dos: 0.4.6a-2016-08-06 -> 0.4.6a-2016-11-09 --- pkgs/tools/misc/grub4dos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 7e9b82a6a3f9..fabefb810313 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else abort "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-08-06"; + version = "0.4.6a-2016-11-09"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "99d6ddbe7611f942d2708d77a620d6aa94a284d1"; - sha256 = "0gnllk0qkx6d0azf7v9cr0b23gp577avksz0f4dl3v3ldgi0dksq"; + rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd"; + sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55"; }; nativeBuildInputs = [ nasm ]; From 5a8e60e97d11df39792d3f97126f9921c9418fc4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:07:29 +0300 Subject: [PATCH 072/149] tlp: 0.8 -> 0.9 --- pkgs/tools/misc/tlp/default.nix | 50 +++++++++++++++------------------ 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 1e39ddf481bc..9a2f9b65e8c2 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,45 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, systemd, iw, rfkill, hdparm, ethtool, inetutils -, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils +{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill +, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools +, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux , enableRDW ? false, networkmanager }: let paths = lib.makeBinPath ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools - x86_energy_perf_policy gawk gnugrep coreutils + x86_energy_perf_policy gawk gnugrep coreutils utillinux ] ++ lib.optional enableRDW networkmanager ); in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "19fvk0xz6i2ryf41akk4jg1c4sb4rcyxdl9fr0w4lja7g76d5zww"; + sha256 = "1gwi0h9klhdvqfqvmn297l1vyhj4g9dqvf50lcbswry02mvnd2vn"; }; makeFlags = [ "DESTDIR=$(out)" - "TLP_LIBDIR=/lib" - "TLP_SBIN=/bin" - "TLP_BIN=/bin" + "TLP_SBIN=$(out)/bin" + "TLP_BIN=$(out)/bin" + "TLP_TLIB=$(out)/share/tlp-pm" + "TLP_PLIB=$(out)/lib/pm-utils" + "TLP_ULIB=$(out)/lib/udev" + "TLP_NMDSP=$(out)/etc/NetworkManager/dispatcher.d" + "TLP_SHCPL=$(out)/share/bash-completion/completions" + "TLP_MAN=$(out)/share/man" + "TLP_NO_INIT=1" "TLP_NO_PMUTILS=1" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper file ]; buildInputs = [ perl ]; - installTargets = [ "install-tlp" ] ++ stdenv.lib.optional enableRDW "install-rdw"; + installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw"; postInstall = '' - for i in $out/bin/* $out/lib/udev/tlp-*; do - sed -i "s,/usr/lib/,$out/lib/,g" "$i" - if [[ "$(basename "$i")" = tlp-*list ]]; then + cp -r $out/$out/* $out + rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2) + + for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do + if file "$i" | grep -q Perl; then # Perl script; use wrapProgram wrapProgram "$i" \ --prefix PATH : "${paths}" @@ -48,21 +57,6 @@ in stdenv.mkDerivation rec { sed -i '2iexport PATH=${paths}:$PATH' "$i" fi done - - for i in $out/lib/udev/rules.d/*; do - sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i" - done - - for i in man/*; do - install -D $i $out/share/man/man''${i##*.}/$(basename $i) - done - '' + lib.optionalString enableRDW '' - for i in $out/etc/NetworkManager/dispatcher.d/*; do - sed -i \ - -e "s,/usr/lib/,$out/lib/,g" \ - -e '2iexport PATH=${paths}:$PATH' \ - "$i" - done ''; meta = with stdenv.lib; { From 77a61cabe9f8115f2747ba4941c466a0e2a7a2e9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:07:47 +0300 Subject: [PATCH 073/149] logmein-hamachi: 2.1.0.165 -> 2.1.0.174 --- pkgs/tools/networking/logmein-hamachi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 7b441c72cbf4..74dd91316800 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -10,14 +10,14 @@ let else if stdenv.system == "i686-linux" then "x86" else abort "Unsupported architecture"; sha256 = - if stdenv.system == "x86_64-linux" then "0l8y8z8fqvxrypx3dp83mm3qr9shgpcn5h7x2k2z13gp4aq0yw6g" - else if stdenv.system == "i686-linux" then "00nl442k4pij9fm8inlk4qrcvbnz55fbwf3sm3dgbzvd5jcgsa0f" + if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3" + else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" else abort "Unsupported architecture"; libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { name = "logmein-hamachi-${version}"; - version = "2.1.0.165"; + version = "2.1.0.174"; src = fetchurl { url = "https://www.vpn.net/installers/${name}-${arch}.tgz"; From e5167e8763433e2349bef3125b42d27ee4d5af9d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:08:12 +0300 Subject: [PATCH 074/149] update-resolv-conf: 2016-04-24 -> 2016-09-30 --- pkgs/tools/networking/openvpn/update-resolv-conf.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index f59e70ed3187..186d5109b94a 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, which, systemd }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, systemd }: let - binPath = lib.makeBinPath [ coreutils openresolv which systemd ]; + binPath = lib.makeBinPath [ coreutils openresolv systemd ]; in stdenv.mkDerivation rec { - name = "update-resolv-conf-2016-04-24"; + name = "update-resolv-conf-2016-09-30"; src = fetchFromGitHub { owner = "masterkorp"; repo = "openvpn-update-resolv-conf"; - rev = "994574f36b9147cc78674a5f13874d503a625c98"; - sha256 = "1rvzlaj53k8s09phg4clsyzlmf44dmwwyvg0nbg966sxp3xsqlxc"; + rev = "09cb5ab5a50dfd6e77e852749d80bef52d7a6b34"; + sha256 = "0s5cilph0p0wiixj7nlc7f3hqmr1mhvbfyapd0060n3y6xgps9y9"; }; nativeBuildInputs = [ makeWrapper ]; From 5cda77808ab369addefa135c7cca22e8e52ffcbf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:08:24 +0300 Subject: [PATCH 075/149] fprintd: 0.6.0 -> 0.7.0 --- pkgs/tools/security/fprintd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index fb72782abee6..e5bf5a08afc7 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -2,11 +2,12 @@ , libfprint, glib, dbus_glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { - name = "fprintd-0.6.0"; + name = "fprintd-${version}"; + version = "0.7.0"; src = fetchurl { url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1by6nvlrqkwzcz2v2kyq6avi3h384vmlr42vj9s2yzcinkp64m1z"; + sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5"; }; buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ]; From c240000451b15e18f29416c81f2a36492df0b971 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:08:37 +0300 Subject: [PATCH 076/149] thermald: 1.5.3 -> 1.5.4 --- pkgs/tools/system/thermald/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index baa18aacdfb8..d5936b00806e 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0k10sl262d9slrln1vkgsxlr1pnfxzd3ycs552bl7ynf0zxpl48h"; + sha256 = "0yrlnm1blfxi97af4dbx6xm5w1p8r20raiim1ng08gbqbgnjg56g"; }; buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { preInstall = "sysconfdir=$out/etc"; - meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; From 1ff70e9f41cda73f1f7cd5aa4b0a2d39ca429974 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:09:00 +0300 Subject: [PATCH 077/149] perlPackages.pcsc-perl: 1.4.13 -> 1.4.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd5278ce4d8a..5ae95864232b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10066,10 +10066,10 @@ let self = _self // overrides; _self = with self; { }; pcscperl = buildPerlPackage { - name = "pcsc-perl-1.4.13"; + name = "pcsc-perl-1.4.14"; src = fetchurl { - url = mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.13.tar.bz2; - sha256 = "a5f7dfb30be0346cfe80d47749994dab861592929d80786104693987b36e3684"; + url = "mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.14.tar.bz2"; + sha256 = "17f6i16jv6ci6459vh6y3sz94vgcvykjjszcl4xsykryakjvf8i7"; }; buildInputs = [ pkgs.pcsclite ]; nativeBuildInputs = [ pkgs.pkgconfig ]; From 3d29ffe3e6c04addc6326ae61a746e22f7171ac7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:09:15 +0300 Subject: [PATCH 078/149] pythonPackages.python-axolotl: 0.1.7 -> 0.1.35 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26bbf15fe515..ad19c680440e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8670,17 +8670,17 @@ in { python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; - version = "0.1.7"; + version = "0.1.35"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; - sha256 = "1i3id1mjl67n4sca31s5zwq96kswgsi6lga6np83ayb45rxggvhx"; + sha256 = "0ch2d5wqfgxy22dkbxwzilq91wkqy9ficrjy39qhal8g8rdc4jr0"; }; - propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; + propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ]; meta = { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; From 4337d439695ce3b281bffc152781b5ce3dc865b2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:09:30 +0300 Subject: [PATCH 079/149] pythonPackages.regex: 2016.01.10 -> 2016.11.18 --- 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 ad19c680440e..ae73d28fce38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9446,16 +9446,16 @@ in { regex = buildPythonPackage rec { name = "regex-${version}"; - version = "2016.01.10"; + version = "2016.11.18"; src = pkgs.fetchurl { url = "mirror://pypi/r/regex/${name}.tar.gz"; - sha256 = "1q3rbmnijjzn7y3cm3qy49b5lqw1fq38zv974xma387lwc37d9q2"; + sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; }; meta = { description = "Alternative regular expression module, to replace re"; - homepage = https://bitbucket.org/mrabarnett/mrab-regex; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; license = licenses.psfl; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; From c47406daded3a3588ac00671ac5f441c1ef5f580 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:09:41 +0300 Subject: [PATCH 080/149] pythonPackages.flask_assets: 0.11 -> 0.12 --- 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 ae73d28fce38..4a7a76c109ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10979,17 +10979,17 @@ in { flask_assets = buildPythonPackage rec { name = "Flask-Assets-${version}"; - version = "0.11"; + version = "0.12"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; - sha256 = "1vs59gygwhwqj37if8hiw6vd2rns09xkblaz4qkmpp6hpy3shrvf"; + sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; }; propagatedBuildInputs = with self; [ flask webassets flask_script nose ]; meta = { - homepage = http://github.com/miracle2k/flask-assets; + homepage = "http://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; From 42dd31fe31d4a5abb75c6f9ca8f889883e49c41a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:09:50 +0300 Subject: [PATCH 081/149] pythonPackages.flask_login: 0.2.2 -> 0.4.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a7a76c109ec..20af705b70a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11034,11 +11034,11 @@ in { flask_login = buildPythonPackage rec { name = "Flask-Login-${version}"; - version = "0.2.2"; + version = "0.4.0"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; - sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; + sha256 = "19w2f33lglkyvxqnj3qghhxa4pr8mp13235k1bd557x52imkapnj"; }; propagatedBuildInputs = with self; [ flask ]; From 181701513eaedc385a1f641ec843fc4763583067 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 18:09:58 +0300 Subject: [PATCH 082/149] pythonPackages.webassets: 0.11.1 -> 0.12.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 20af705b70a0..44341b7af459 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25982,18 +25982,18 @@ in { webassets = buildPythonPackage rec { name = "webassets-${version}"; - version = "0.11.1"; + version = "0.12.0"; src = pkgs.fetchurl { url = "mirror://pypi/w/webassets/${name}.tar.gz"; - sha256 = "0p1qypcbq9b88ipcylxh3bbnby5n6dr421wb4bwmrlcrgvj4r5lz"; + sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr"; }; propagatedBuildInputs = with self; [ pyyaml ]; meta = { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = http://github.com/miracle2k/webassets/; + homepage = "http://github.com/miracle2k/webassets/"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; From 714cf7803c8c0ac3785b6486eeb30b79d7a10e17 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 24 Nov 2016 02:51:51 +0300 Subject: [PATCH 083/149] dwarf-fortress.dfhack: enable 64-bit build, fix segfault --- pkgs/games/dwarf-fortress/default.nix | 4 +- pkgs/games/dwarf-fortress/dfhack/default.nix | 20 +++- .../dwarf-fortress/dfhack/skip-ruby.patch | 16 +++ .../dfhack/use-system-libraries.patch | 113 ------------------ pkgs/games/dwarf-fortress/unfuck.nix | 3 + pkgs/games/dwarf-fortress/wrapper/default.nix | 11 +- 6 files changed, 37 insertions(+), 130 deletions(-) create mode 100644 pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch delete mode 100644 pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 4006880ed828..15227c7173ed 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -3,15 +3,13 @@ let callPackage = pkgs.newScope self; callPackage_i686 = pkgsi686Linux.newScope self; + oldAbiStdenv = pkgs.overrideInStdenv pkgs.stdenv [ pkgs.useOldCXXAbi ]; self = rec { dwarf-fortress-original = callPackage ./game.nix { }; dfhack = callPackage ./dfhack { inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; - protobuf = with pkgs; protobuf.override { - stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; - }; }; dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index b587d049fd0c..74dddbe8df99 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchgit, cmake, writeScriptBin , perl, XMLLibXML, XMLLibXSLT , zlib -, jsoncpp, protobuf, tinyxml }: let @@ -15,6 +14,11 @@ let # revision of library/xml submodule xmlRev = "84f6e968a9ec5515f9dbef96b445e3fc83f83e8b"; + arch = + if stdenv.system == "x86_64-linux" then "64" + else if stdenv.system == "i686-linux" then "32" + else throw "Unsupported architecture"; + fakegit = writeScriptBin "git" '' #! ${stdenv.shell} if [ "$*" = "describe --tags --long" ]; then @@ -41,13 +45,17 @@ in stdenv.mkDerivation rec { inherit rev sha256; }; - patches = [ ./use-system-libraries.patch ]; + patches = [ ./skip-ruby.patch ]; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; - # we can't use native Lua; upstream uses private headers - buildInputs = [ zlib jsoncpp protobuf tinyxml ]; + # We don't use system libraries because dfhack needs old C++ ABI. + buildInputs = [ zlib ]; - cmakeFlags = [ "-DEXTERNAL_TINYXML=ON" ]; + preBuild = '' + export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" + ''; + + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ]; enableParallelBuilding = true; @@ -57,7 +65,7 @@ in stdenv.mkDerivation rec { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; homepage = "https://github.com/DFHack/dfhack/"; license = licenses.zlib; - platforms = [ "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ robbinch a1russell abbradar ]; }; } diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch new file mode 100644 index 000000000000..619060dc2534 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch @@ -0,0 +1,16 @@ +diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt +--- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt 2016-11-23 15:29:09.907286546 +0300 +@@ -1,3 +1,4 @@ ++IF(FALSE) + IF (APPLE) + SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib) + SET(RUBYLIB_INSTALL_NAME "libruby.dylib") +@@ -48,6 +49,7 @@ + "482c1c418f4ee1a5f04203eee1cda0ef") + ENDIF() + ENDIF() ++ENDIF() + + IF (APPLE OR UNIX) + SET(RUBYAUTOGEN ruby-autogen-gcc.rb) diff --git a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch deleted file mode 100644 index bc73d114d828..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -ru3 dfhack-ae59b4f/CMakeLists.txt dfhack-ae59b4f-new/CMakeLists.txt ---- dfhack-ae59b4f/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/CMakeLists.txt 2016-11-23 15:21:56.134538785 +0300 -@@ -202,8 +202,6 @@ - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od") - ENDIF() - --# use shared libraries for protobuf --ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS) - ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL) - - if(APPLE) -@@ -297,10 +295,8 @@ - endif() - - find_package(ZLIB REQUIRED) --include_directories(depends/protobuf) - include_directories(depends/lua/include) - include_directories(depends/md5) --include_directories(depends/jsoncpp) - - # Support linking against external tinyxml - # If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml" -diff -ru3 dfhack-ae59b4f/depends/CMakeLists.txt dfhack-ae59b4f-new/depends/CMakeLists.txt ---- dfhack-ae59b4f/depends/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/depends/CMakeLists.txt 2016-11-23 15:21:56.134538785 +0300 -@@ -1,7 +1,6 @@ - #list depends here. - add_subdirectory(lua) - add_subdirectory(md5) --add_subdirectory(protobuf) - - # Don't build tinyxml if it's being externally linked against. - if(NOT TinyXML_FOUND) -@@ -9,7 +8,6 @@ - endif() - - add_subdirectory(tthread) --add_subdirectory(jsoncpp) - # build clsocket static and only as a dependency. Setting those options here overrides its own default settings. - OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) - OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) -diff -ru3 dfhack-ae59b4f/library/CMakeLists.txt dfhack-ae59b4f-new/library/CMakeLists.txt ---- dfhack-ae59b4f/library/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/library/CMakeLists.txt 2016-11-23 15:22:24.995519136 +0300 -@@ -236,14 +236,14 @@ - - ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_TMP_FILES} -- COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ -+ COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ - --cpp_out=dllexport_decl=DFHACK_EXPORT:${CMAKE_CURRENT_SOURCE_DIR}/proto/tmp/ - ${PROJECT_PROTOS} - COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/depends/copy-if-different.pl - ${PROJECT_PROTO_TMP_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/proto/ - COMMENT "Generating core protobufs" -- DEPENDS protoc-bin ${PROJECT_PROTOS} -+ DEPENDS ${PROJECT_PROTOS} - ) - - ADD_CUSTOM_TARGET(generate_proto_core DEPENDS ${PROJECT_PROTO_TMP_FILES}) -diff -ru3 dfhack-ae59b4f/plugins/CMakeLists.txt dfhack-ae59b4f-new/plugins/CMakeLists.txt ---- dfhack-ae59b4f/plugins/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/plugins/CMakeLists.txt 2016-11-23 15:22:47.291503960 +0300 -@@ -60,7 +60,7 @@ - - ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_TMP_FILES} -- COMMAND protoc-bin -I=${dfhack_SOURCE_DIR}/library/proto/ -+ COMMAND protoc -I=${dfhack_SOURCE_DIR}/library/proto/ - -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ - --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/tmp/ - ${PROJECT_PROTOS} -@@ -68,7 +68,7 @@ - ${PROJECT_PROTO_TMP_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/proto/ - COMMENT "Generating plugin protobufs" -- DEPENDS protoc-bin ${PROJECT_PROTOS} -+ DEPENDS ${PROJECT_PROTOS} - ) - ADD_CUSTOM_TARGET(generate_proto DEPENDS ${PROJECT_PROTO_TMP_FILES}) - -diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt ---- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt 2016-11-23 15:29:09.907286546 +0300 -@@ -1,3 +1,4 @@ -+IF(FALSE) - IF (APPLE) - SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib) - SET(RUBYLIB_INSTALL_NAME "libruby.dylib") -@@ -48,6 +49,7 @@ - "482c1c418f4ee1a5f04203eee1cda0ef") - ENDIF() - ENDIF() -+ENDIF() - - IF (APPLE OR UNIX) - SET(RUBYAUTOGEN ruby-autogen-gcc.rb) -diff -ru3 dfhack-ae59b4f/plugins/stockpiles/CMakeLists.txt dfhack-ae59b4f-new/plugins/stockpiles/CMakeLists.txt ---- dfhack-ae59b4f/plugins/stockpiles/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/plugins/stockpiles/CMakeLists.txt 2016-11-23 15:21:56.134538785 +0300 -@@ -33,8 +33,8 @@ - #Generate sources from our proto files and store them in the source tree - ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} --COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS} --DEPENDS protoc-bin ${PROJECT_PROTOS} -+COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS} -+DEPENDS ${PROJECT_PROTOS} - ) - - IF(WIN32) diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index d5055b40728c..4b71b4377050 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; + # Breaks dfhack because of inlining. + hardeningDisable = [ "fortify" ]; + passthru.dfVersion = "0.43.05"; meta = with stdenv.lib; { diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 5493cdb3faf6..15b51631b33b 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -17,17 +17,12 @@ let env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; + paths = pkgs; + pathsToLink = [ "/" "/hack" ]; ignoreCollisions = true; + postBuild = lib.optionalString enableDFHack '' - # #4621 - if [ -L "$out/hack" ]; then - rm $out/hack - mkdir $out/hack - for i in ${dfhack}/hack/*; do - ln -s $i $out/hack - done - fi rm $out/hack/symbols.xml substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \ --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \ From 8f63cc6d2523558cb670704057c5756603bab7a7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 24 Nov 2016 03:11:48 +0300 Subject: [PATCH 084/149] dwarf-fortress: remove unused oldAbiStdenv --- pkgs/games/dwarf-fortress/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 15227c7173ed..d26258081fcb 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -3,7 +3,6 @@ let callPackage = pkgs.newScope self; callPackage_i686 = pkgsi686Linux.newScope self; - oldAbiStdenv = pkgs.overrideInStdenv pkgs.stdenv [ pkgs.useOldCXXAbi ]; self = rec { dwarf-fortress-original = callPackage ./game.nix { }; From 186ed3bf8f2ef0454991025d0d09c2872580d63d Mon Sep 17 00:00:00 2001 From: Lazar Bodor Date: Thu, 24 Nov 2016 12:38:18 +1100 Subject: [PATCH 085/149] dockerTools: rsync contents with -keep-dirlinks --- pkgs/build-support/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 21e0d2b5128a..27575053954f 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -247,7 +247,7 @@ rec { echo "Adding contents..." for item in $contents; do echo "Adding $item" - rsync -a $item/ layer/ + rsync -ak $item/ layer/ done else echo "No contents to add to layer." @@ -310,7 +310,7 @@ rec { echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." - rsync -a $item/ layer/ + rsync -ak $item/ layer/ done ''; From 3ef260b5dd1f3e63f0851383ae81d5d3c9327e5d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 16:29:25 +0100 Subject: [PATCH 086/149] uhd: 3.9.3 -> 3.10.1 --- pkgs/development/tools/misc/uhd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 9c0d81cf0043..8857e1d1e910 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "uhd-${version}"; - version = "3.9.3"; + version = "3.10.1"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_009_003"; - sha256 = "0nbm8nrjd0l8jj1wq0kkgd8pifzysdyc7pvraq16m0dc01mr638h"; + rev = "release_003_010_001_000"; + sha256 = "1wypn1cspwx331ah7awajjhnpyjykiif0h1l4fb3lahxvsnkwi51"; }; enableParallelBuilding = true; From 2e74e24c855ee3e33998c4567d93089c31550bea Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 16:29:38 +0100 Subject: [PATCH 087/149] gnuradio: 3.7.9.2 -> 3.7.10.1 --- pkgs/applications/misc/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index efe39e5d8b76..497ac298d281 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.9.2"; + version = "3.7.10.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0qdmakvgq3jxnnqpcn3k4q07vj8ycrbyzv32h76k71cv13w2yrki"; + sha256 = "0ds9mcw8hgm03f82jvp3j4mm02ha6zvsl77lp13jzqmbqifbdmv3"; }; buildInputs = [ From 91187028984eaf0bd3b2b23c3c988466b2885f26 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 23 Nov 2016 19:17:03 -0500 Subject: [PATCH 088/149] libarchive: 3.2.1 -> 3.2.2 for unspecified vulnerabilities The release notes don't cover anything in particular: https://github.com/libarchive/libarchive/blob/ba3dec4495496280226a463b3270a60c8864a4f1/NEWS#L3 --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index b2b007765820..3ee35e5bf576 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,11 +10,11 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj"; + sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739"; }; outputs = [ "out" "lib" "dev" ]; From 4a5c66135a4b2abb03a788db47601a02a886904b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 23 Nov 2016 19:24:37 -0500 Subject: [PATCH 089/149] gnuchess: 6.2.3 -> 6.2.4 for CVEs CVE-2015-8972: stack buffer overflow related to user move input, where 160 characters of input can crash gnuchess --- pkgs/games/gnuchess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 9aee664a50eb..9b0ada3f9260 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.3"; + version="6.2.4"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="10hvnfhj9bkpz80x20jgxyqvgvrcgfdp8sfcbcrf1dgjn9v936bq"; + sha256="1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw"; }; buildInputs = [ flex From a3b746851f9ac55bbbd28b031259c84bda1ca864 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 23 Nov 2016 19:35:19 -0500 Subject: [PATCH 090/149] w3m: 0.5.3-2015-12-20 -> 0.5.3+git20161120 for many CVEs https://github.com/tats/w3m/blob/c94a28011f0cb8bcef4229f3f787ae04ee3fcf3e/NEWS\#L1-L52 --- .../networking/browsers/w3m/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index e4486943e628..f07668756adf 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch +{ stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl ? null , graphicsSupport ? true, imlib2 ? null @@ -15,12 +15,13 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "w3m-0.5.3-2015-12-20"; + name = "w3m-v0.5.3+git20161120"; - src = fetchgit { - url = "git://anonscm.debian.org/collab-maint/w3m.git"; - rev = "e0b6e022810271bd0efcd655006389ee3879e94d"; - sha256 = "1vahm3719hb0m20nc8k88165z35f8b15qasa0whhk78r12bls1q6"; + src = fetchFromGitHub { + owner = "tats"; + repo = "w3m"; + rev = "v0.5.3+git20161120"; + sha256 = "06n5a9jdyihkd4xdjmyci32dpqp1k2l5awia5g9ng0bn256bacdc"; }; NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl"; From 336bacfa1d66eb1635ec72ba81faeb1c81938c80 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 15:19:08 +0100 Subject: [PATCH 091/149] qemu: add patch to fix CVE-2016-7907 cc #20647 --- pkgs/applications/virtualization/qemu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ec1f8cf1c966..b37a52f6313b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -123,6 +123,11 @@ stdenv.mkDerivation rec { url = "http://git.qemu.org/?p=qemu.git;a=patch;h=8caed3d564672e8bc6d2e4c6a35228afd01f4723"; sha256 = "19sq6fh7nh8wrk52skky4vwm80029lhm093g11f539krmzjgipik"; }) + (fetchpatch { + name = "qemu-CVE-2016-7907.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=070c4b92b8cd5390889716677a0b92444d6e087a"; + sha256 = "0in89697r6kwkf302v3cg16390q7qs33n2b4kba26m4x65632dxm"; + }) # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html From 9de6029cc67dd19e2e99eb188a7c81d744df8a3d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 23 Nov 2016 20:33:32 -0500 Subject: [PATCH 092/149] libtiff: 4.0.6 -> 4.0.7 for many CVEs This release includes all our previous CVE patches, and suggets new ones: - CVE-2016-3945 - CVE-2016-3990 - CVE-2016-3991 - CVE-2016-3622 - CVE-2016-9453 - CVE-2016-8127 (duplicate of CVE-2016-3658) - CVE-2016-9297 - CVE-2016-9448 --- .../development/libraries/libtiff/default.nix | 50 ++----------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 394e6c2c170f..49fddd06c171 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: let - version = "4.0.6"; - debversion = "3"; + version = "4.0.7"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd"; + sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz"; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -20,54 +19,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = let p = "https://sources.debian.net/data/main/t/tiff/${version}-${debversion}/debian/patches"; in [ - (fetchurl { - url = "${p}/01-CVE-2015-8665_and_CVE-2015-8683.patch"; - sha256 = "0qiiqpbbsf01b59x01z38cg14pmg1ggcsqm9n1gsld6rr5wm3ryz"; - }) - (fetchurl { - url = "${p}/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; - sha256 = "1ph057w302i2s94rhdw6ksyvpsmg1nlanvc0251x01s23gkdbakv"; - }) - (fetchurl { - url = "${p}/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; - sha256 = "1nhjg2gdvyzi4wa2g7nwmzm7nssz9dpdfkwms1rp8i1034qdlgc6"; - }) - (fetchurl { - url = "${p}/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; - sha256 = "0n47yk9wcvc9j72yvm5bhpaqq0yfz8jnq9zxbnzx5id9gdxmrkn3"; - }) - (fetchurl { - url = "${p}/05-CVE-2016-6223.patch"; - sha256 = "0r80hil9k6scdjppgyljhm0s2z6c8cm259f0ic0xvxidfaim6g2r"; - }) - (fetchurl { - url = "${p}/06-CVE-2016-5321.patch"; - sha256 = "1aacymlqv6cam8i4nbma9v05r3v3xjpagns7q0ii268h0mhzq6qg"; - }) - (fetchurl { - url = "${p}/07-CVE-2016-5323.patch"; - sha256 = "1xr5hy2fxa71j3fcc1l998pxyblv207ygzyhibwb1lia5zjgblch"; - }) - (fetchurl { - url = "${p}/08-CVE-2016-3623_CVE-2016-3624.patch"; - sha256 = "1xnvwjvgyxi387h1sdiyp4360a3176jmipb7ghm8vwiz7cisdn9z"; - }) - (fetchurl { - url = "${p}/09-CVE-2016-5652.patch"; - sha256 = "1yqfq32gzh21ab2jfqkq13gaz0nin0492l06adzsyhr5brvdhnx8"; - }) - (fetchurl { - url = "${p}/10-CVE-2016-3658.patch"; - sha256 = "01kb8rfk30fgjf1hy0m088yhjfld1yyh4bk3gkg8jx3dl9bd076d"; - }) - ]; - doCheck = true; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; - homepage = http://www.remotesensing.org/libtiff/; + homepage = http://download.osgeo.org/libtiff; license = licenses.libtiff; platforms = platforms.unix; }; From c823eaec0a210348b03fd3e8a51d53592fc3d4be Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 23 Nov 2016 21:33:48 -0500 Subject: [PATCH 093/149] graphicsmagick: Update URLs for patches --- pkgs/applications/graphics/graphicsmagick/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 91f8e677adba..651bfafcead9 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -15,15 +15,15 @@ stdenv.mkDerivation { patches = [ ./disable-popen.patch (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7996_CVE-2016-7997.patch"; + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch"; sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part1.patch"; + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch"; sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch"; + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch"; sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f"; }) (fetchpatch { From 1d45e5d6c71c2038b13bbeb5ab56297e3f047c64 Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Wed, 23 Nov 2016 23:49:58 -0800 Subject: [PATCH 094/149] fix/ctrlp-cmatcher: add extra steps to additional-nix-code --- pkgs/misc/vim-plugins/default.nix | 4 +--- .../vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2852a2c1e341..aa558071be48 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -304,16 +304,14 @@ rec { }; ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-cmatcher-2016-09-22"; + name = "ctrlp-cmatcher-2015-10-15"; src = fetchgit { url = "git://github.com/JazzCore/ctrlp-cmatcher"; rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; }; dependencies = []; - buildInputs = [ python ]; - buildPhase = '' patchShebangs . ./install.sh diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher new file mode 100644 index 000000000000..bd4a4fa989ba --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher @@ -0,0 +1,5 @@ + buildInputs = [ python ]; + buildPhase = '' + patchShebangs . + ./install.sh + ''; From 845f7daa68c3223b9941d031a9f40eec44ebeda5 Mon Sep 17 00:00:00 2001 From: Robert Roth Date: Thu, 24 Nov 2016 10:02:37 +0200 Subject: [PATCH 095/149] gnome-calculator: update license to gpl3 --- pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix | 2 +- pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix index 23cdf41d5c0b..3df800f402d4 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix index e1b81339e91e..0a177fbab31c 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } From a7500ca12bac22c30f60fdaa63f076862c2dde8d Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Thu, 24 Nov 2016 00:16:24 -0800 Subject: [PATCH 096/149] cpsm: init at 565ab53a66fa52c46d80adf6981b07f4bdffcb1d --- pkgs/misc/vim-plugins/default.nix | 24 ++++++++++++++++++- pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../vim2nix/additional-nix-code/cpsm | 12 ++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2852a2c1e341..6e69e67c8392 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2,7 +2,7 @@ { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip , which, fetchgit, llvmPackages , xkb_switch, rustracerd, fzf -, python3 +, python3, boost, icu , Cocoa ? null }: @@ -2113,4 +2113,26 @@ rec { dependencies = []; }; + + cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "cpsm-2016-09-21"; + src = fetchgit { + url = "git://github.com/nixprime/cpsm"; + rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d"; + sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k"; + }; + dependencies = []; + buildInputs = [ + python3 + stdenv + cmake + boost + icu + ]; + buildPhase = '' + patchShebangs . + export PY3=ON + ./install.sh + ''; + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 849baa492d0d..20f6afec41fe 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -171,3 +171,4 @@ "github:jiangmiao/auto-pairs" "github:editorconfig/editorconfig-vim" "github:heavenshell/vim-jsdoc" +"github:nixprime/cpsm" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm new file mode 100644 index 000000000000..ea360765925b --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm @@ -0,0 +1,12 @@ + buildInputs = [ + python3 + stdenv + cmake + boost + icu + ]; + buildPhase = '' + patchShebangs . + export PY3=ON + ./install.sh + ''; From 58771c0fe684b0e8e3dff3978a0279e769340bf2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 17:55:28 +0100 Subject: [PATCH 097/149] notmuch: 0.22 -> 0.23.2 * enabled tests (except 3 which are still failing) --- .../mailreaders/notmuch/default.nix | 104 +++++++++++------- 1 file changed, 62 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index bbf92ea0462a..738b27b69ae9 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,11 +1,16 @@ -{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames -, gdb, glib, gmime, gnupg -, pkgconfig, talloc, xapian -, sphinx, python +{ fetchurl, stdenv, fixDarwinDylibNames, gdb +, pkgconfig, gnupg +, xapian, gmime, talloc, zlib +, doxygen, perl +, pythonPackages +, bash-completion +, emacs +, ruby +, which, dtach, openssl, bash }: stdenv.mkDerivation rec { - version = "0.22"; + version = "0.23.2"; name = "notmuch-${version}"; passthru = { @@ -15,17 +20,39 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "16mrrw6xpsgip4dy8rfx0zncij5h41fsg2aah6x6z83bjbpihhfn"; + sha256 = "1g4p5hsrqqbqk6s2w756als60wppvjgpyq104smy3w9vshl7bzgd"; }; - buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ] + buildInputs = [ + pkgconfig gnupg # undefined dependencies + xapian gmime talloc zlib # dependencies described in INSTALL + doxygen perl # (optional) api docs + pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL + bash-completion # (optional) dependency to install bash completion + emacs # (optional) to byte compile emacs code + ruby # (optional) ruby bindings + which dtach openssl bash # test dependencies + ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; + doCheck = true; + checkTarget = "test"; + patchPhase = '' + # XXX: disabling few tests since i have no idea how to make them pass for now + rm -f test/T010-help-test.sh \ + test/T350-crypto.sh \ + test/T355-smime.sh + find test -type f -exec \ sed -i \ - "1s_#!/usr/bin/env bash_#!${bash}/bin/bash_" \ + -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ + -e "s|gpg |${gnupg}/bin/gpg2 |" \ + -e "s| gpg| ${gnupg}/bin/gpg2|" \ + -e "s|gpgsm |${gnupg}/bin/gpgsm |" \ + -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \ + -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg2|" \ "{}" ";" for src in \ @@ -38,44 +65,37 @@ stdenv.mkDerivation rec { done ''; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + set -e + + die() { + >&2 echo "$@" + exit 1 + } + + prg="$out/bin/notmuch" + lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')" + + [[ -s "$prg" ]] || die "couldn't find notmuch binary" + [[ -s "$lib" ]] || die "couldn't find libnotmuch" + + badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" + goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" + + [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" + [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" + + echo "fixing libtalloc link in $lib" + install_name_tool -change "$badname" "$goodname" "$lib" + + echo "fixing libtalloc link in $prg" + install_name_tool -change "$badname" "$goodname" "$prg" + ''; + postInstall = '' make install-man ''; - preFixup = if stdenv.isDarwin then - '' - set -e - - die() { - >&2 echo "$@" - exit 1 - } - - prg="$out/bin/notmuch" - lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')" - - [[ -s "$prg" ]] || die "couldn't find notmuch binary" - [[ -s "$lib" ]] || die "couldn't find libnotmuch" - - badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" - goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" - - [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" - [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" - - echo "fixing libtalloc link in $lib" - install_name_tool -change "$badname" "$goodname" "$lib" - - echo "fixing libtalloc link in $prg" - install_name_tool -change "$badname" "$goodname" "$prg" - '' - else - ""; - - # XXX: emacs tests broken - doCheck = false; - checkTarget = "test"; - meta = { description = "Mail indexer"; license = stdenv.lib.licenses.gpl3; From aecc5ba80ee73114e596fb77c868183e7bca0c8a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 17:56:45 +0100 Subject: [PATCH 098/149] notmuch-addrlookup: added myself (garbas) as maintainer --- .../networking/mailreaders/notmuch-addrlookup/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 3b90bc9f0ac1..2cc4905e4351 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk"; }; - buildInputs = [ pkgconfig glib notmuch ]; installPhase = '' @@ -19,12 +18,10 @@ stdenv.mkDerivation rec { cp notmuch-addrlookup "$out/bin" ''; - - meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; homepage = https://github.com/aperezdc/notmuch-addrlookup-c; - maintainers = with maintainers; [ mog ]; + maintainers = with maintainers; [ mog garbas ]; platforms = platforms.linux; license = licenses.mit; }; From 010aebd5ac7a511abcaebae6fc85d9a63f2890cb Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 17:57:20 +0100 Subject: [PATCH 099/149] notmuch-addrlookup: moved package from elmPackages root of nixpkgs --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae90f5832c79..3e4b4de4b9e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12712,8 +12712,6 @@ in notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); - notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; - ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; @@ -14050,11 +14048,12 @@ in # byte-compilation. Use emacsPackages.notmuch if you want to # byte-compiled files emacs = null; - sphinx = pythonPackages.sphinx; }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; + # Open Stack nova = callPackage ../applications/virtualization/openstack/nova.nix { }; keystone = callPackage ../applications/virtualization/openstack/keystone.nix { }; From b3608c378c4a086f05333502cc753182ea02c89d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 18:31:03 +0100 Subject: [PATCH 100/149] pythonPackages.alot: disable alot on python3 ... ... since upstream is only testing it on python2 and 0.3.7 release is currently broken on python3 --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44341b7af459..cc937ee72528 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -767,6 +767,8 @@ in { rev = "0.3.7"; name = "alot-${rev}"; + disabled = isPy3k; + src = pkgs.fetchFromGitHub { owner = "pazz"; repo = "alot"; From 2109a5acb9e2d57d7dd8e1b0cd467fc65d9f0a6b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 18:32:42 +0100 Subject: [PATCH 101/149] notmuch: needs emacs to run tests emacs does not add anything to resulting closure size --- pkgs/top-level/all-packages.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e4b4de4b9e0..8a9820ef1a17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14043,12 +14043,7 @@ in qtbase = qt55; }; - notmuch = callPackage ../applications/networking/mailreaders/notmuch { - # No need to build Emacs - notmuch.el works just fine without - # byte-compilation. Use emacsPackages.notmuch if you want to - # byte-compiled files - emacs = null; - }; + notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; From cfa7ffa50b94a9668f7d6475a3948019d5d77795 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 18:36:44 +0100 Subject: [PATCH 102/149] pythonPackages.afew: 2016-01-04 -> 2016-02-29 --- 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 cc937ee72528..40b1b9adedfb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -494,13 +494,13 @@ in { }; afew = buildPythonPackage rec { - rev = "3f1e5e93119788984c2193292c988ac81ecb0a45"; - name = "afew-git-2016-01-04"; + rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128"; + name = "afew-git-2016-02-29"; src = pkgs.fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "1fi19g2j1qilh7ikp7pzn6sagkn76g740zdxgnsqmmvl2zk2yhrw"; + sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k"; }; buildInputs = with self; [ pkgs.dbacl ]; From 61f38b9e8368a41b32d442dd903850ed9c66f000 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 21:33:49 +0100 Subject: [PATCH 103/149] notmuch: disable tests on darwin --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 738b27b69ae9..83eace00b0a4 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; - doCheck = true; + doCheck = !stdenv.isDarwin; checkTarget = "test"; patchPhase = '' From b59167ce0e9b643a7d05739f5fd35cef36447d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Nov 2016 10:00:14 +0100 Subject: [PATCH 104/149] CONTRIBUTING.md: switch to a link that actually works Fixes #20594. --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 92676378936b..8400aa5c684f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -32,4 +32,4 @@ See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](ht ## Reviewing contributions -See the nixpkgs manual for more details on how to [Review contributions](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-reviewing-contributions). +See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#sec-reviewing-contributions). From 1f95524ab5bf7dee448afe646a78712d70c5ca2a Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 24 Nov 2016 09:56:12 +0100 Subject: [PATCH 105/149] postgresql: fix build on darwin --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a6b139f40b5c..d5ffd5361e45 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -58,7 +58,7 @@ let substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld ''; - postFixup = + postFixup = lib.optionalString (!stdenv.isDarwin) '' # initdb needs access to "locale" command from glibc. wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin From f9d787c67b5c8c5375cf11fb36869bb9479d2f2f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 24 Nov 2016 12:05:52 +0100 Subject: [PATCH 106/149] grsecurity: 4.8.10-201611210813 -> 201611232213 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 489212f612f4..999b9dc260a0 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,8 +87,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.8.10"; - grrev = "201611210813"; - sha256 = "1an1fqzmh133hr6r9y4y9b5qkaf8xwlfgymg97ygbwqdygjvp81b"; + grrev = "201611232213"; + sha256 = "13v3h6cjd5qz57rf242kpxhz5rk094lg5kyf86a852fk58apk6b6"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 7e3176bca231912e8c11c279a9a99bf6a67a55df Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Thu, 24 Nov 2016 14:10:51 +0300 Subject: [PATCH 107/149] blivet: Remove unneccesary patching Fixes https://github.com/NixOS/nixops/issues/552 `--cache` argument is now mandatory for `pvscan` both from hetzner rescue system and from nixpkgs. --- pkgs/development/python-modules/blivet/default.nix | 1 - pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index a55e1993ac37..42a7401b09d6 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -28,7 +28,6 @@ in buildPythonPackage rec { }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py - sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py ''; propagatedBuildInputs = [ diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index edb2978001b2..b207eeeb9c3d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -28,7 +28,6 @@ buildPythonApplication rec { }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py - sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py '' + stdenv.lib.optionalString useNixUdev '' sed -i -e '/find_library/,/find_library/ { c libudev = "${systemd.lib}/lib/libudev.so.1" From b8a69aaba97f8abdd0de735ac84d6da6e91ab165 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 21 Nov 2016 20:44:42 +0100 Subject: [PATCH 108/149] haskell/hoogle.nix: make an empty packages list possible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building hoogle environments with an empty list of packages threw a built-time error. This was particularly confusing when giving e.g. `(hps: [hps.Cabal])` which, since `Cabal` is set to `null` (because it’s a distribution package), would have lead to the same error as an empty list. It was not useful to throw an error at all, because sometimes one only wants to build an environment for the distribution packages; also the default value for packages wasn’t even a valid value, so it is removed. --- pkgs/development/haskell-modules/hoogle.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index bf7fd18f820a..a0b909628297 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -23,8 +23,8 @@ # This will build mmorph and monadControl, and have the hoogle installation # refer to their documentation via symlink so they are not garbage collected. -{ lib, stdenv, hoogle, writeText -, ghc, packages ? [ ghc.ghc ] +{ lib, stdenv, hoogle, writeText, ghc +, packages }: let @@ -51,6 +51,9 @@ let else writeText "ghcjs-prologue.txt" '' This index includes documentation for many Haskell modules. ''; + + docPackages = lib.closePropagation packages; + in stdenv.mkDerivation { name = "hoogle-local-0.1"; @@ -58,14 +61,9 @@ stdenv.mkDerivation { phases = [ "buildPhase" ]; - docPackages = (lib.closePropagation packages); + inherit docPackages; buildPhase = '' - if [ -z "$docPackages" ]; then - echo "ERROR: The packages attribute has not been set" - exit 1 - fi - mkdir -p $out/share/doc/hoogle echo importing builtin packages From 4642c338e1dd2bf5727a1fdfb1b78e10cb98fcdb Mon Sep 17 00:00:00 2001 From: Robert Roth Date: Thu, 24 Nov 2016 13:52:28 +0200 Subject: [PATCH 109/149] gnome-mines:update license to GPLv3 --- pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix index 0b670ec9f65b..c55650e705a9 100644 --- a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Mines; description = "Clear hidden mines from a minefield"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } From 2d7cb1f6c3738289fbef0b85d728e595b235fa01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Nov 2016 13:34:11 +0100 Subject: [PATCH 110/149] luajit: 2.1.0-beta1 -> 2.1.0-beta2 I'm not very certain about beta as the default, but let me not change that ATM. --- pkgs/development/interpreters/luajit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index adf743848d19..6da5c265aaf6 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "luajit-${version}"; - version = "2.1.0-beta1"; + version = "2.1.0-beta2"; luaversion = "5.1"; src = fetchurl { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; + sha256 = "0iyghj1xjlmd9ywa4flf9yszynf3jhbp0yqb9b49k7ab0g528fbi"; }; enableParallelBuilding = true; From 528d353b654e66f310f7544cf7a1bff913cf3c0d Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Wed, 23 Nov 2016 23:28:56 -0800 Subject: [PATCH 111/149] graphviz: Make derivations pure on non-NixOS systems. --- pkgs/tools/graphics/graphviz/2.0.nix | 2 ++ pkgs/tools/graphics/graphviz/2.32.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 255ec2d536f6..32cc283bc3c9 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" ] ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 9c125433c3a6..a09d60f788c7 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" "--with-cgraph=no" "--with-sparse=no" ] From 286c836b3f1421553c103758537929e596256e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Nov 2016 16:45:15 +0100 Subject: [PATCH 112/149] pciutils: fixup finding modules to libkmod's way Fixes #20683. --- pkgs/tools/system/pciutils/default.nix | 2 ++ pkgs/tools/system/pciutils/module-dir.diff | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/pciutils/module-dir.diff diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 622f5fc6ceae..6530abd23626 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb"; }; + patches = [ ./module-dir.diff ]; + buildInputs = [ pkgconfig zlib kmod which ]; makeFlags = "SHARED=yes PREFIX=\${out}"; diff --git a/pkgs/tools/system/pciutils/module-dir.diff b/pkgs/tools/system/pciutils/module-dir.diff new file mode 100644 index 000000000000..ea38b115b248 --- /dev/null +++ b/pkgs/tools/system/pciutils/module-dir.diff @@ -0,0 +1,23 @@ +Don't override libkmod's way of finding modules. + +(We override that behavior in nixpkgs to fit nixos.) + +diff --git a/ls-kernel.c b/ls-kernel.c +index 78b70f1..ecacd0e 100644 +--- a/ls-kernel.c ++++ b/ls-kernel.c +@@ -29,13 +29,7 @@ show_kernel_init(void) + if (show_kernel_inited >= 0) + return show_kernel_inited; + +- struct utsname uts; +- if (uname(&uts) < 0) +- die("uname() failed: %m"); +- char *name = alloca(64 + strlen(uts.release)); +- sprintf(name, "/lib/modules/%s", uts.release); +- +- kmod_ctx = kmod_new(name, NULL); ++ kmod_ctx = kmod_new(NULL, NULL); + if (!kmod_ctx) + { + fprintf(stderr, "lspci: Unable to initialize libkmod context\n"); From 516f839c0d88f3472e40aa4458b41b41c3ce013e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Nov 2016 16:49:57 +0100 Subject: [PATCH 113/149] Revert "pciutils: fixup finding modules to libkmod's way" This reverts commit 286c836b3f1421553c103758537929e596256e65. It's bigger rebuild than I expected, I'm sorry. Moving to staging. --- pkgs/tools/system/pciutils/default.nix | 2 -- pkgs/tools/system/pciutils/module-dir.diff | 23 ---------------------- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/tools/system/pciutils/module-dir.diff diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 6530abd23626..622f5fc6ceae 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb"; }; - patches = [ ./module-dir.diff ]; - buildInputs = [ pkgconfig zlib kmod which ]; makeFlags = "SHARED=yes PREFIX=\${out}"; diff --git a/pkgs/tools/system/pciutils/module-dir.diff b/pkgs/tools/system/pciutils/module-dir.diff deleted file mode 100644 index ea38b115b248..000000000000 --- a/pkgs/tools/system/pciutils/module-dir.diff +++ /dev/null @@ -1,23 +0,0 @@ -Don't override libkmod's way of finding modules. - -(We override that behavior in nixpkgs to fit nixos.) - -diff --git a/ls-kernel.c b/ls-kernel.c -index 78b70f1..ecacd0e 100644 ---- a/ls-kernel.c -+++ b/ls-kernel.c -@@ -29,13 +29,7 @@ show_kernel_init(void) - if (show_kernel_inited >= 0) - return show_kernel_inited; - -- struct utsname uts; -- if (uname(&uts) < 0) -- die("uname() failed: %m"); -- char *name = alloca(64 + strlen(uts.release)); -- sprintf(name, "/lib/modules/%s", uts.release); -- -- kmod_ctx = kmod_new(name, NULL); -+ kmod_ctx = kmod_new(NULL, NULL); - if (!kmod_ctx) - { - fprintf(stderr, "lspci: Unable to initialize libkmod context\n"); From 4438ea18fb4beace6cbce2e824abb8f6b274ce5b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 24 Nov 2016 12:22:23 -0500 Subject: [PATCH 114/149] Add self to the mention bot blacklist --- .mention-bot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mention-bot b/.mention-bot index 8aeeedace10f..2bbe4a40bd49 100644 --- a/.mention-bot +++ b/.mention-bot @@ -1,7 +1,8 @@ { "userBlacklist": [ "civodul", - "jhasse" + "jhasse", + "shlevy" ], "alwaysNotifyForPaths": [ { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, From 27f1def068cff885c1f2570ec9e5fc1a9796d796 Mon Sep 17 00:00:00 2001 From: Corbin Simpson Date: Thu, 24 Nov 2016 12:47:17 -0800 Subject: [PATCH 115/149] nixos/collectd: Fix syntax error on some hostnames. (#20694) Without this, hostnames that e.g. end in digits will cause syntax errors for collectd. --- nixos/modules/services/monitoring/collectd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 3c3d83c66ed0..01c6fb817669 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -9,7 +9,7 @@ let BaseDir "${cfg.dataDir}" PIDFile "${cfg.pidFile}" AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"} - Hostname ${config.networking.hostName} + Hostname "${config.networking.hostName}" LoadPlugin syslog From 163e1ee7bd4e0a5ea165285f28035e5e11b8b425 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 24 Nov 2016 19:48:32 -0200 Subject: [PATCH 116/149] windowmaker: 0.95.6 -> 0.95.7 --- .../applications/window-managers/windowmaker/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 86f798e07e91..a8b5be83234e 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -4,16 +4,17 @@ stdenv.mkDerivation rec { name = "windowmaker-${version}"; - version = "0.95.6"; + version = "0.95.7"; srcName = "WindowMaker-${version}"; src = fetchurl { url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz"; - sha256 = "1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3"; + sha256 = "1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4"; }; - buildInputs = [ pkgconfig - libX11 libXext libXft libXmu libXinerama libXrandr libXpm + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm imagemagick libpng libjpeg libexif libtiff libungif libwebp ]; configureFlags = [ From e29e2467201be02de2ae67bf1916b2114ffada23 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 24 Nov 2016 22:51:58 +0100 Subject: [PATCH 117/149] debootstrap: 1.0.80 -> 1.0.87 --- pkgs/tools/misc/debootstrap/default.nix | 34 +++---------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index d60b47ca0116..e70efe6c4f11 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,38 +1,16 @@ { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: -let # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? - makedev = stdenv.mkDerivation { - name = "makedev-for-debootstrap"; - src = fetchurl { - url = mirror://debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz; - sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5"; - }; - patches = [ - (fetchurl { - url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz"; - sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw"; - }) - ]; - # TODO install man - installPhase = '' - mkdir -p $out/sbin - ls -l - t=$out/sbin/MAKEDEV - cp MAKEDEV $t - chmod +x $t - ''; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.80"; + version = "1.0.87"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6"; + sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374"; }; buildInputs = [ dpkg gettext gawk perl ]; @@ -72,8 +50,6 @@ in stdenv.mkDerivation rec { d=$out/share/debootstrap mkdir -p $out/{share/debootstrap,bin} - ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV - cp -r . $d cat >> $out/bin/debootstrap << EOF @@ -90,10 +66,6 @@ in stdenv.mkDerivation rec { mv debootstrap.8 $out/man/man8 ''; - passthru = { - inherit makedev; - }; - meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap From 99e6b63199e3dcafdb2bea76aef72ecf4dc86d1d Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Thu, 24 Nov 2016 14:35:41 -0800 Subject: [PATCH 118/149] pycryptodome: init at 3.4.3 --- .../python-modules/pycryptodome/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/pycryptodome/default.nix diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix new file mode 100644 index 000000000000..04964ab03dd2 --- /dev/null +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, python, buildPythonPackage, gmp }: + +buildPythonPackage rec { + version = "3.4.3"; + name = "pycryptodome-${version}"; + namePrefix = ""; + + src = fetchurl { + url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; + sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb"; + }; + + meta = { + homepage = "https://www.pycryptodome.org/"; + description = "Python Cryptography Toolkit"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dac77f709790..c38f6aafaaf2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -218,6 +218,8 @@ in { pycrypto = callPackage ../development/python-modules/pycrypto { }; + pycryptodome = callPackage ../development/python-modules/pycryptodome { }; + pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}"; pygame = callPackage ../development/python-modules/pygame { }; From 555928c228634b4c372f38e6ea5c320c1662711b Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Thu, 24 Nov 2016 14:40:09 -0800 Subject: [PATCH 119/149] mutagen: 1.32 -> 1.34 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c38f6aafaaf2..d9c6c0237801 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14761,11 +14761,11 @@ in { }; mutagen = buildPythonPackage (rec { - name = "mutagen-1.32"; + name = "mutagen-1.34"; src = pkgs.fetchurl { url = "mirror://pypi/m/mutagen/${name}.tar.gz"; - sha256 = "1d9sxl442xjj7pdyjj5h0dsjyd7d3wqswr8icqqgqdmg9k8dw8bp"; + sha256 = "06anfzpjajwwh25n3afavwafrix3abahgwfr2zinrhqh2w98kw5s"; }; # Needed for tests only From 8602f821695238612c34d2a6864b38c2d8c6f4d7 Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Thu, 24 Nov 2016 14:41:09 -0800 Subject: [PATCH 120/149] gpsoauth: 0.0.4 -> 0.2.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 d9c6c0237801..16785dee336c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7271,12 +7271,12 @@ in { }; gpsoauth = buildPythonPackage rec { - version = "0.0.4"; + version = "0.2.0"; name = "gpsoauth-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/g/gpsoauth/${name}.tar.gz"; - sha256 = "1mhd2lkl1f4fmia1cwxwik8gvqr5q16scjip7kfwzadh9a11n9kw"; + sha256 = "01zxw8rhml8xfwda7ba8983890bzwkfa55ijd6qf8qrdy6ja1ncn"; }; propagatedBuildInputs = with self; [ @@ -7289,7 +7289,7 @@ in { pyopenssl pyasn1 pycparser - pycrypto + pycryptodome requests2 six ]; From 5d62f80bb7971a15398a9c18cc5786c127c77d7a Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Thu, 24 Nov 2016 14:41:43 -0800 Subject: [PATCH 121/149] gmusicapi: 7.0.0 -> 10.1.0 --- pkgs/top-level/python-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16785dee336c..1facf70c0071 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7078,18 +7078,18 @@ in { }; gmusicapi = with pkgs; buildPythonPackage rec { - name = "gmusicapi-7.0.0"; + name = "gmusicapi-10.1.0"; src = pkgs.fetchurl { - url = "mirror://pypi/g/gmusicapi/gmusicapi-7.0.0.tar.gz"; - sha256 = "1zji4cgylyzz97cz69lywkbsn5nvvzrhk7iaqnpqpfvj9gwdchwn"; + url = "mirror://pypi/g/gmusicapi/gmusicapi-10.1.0.tar.gz"; + sha256 = "0smlrafh1bjzrcjzl7im8pf8f04gcnx92lf3g5qr7yzgq8k20xa2"; }; propagatedBuildInputs = with self; [ validictory decorator mutagen - protobuf + protobuf3_0 setuptools requests2 dateutil @@ -7100,6 +7100,7 @@ in { pyopenssl gpsoauth MechanicalSoup + future ]; meta = { From 97b35a057352476e1ad33f4774e0345cbc15cbf0 Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Thu, 24 Nov 2016 14:42:27 -0800 Subject: [PATCH 122/149] mopidy-gmusic: 1.0.0 -> 2.0.0 --- pkgs/applications/audio/mopidy-gmusic/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix index 6984593cd417..850e7abaef00 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -2,14 +2,19 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-gmusic-${version}"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; - sha256 = "0yfilzfamy1bxnmgb1xk56jrk4sz0i7vcnc0a8klrm9sc7agnm9i"; + sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j"; }; - propagatedBuildInputs = [ mopidy pythonPackages.requests2 pythonPackages.gmusicapi ]; + propagatedBuildInputs = [ + mopidy + pythonPackages.requests2 + pythonPackages.gmusicapi + pythonPackages.cachetools + ]; doCheck = false; From 0f9f74f1d5c33172b5d46659f3bba0a711ff665d Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Thu, 24 Nov 2016 23:48:58 +0000 Subject: [PATCH 123/149] less: 483 -> 481: Use recommended upstream version since less-483.tar.gz has disappeared This is a fix for the current package source file http://www.greenwoodsoftware.com/less/less-483.tar.gz not being available anymore. We bump the less version back to 481, and adjust the source package hash accordingly. This is a (slight) downgrade from 483 as opposed to an upgrade since a) 481 is the current Recommended version by http://www.greenwoodsoftware.com/less/download.html b) Upstream is unreliable about keeping experimental versions around. --- pkgs/tools/misc/less/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 910b4963f012..9693556862bd 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { - name = "less-483"; + name = "less-481"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "07z43kwbmba2wh3q1gps09l72p8izfagygmqq1izi50s2h51mfvy"; + sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. From 205aecdf3b35677bf7b16aff66f4b39923473291 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 8 Oct 2016 12:19:45 -0700 Subject: [PATCH 124/149] matrix-synapse: 0.18.0 -> 0.18.4 --- 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 bcd1793315c6..d290c124244f 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,13 +11,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.18.0"; + version = "0.18.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "1wvamw5crncz5ic6waq7v1bw54zg93af1lmw4y45w3r0vzyfxp68"; + sha256 = "0hcag9a4wd6a9q0ln5l949xr1bhmk1zrnf9vf3qi3lzxgi0rbm98"; }; patches = [ ./matrix-synapse.patch ]; From 902675b4e75d34afffd319e89d7fe12861f6fcf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 25 Nov 2016 07:52:56 +0100 Subject: [PATCH 125/149] Revert "Merge pull request #20592 from TravisWhitaker/portaudio-update" This reverts commit 44122e2c0ffb264e56e09d8b40595b5b30177bb1, reversing changes made to d66db992ae15d95fa9234058be710ccdeaa910db. The hash wasn't changed, meaning this won't work and the build is most likely untested. --- pkgs/development/libraries/portaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 98a5513c7e7a..5d8c2430ab9f 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - name = "portaudio-19-20161030"; - + name = "portaudio-19-20140130"; + src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz; + url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; }; From a357777fc0fd5ef6b0ebd38d8d309cd9391bdc98 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 25 Nov 2016 05:08:03 -0200 Subject: [PATCH 126/149] Greybird: 2016-09-13 -> 2016-11-15 --- pkgs/misc/themes/greybird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 6adedcb0d8d0..43e5a3210f57 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "Greybird"; - version = "2016-09-13"; + version = "2016-11-15"; src = fetchFromGitHub { - repo = "${pname}"; owner = "shimmerproject"; - rev = "1942afc8732f904a1139fd41d7afd74263b87887"; - sha256 = "0qawc7rx5s3mnk5awvlbp6k5m9aj5krb1lasmgl2cb9fk09khf2v"; + repo = "${pname}"; + rev = "0a0853fa1de7545392f32aff33d95a8a1f6dca9e"; + sha256 = "0i9yvd265783pqij6rjh7pllw0l28v975mrahykcwvn9chq8rrqf"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; From 18637d877a282e039a05e93681953d2ff984919c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Nov 2016 09:12:23 +0100 Subject: [PATCH 127/149] magic-wormhole: move to python-packages since it is actually a library. --- .../python-modules/magic-wormhole/default.nix | 26 +++++++++++++++++++ pkgs/tools/misc/magic-wormhole/default.nix | 24 ----------------- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 1 + 4 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/magic-wormhole/default.nix delete mode 100644 pkgs/tools/misc/magic-wormhole/default.nix diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix new file mode 100644 index 000000000000..304476c26a8d --- /dev/null +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -0,0 +1,26 @@ +{ fetchurl, lib, buildPythonPackage, python, autobahn +, cffi, click, hkdf, pynacl, spake2, tqdm }: + +buildPythonPackage rec { + name = "magic-wormhole-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz"; + sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; + }; + checkPhase = '' + ${python.interpreter} -m wormhole.test.run_trial wormhole + ''; + + # Several test failures, network related. + doCheck = false; + + propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ]; + meta = { + description = "Securely transfer data between computers"; + homepage = "https://github.com/warner/magic-wormhole"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ asymmetric ]; + }; +} diff --git a/pkgs/tools/misc/magic-wormhole/default.nix b/pkgs/tools/misc/magic-wormhole/default.nix deleted file mode 100644 index c35d3b666acb..000000000000 --- a/pkgs/tools/misc/magic-wormhole/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pythonPackages }: - -with stdenv.lib; - -pythonPackages.buildPythonApplication rec { - name = "magic-wormhole-${version}"; - version = "0.8.1"; - - src = fetchurl { - url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz"; - sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; - }; - checkPhase = '' - ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole - ''; - - propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ]; - meta = { - description = "Securely transfer data between computers"; - homepage = "https://github.com/warner/magic-wormhole"; - license = licenses.mit; - maintainers = with maintainers; [ asymmetric ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8600419a707..ad9ec6de8ee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -920,7 +920,6 @@ in long-shebang = callPackage ../misc/long-shebang {}; - magic-wormhole = callPackage ../tools/misc/magic-wormhole {}; mathics = pythonPackages.mathics; meson = callPackage ../development/tools/build-managers/meson { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71d8c229f63b..03825f411854 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26273,6 +26273,7 @@ in { }; }); + magic-wormhole = callPackage ../development/python-modules/magic-wormhole {}; wsgiproxy2 = buildPythonPackage rec { name = "WSGIProxy2-0.4.2"; From 4f51481bb26eeb9eeff122b34ce50ceba2c075b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Nov 2016 09:12:35 +0100 Subject: [PATCH 128/149] pythonPackages.pynacl: fix tests --- pkgs/top-level/python-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03825f411854..2b94b6eeae50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28634,7 +28634,13 @@ in { sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j"; }; - propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser pytest]; + buildInputs = with self; [ pytest coverage ]; + propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser]; + + checkPhase = '' + coverage run --source nacl --branch -m pytest + ''; + }; service-identity = buildPythonPackage rec { From 841b19500a51a98e36948b426943a206b8b392f2 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Fri, 25 Nov 2016 01:55:30 -0400 Subject: [PATCH 129/149] ats2 : advance Postiats to version 0.2.12, which is the latest release. --- pkgs/development/compilers/ats2/default.nix | 6 ++-- .../installed-lib-directory-version.patch | 30 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index d8dabaac779b..97e95b29814d 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.2.11" ; + versionPkg = "0.2.12" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "0kc4nx1904745c1rkj9yfbayidw7rks1mwq0lxmvsgghn98dxwjn" ; + sha256 = "16jzabmwq5yz72dzlkc2hmvf2lan83gayn21gbl65jgpwdsbh170" ; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "140xy129fr11bdf4bj6qya9mf0fhnv2x7ksb9j46pf2yzrsrks8g"; + sha256 = "0m8gmm1pnklixxw76yjjqqqixm2cyp91rnq4sj1k29qp4k9zxpl4"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch index d9e5ad2d21e7..686df69299f2 100644 --- a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch +++ b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch @@ -1,13 +1,13 @@ Change the name of the library directory to match the version of the package. -diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure ---- ATS2-Postiats-0.2.11/configure 2016-10-13 12:03:20.000000000 -0400 +diff -Naur ATS2-Postiats-0.2.12/configure postiats-new/configure +--- ATS2-Postiats-0.2.12/configure 2016-10-13 12:03:20.000000000 -0400 +++ postiats-new/configure 2016-10-23 20:17:29.912579618 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10. -+# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.11. ++# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.12. # # Report bugs to . # @@ -17,8 +17,8 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure PACKAGE_TARNAME='ats2-postiats' -PACKAGE_VERSION='0.2.10' -PACKAGE_STRING='ATS2/Postiats 0.2.10' -+PACKAGE_VERSION='0.2.11' -+PACKAGE_STRING='ATS2/Postiats 0.2.11' ++PACKAGE_VERSION='0.2.12' ++PACKAGE_STRING='ATS2/Postiats 0.2.12' PACKAGE_BUGREPORT='gmpostiats@gmail.com' PACKAGE_URL='' @@ -27,7 +27,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems. -+\`configure' configures ATS2/Postiats 0.2.11 to adapt to many kinds of systems. ++\`configure' configures ATS2/Postiats 0.2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -36,7 +36,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";; -+ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.11:";; ++ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.12:";; esac cat <<\_ACEOF @@ -45,7 +45,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure if $ac_init_version; then cat <<\_ACEOF -ATS2/Postiats configure 0.2.10 -+ATS2/Postiats configure 0.2.11 ++ATS2/Postiats configure 0.2.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -54,7 +54,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure running configure, to aid debugging if configure makes a mistake. -It was created by ATS2/Postiats $as_me 0.2.10, which was -+It was created by ATS2/Postiats $as_me 0.2.11, which was ++It was created by ATS2/Postiats $as_me 0.2.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -63,7 +63,7 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure # values after options handling. ac_log=" -This file was extended by ATS2/Postiats $as_me 0.2.10, which was -+This file was extended by ATS2/Postiats $as_me 0.2.11, which was ++This file was extended by ATS2/Postiats $as_me 0.2.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -72,19 +72,19 @@ diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ATS2/Postiats config.status 0.2.10 -+ATS2/Postiats config.status 0.2.11 ++ATS2/Postiats config.status 0.2.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -diff -Naur ATS2-Postiats-0.2.11/src/CBOOT/config.h postiats-new/src/CBOOT/config.h ---- ATS2-Postiats-0.2.11/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400 +diff -Naur ATS2-Postiats-0.2.12/src/CBOOT/config.h postiats-new/src/CBOOT/config.h +--- ATS2-Postiats-0.2.12/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400 +++ postiats-new/src/CBOOT/config.h 2016-10-23 20:16:34.613836556 -0400 @@ -44,7 +44,7 @@ #define PACKAGE_NAME "ATS2/Postiats" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ATS2/Postiats 0.2.10" -+#define PACKAGE_STRING "ATS2/Postiats 0.2.11" ++#define PACKAGE_STRING "ATS2/Postiats 0.2.12" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ats2-postiats" @@ -93,7 +93,7 @@ diff -Naur ATS2-Postiats-0.2.11/src/CBOOT/config.h postiats-new/src/CBOOT/config /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.2.10" -+#define PACKAGE_VERSION "0.2.11" ++#define PACKAGE_VERSION "0.2.12" /* The size of `void*', as computed by sizeof. */ #define SIZEOF_VOIDP 8 From 54b42cb454fe552bdba1a57a7eeaf2d462c10360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 25 Nov 2016 11:25:07 +0100 Subject: [PATCH 130/149] coWPAtty: init at 4.6 --- pkgs/tools/security/cowpatty/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/cowpatty/default.nix diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix new file mode 100644 index 000000000000..de34005401b1 --- /dev/null +++ b/pkgs/tools/security/cowpatty/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, openssl, libpcap +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "cowpatty-${version}"; + version = "4.6"; + + buildInputs = [ openssl libpcap ]; + + src = fetchurl { + url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${name}.tgz"; + sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd"; + }; + + installPhase = "make DESTDIR=$out BINDIR=/bin install"; + + meta = { + description = "Offline dictionary attack against WPA/WPA2 networks"; + license = licenses.gpl2; + homepage = http://www.willhackforsushi.com/?page_id=50; + maintainers = with maintainers; [ nico202 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d014e4e87f0a..f10db8ee386a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1284,6 +1284,8 @@ in corkscrew = callPackage ../tools/networking/corkscrew { }; + cowpatty = callPackage ../tools/security/cowpatty { }; + cpio = callPackage ../tools/archivers/cpio { }; crackxls = callPackage ../tools/security/crackxls { }; From ea743a97f5043ee47ff39ece8cb8464c80e6a107 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 25 Nov 2016 10:28:59 +0000 Subject: [PATCH 131/149] wolfssl: 3.9.8 -> 3.9.10b (#20708) --- pkgs/development/libraries/wolfssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 7ddd56541aa2..e5e9bb008d4a 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.9.8"; + version = "3.9.10b"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}"; - sha256 = "0b1a9rmzpzjblj0gsrzas2aljivd0gfimcsj8gjl80ng25zgmaxr"; + sha256 = "1hx543kxi4fpxww0y2c05kaav99zmnxm81rq7v7d87qzmvw2g4gx"; }; outputs = [ "out" "dev" "doc" "lib" ]; From a31c37c75925c5c66aa43d175da6bd1c3ddde9f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Wed, 23 Nov 2016 16:54:06 +0100 Subject: [PATCH 132/149] [mathematica] 10.0.2 -> 11.0.1 --- .../science/math/mathematica/10.nix | 138 ++++++++++++++++++ .../science/math/mathematica/default.nix | 7 +- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/science/math/mathematica/10.nix diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix new file mode 100644 index 000000000000..4de4a0c261d5 --- /dev/null +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -0,0 +1,138 @@ +{ stdenv +, coreutils +, patchelf +, requireFile +, alsaLib +, fontconfig +, freetype +, gcc +, glib +, libpng +, ncurses +, opencv +, openssl +, unixODBC +, xorg +, zlib +, libxml2 +, libuuid +}: + +let + platform = + if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then + "Linux" + else + throw "Mathematica requires i686-linux or x86_64 linux"; +in +stdenv.mkDerivation rec { + version = "10.0.2"; + + name = "mathematica-${version}"; + + src = requireFile rec { + name = "Mathematica_${version}_LINUX.sh"; + message = '' + This nix expression requires that ${name} is + already part of the store. Find the file on your Mathematica CD + and add it to the nix store with nix-store --add-fixed sha256 . + ''; + sha256 = "1d2yaiaikzcacjamlw64g3xkk81m3pb4vz4an12cv8nb7kb20x9l"; + }; + + buildInputs = [ + coreutils + patchelf + alsaLib + coreutils + fontconfig + freetype + gcc.cc + gcc.libc + glib + ncurses + opencv + openssl + unixODBC + libxml2 + libuuid + ] ++ (with xorg; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + libXcursor + libXfixes + libXrandr + libICE + libSM + ]); + + ldpath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + + phases = "unpackPhase installPhase fixupPhase"; + + unpackPhase = '' + echo "=== Extracting makeself archive ===" + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + # don't restrict PATH, that has already been done + sed -i -e 's/^PATH=/# PATH=/' MathInstaller + + echo "=== Running MathInstaller ===" + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent + ''; + + preFixup = '' + echo "=== PatchElfing away ===" + # This code should be a bit forgiving of errors, unfortunately + set +e + find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do + type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') + if [ -z "$type" ]; then + : + elif [ "$type" == "EXEC" ]; then + echo "patching $f executable <<" + patchelf --shrink-rpath "$f" + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + elif [ "$type" == "DYN" ]; then + echo "patching $f library <<" + patchelf \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + else + echo "not patching $f <<: unknown elf type" + fi + done + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = { + description = "Wolfram Mathematica computational software system"; + homepage = "http://www.wolfram.com/mathematica/"; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 4de4a0c261d5..1a9adcd4782f 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -26,7 +26,7 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - version = "10.0.2"; + version = "11.0.1"; name = "mathematica-${version}"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 . ''; - sha256 = "1d2yaiaikzcacjamlw64g3xkk81m3pb4vz4an12cv8nb7kb20x9l"; + sha256 = "1qqwz8gbw74rnnyirpbdanwx3d25s4x0i4zc7bs6kp959x66cdkw"; }; buildInputs = [ @@ -89,9 +89,10 @@ stdenv.mkDerivation rec { cd Installer # don't restrict PATH, that has already been done sed -i -e 's/^PATH=/# PATH=/' MathInstaller + sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent ''; preFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad9ec6de8ee5..4a65f2df2a2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16504,6 +16504,7 @@ in mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; + mathematica10 = callPackage ../applications/science/math/mathematica/10.nix { }; metis = callPackage ../development/libraries/science/math/metis {}; From 78f81c5bac9918fa66255ff66cd3e254a8b36d37 Mon Sep 17 00:00:00 2001 From: roxma Date: Fri, 25 Nov 2016 03:30:11 +0000 Subject: [PATCH 133/149] proxychains: fix build, add -ldl to LDFLAGS Closes #20355 --- pkgs/tools/networking/proxychains/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index ed19f9d1674f..36d0150a49b5 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc"; }; + postPatch = '' + # Temporary work-around; most likely fixed by next upstream release + sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' + ''; + meta = { description = "Proxifier for SOCKS proxies"; homepage = http://proxychains.sourceforge.net; From cf709b544a0fa45c0b94dff0c7f2d5daf1cb781a Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Fri, 25 Nov 2016 14:10:04 +0100 Subject: [PATCH 134/149] clion: 2016.2.3 -> 2016.3 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index a768ecb7c8a6..5d7ad644d1eb 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -120,12 +120,12 @@ in { clion = buildClion rec { name = "clion-${version}"; - version = "2016.2.3"; + version = "2016.3"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1gcglxmffq815r97wyy2wx1jsv467qyys8c0m5dv3yjdxknccbqd"; + sha256 = "16nszamr0bxg8aghyrg4wzxbp9158kjzhr957ljpbipz0rlixf31"; }; wmClass = "jetbrains-clion"; }; From cb8f804b1d9269846abf288343c43ae89f6bafda Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Fri, 25 Nov 2016 14:14:42 +0100 Subject: [PATCH 135/149] idea.pycharm-{community,professional}: 2016.2.3 -> 2016.3 --- pkgs/applications/editors/idea/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 5d7ad644d1eb..54e6c0ca3e0a 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -240,24 +240,24 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2016.2.3"; + version = "2016.3"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0nph0dp0a2y6vrbc1a2d5iy1fzhm4wbkp6kpdk6mcfpnz5ppz84f"; + sha256 = "1pi822ihzy58jszdy7y2pyni6pki9ih8s9xdbwlbwg9vck1iqprs"; }; wmClass = "jetbrains-pycharm-ce"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2016.2.3"; + version = "2016.3"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0pjgdwpkbf6fgrhml97inmsjavz1n9l4ns1pnhv3mssnribg3vm1"; + sha256 = "1b4ib77wzg0y12si8zqrfwbhv4kvmy9nm5dsrdr3k7f89dqg3279"; }; wmClass = "jetbrains-pycharm"; }; From e87f28fbb115ac09b01574d70e8f145d1005aae1 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Fri, 25 Nov 2016 14:17:20 +0100 Subject: [PATCH 136/149] idea.phpstorm: 2016.2.2 -> 2016.3 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 54e6c0ca3e0a..8730dd834450 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -264,12 +264,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2016.2.2"; + version = "2016.3"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0np0ypqga1xx9zq0qwpxiw9xdkr7k0jcdv1w790aafjar7a5qbyz"; + sha256 = "0hzjhwij2x3b5fqwyd69h24ld13bpc2bf9wdcd1jy758waf0d91y"; }; wmClass = "jetbrains-phpstorm"; }; From 92383e669d1cfeb673128f33c7e5a00675176319 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Fri, 25 Nov 2016 14:20:29 +0100 Subject: [PATCH 137/149] idea.webstorm: 2016.3 -> 2016.3.1 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 8730dd834450..8c05026e7efe 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -288,12 +288,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2016.3"; + version = "2016.3.1"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "12jv8x7rq0cpvrbrb2l2x1p7is8511fx6ia79z5v3fnwxf17i3w5"; + sha256 = "10za4d6w9yns7kclbviizslq2y7zas9rkmvs3xwrfw1rdw2b69af"; }; wmClass = "jetbrains-webstorm"; }; From 8a424e3fbd30b54d73b91fa8841ac82d2af75a9a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 19 Nov 2016 15:12:42 +0100 Subject: [PATCH 138/149] tahoe service: use ExecStart instead of script Since only a single command is necessary to start Tahoe it is sufficient to use ExecStart and thereby skip starting up Bash (and leaving it running). --- .../services/network-filesystems/tahoe.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index f91827c379de..ab9eac3829fb 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -233,6 +233,12 @@ in serviceConfig = { Type = "simple"; PIDFile = pidfile; + # Believe it or not, Tahoe is very brittle about the order of + # arguments to $(tahoe start). The node directory must come first, + # and arguments which alter Twisted's behavior come afterwards. + ExecStart = '' + ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ''; }; preStart = '' if [ \! -d ${nodedir} ]; then @@ -248,12 +254,6 @@ in # ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg ''; - # Believe it or not, Tahoe is very brittle about the order of - # arguments to $(tahoe start). The node directory must come first, - # and arguments which alter Twisted's behavior come afterwards. - script = '' - tahoe start ${nodedir} -n -l- --pidfile=${pidfile} - ''; }); users.extraUsers = flip mapAttrs' cfg.introducers (node: _: nameValuePair "tahoe.introducer-${node}" { @@ -333,6 +333,12 @@ in serviceConfig = { Type = "simple"; PIDFile = pidfile; + # Believe it or not, Tahoe is very brittle about the order of + # arguments to $(tahoe start). The node directory must come first, + # and arguments which alter Twisted's behavior come afterwards. + ExecStart = '' + ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ''; }; preStart = '' if [ \! -d ${nodedir} ]; then @@ -348,12 +354,6 @@ in # ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg ''; - # Believe it or not, Tahoe is very brittle about the order of - # arguments to $(tahoe start). The node directory must come first, - # and arguments which alter Twisted's behavior come afterwards. - script = '' - tahoe start ${nodedir} -n -l- --pidfile=${pidfile} - ''; }); users.extraUsers = flip mapAttrs' cfg.nodes (node: _: nameValuePair "tahoe.${node}" { From c6b5131b0161f2df9cd6d79b5001537887fa68d7 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 25 Nov 2016 23:24:45 +0000 Subject: [PATCH 139/149] nixpkgs: icestorm 2016.08.18 -> 2016.11.01 Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 140ff48db55b..9bfd0123ef1d 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2016.08.18"; + version = "2016.11.01"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "12b2295c9087d94b75e374bb205ae4d76cf17e2f"; - sha256 = "1mmzlqvap6w8n4qzv3idvy51arkgn03692ssplwncy3akjrbsd2b"; + rev = "01b9822638d60e048c295d005257daa4c147761f"; + sha256 = "088wnf55m9ii98w8j7qc99spq95y19xw4fnnw9mxi7cfkxxggsls"; }; buildInputs = [ python3 libftdi ]; From a51378c4191aa76f909ac1826a5a963c8a6810a0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 25 Nov 2016 23:25:50 +0000 Subject: [PATCH 140/149] nixpkgs: yosys 2016.08.18 -> 2016.11.25 Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index c424003fcbb0..b91eddee3bfd 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2016.08.18"; + version = "2016.11.25"; srcs = [ (fetchFromGitHub { owner = "cliffordwolf"; repo = "yosys"; - rev = "9b8e06bee177f53c34a9dd6dd907a822f21659be"; - sha256 = "0x5c1bcayahn7pbgycxkxr6lkv9m0jpwfdlmyp2m9yzm2lpyw7dg"; + rev = "5c2c78e2dd12a860f830dafd73fbed8edf1a3823"; + sha256 = "1cvfkg0hllp7k2g52mxczd8d0ad7inlpkg27rrbyani2kg0066bk"; name = "yosys"; }) (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; - rev = "a2e5bc66a68a"; - sha256 = "09yvhj53af91nc54gmy7cbp7yljfcyj68a87494r5xvdfnsj11gy"; + rev = "238674cd44f2"; + sha256 = "18xk7lqai05am11zymixilgam4jvz5f2jwy9cgillz035man2yzw"; name = "yosys-abc"; }) ]; From fdbf7dc8b38cd523804d342d2c153dfeb10cc83d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 26 Nov 2016 02:52:41 +0100 Subject: [PATCH 141/149] gradm: fix using gradm while the RBAC system is active The built-in ACL prevents the gradm binary from loading dynamic libraries from the Nix store. Thus, once the RBAC system is activated, the gradm binary cannot be used. Fix by patching in rules to allow references to the Nix store where appropriate. --- pkgs/os-specific/linux/gradm/default.nix | 2 ++ .../linux/gradm/gradm_nix_store.patch | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/os-specific/linux/gradm/gradm_nix_store.patch diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 7f64ed227719..2beb07094697 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb"; }; + patches = [ ./gradm_nix_store.patch ]; + nativeBuildInputs = [ bison flex ]; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/gradm/gradm_nix_store.patch b/pkgs/os-specific/linux/gradm/gradm_nix_store.patch new file mode 100644 index 000000000000..c1b7047324b1 --- /dev/null +++ b/pkgs/os-specific/linux/gradm/gradm_nix_store.patch @@ -0,0 +1,31 @@ +diff -ruN a/gradm_adm.c b/gradm_adm.c +--- a/gradm_adm.c 2016-08-13 18:56:45.000000000 +0200 ++++ b/gradm_adm.c 2016-11-26 02:47:05.829718770 +0100 +@@ -166,6 +166,8 @@ + ADD_OBJ("/usr/libx32", "rx"); + ADD_OBJ("/lib64", "rx"); + ADD_OBJ("/usr/lib64", "rx"); ++ ADD_OBJ("/nix/store", "h"); ++ ADD_OBJ("/nix/store/*/lib", "rx"); + ADD_OBJ(gradm_name, "x"); + ADD_OBJ(grpam_path, "x"); + +@@ -286,6 +288,8 @@ + ADD_OBJ("/usr/lib32", "rx"); + ADD_OBJ("/lib64", "rx"); + ADD_OBJ("/usr/lib64", "rx"); ++ ADD_OBJ("/nix/store", "h"); ++ ADD_OBJ("/nix/store/*/lib", "rx"); + ADD_OBJ("/tmp", ""); + ADD_OBJ("/tmp/krb5cc_pam*", "rwcd"); + ADD_OBJ(grpam_path, "x"); +@@ -369,6 +373,9 @@ + ADD_OBJ("/lib", "rx"); + ADD_OBJ("/lib32", "rx"); + ADD_OBJ("/lib64", "rx"); ++ ADD_OBJ("/nix/store", "h"); ++ ADD_OBJ("/nix/store/*/bin", "rx"); ++ ADD_OBJ("/nix/store/*/lib", "rx"); + ADD_OBJ("/usr", "rx"); + ADD_OBJ("/proc", "r"); + ADD_OBJ("/boot", "h"); From b09435ea51caaae1865e667aaa32f7cba4cc4ff2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 26 Nov 2016 00:34:41 +0100 Subject: [PATCH 142/149] pythonPackages.magic-wormhole: enable tests --- .../python-modules/magic-wormhole/default.nix | 32 ++++++++++++------- pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 304476c26a8d..483e9aa3a3b9 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,7 +1,6 @@ -{ fetchurl, lib, buildPythonPackage, python, autobahn -, cffi, click, hkdf, pynacl, spake2, tqdm }: +{ stdenv, fetchurl, nettools, glibcLocales, pythonPackages }: -buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "magic-wormhole-${version}"; version = "0.8.1"; @@ -9,18 +8,29 @@ buildPythonPackage rec { url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz"; sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; }; - checkPhase = '' - ${python.interpreter} -m wormhole.test.run_trial wormhole + + buildInputs = [ nettools glibcLocales ]; + propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ]; + + patchPhase = '' + sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py + sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py + # XXX: disable one test due to warning: + # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py ''; - # Several test failures, network related. - doCheck = false; + checkPhase = '' + export PATH="$PATH:$out/bin" + export LANG="en_US.UTF-8" + export LC_ALL="en_US.UTF-8" + ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole + ''; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ]; - meta = { + meta = with stdenv.lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ asymmetric ]; + license = licenses.mit; + maintainers = with maintainers; [ asymmetric ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b94b6eeae50..0d19e2d77800 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26273,7 +26273,9 @@ in { }; }); - magic-wormhole = callPackage ../development/python-modules/magic-wormhole {}; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { + pythonPackages = self; + }; wsgiproxy2 = buildPythonPackage rec { name = "WSGIProxy2-0.4.2"; From 231cd277dfe22f41db82004410b7d9aff3cc3f68 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 26 Nov 2016 09:31:10 +0100 Subject: [PATCH 143/149] nvidia-x11: 367.57 -> 375.20 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 229865b49a31..69e4de69f9c9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "367.57"; + versionNumber = "375.20"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -30,12 +30,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1fw87nvbf8dmy7clwmm7jwp842c78mkz9bcb060wbihsywkfkm23"; + sha256 = "0da3mgfmkhs576wfkdmk8pbmvsksalkwz8a75vnhk0385fnd6yfc"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run"; - sha256 = "0lc87bgr29l9idhy2a4bsplkwx9r0dz9kjhcc5xq2xqkkyr5sqd1"; + sha256 = "02v20xns8w4flpllibc684g5yghi5dy28avsarccjyn5knhl03ni"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From e700ff6e0cace55f8e5a3f537fd4826274ca7dc0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 10:14:42 +0100 Subject: [PATCH 144/149] perl-bignum: 0.43 -> 0.44 Resolves CVE-2016-1238, see . --- 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 5ae95864232b..d944a3b7d308 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -649,10 +649,10 @@ let self = _self // overrides; _self = with self; { }; bignum = buildPerlPackage rec { - name = "bignum-0.43"; + name = "bignum-0.44"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "0610cb569fe51ceaa98991549192b54a09b5ebd9bd03aee39e7234f7c222366d"; + sha256 = "e32048bfc77788f1407e0b2bf54e0aba44d9e5e2743d2013b3afd6a630bed06f"; }; buildInputs = [ MathBigInt MathBigRat ]; meta = { From ba095feb530b02bfecd2f90951e7febfc955e55f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 10:25:12 +0100 Subject: [PATCH 145/149] perl-Data-Validate-IP: 0.26 -> 0.27 --- 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 d944a3b7d308..815a5ae37a5b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3072,10 +3072,10 @@ let self = _self // overrides; _self = with self; { }; DataValidateIP = buildPerlPackage rec { - name = "Data-Validate-IP-0.26"; + name = "Data-Validate-IP-0.27"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "d03190483f3ecec728c8e1b2e24989b7aed78ce3c989bea7dc6be0285d374690"; + sha256 = "e1aa92235dcb9c6fd9b6c8cda184d1af73537cc77f4f83a0f88207a8bfbfb7d6"; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ NetAddrIP ]; From 0637d949309ccab23de83a9f9da2d6d4b2f50178 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 10:25:26 +0100 Subject: [PATCH 146/149] perl-Digest-JHash: 0.09 -> 0.10 --- 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 815a5ae37a5b..7df7ddcaf1b7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3945,10 +3945,10 @@ let self = _self // overrides; _self = with self; { }; DigestJHash = buildPerlPackage rec { - name = "Digest-JHash-0.09"; + name = "Digest-JHash-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "ba77919b7b7a1b6f222f1bb5a7a34d88b1a92093e40a2aec37352cb38926ada3"; + sha256 = "c746cf0a861a004090263cd54d7728d0c7595a0cf90cbbfd8409b396ee3b0063"; }; meta = { description = "Perl extension for 32 bit Jenkins Hashing Algorithm"; From 088ff595e666f5d7e8c833d10ea78b0eea8477ae Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 10:25:47 +0100 Subject: [PATCH 147/149] perl-Math-BigInt: 1.999800 -> 1.999801 --- 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 7df7ddcaf1b7..7eb64c042788 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7778,10 +7778,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999800"; + name = "Math-BigInt-1.999801"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "216096d1f937252bfc449b1de01b760ffaab46e753e150cc2a685f4935bd030d"; + sha256 = "41deb23d453f5a376759fff155e4947988a6b6713a4164f21aedac8238089e57"; }; meta = { description = "Arbitrary size integer/float math package"; From ca77ba39bf7b5d16e69cb0d69e63aee9fe20176b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 10:26:02 +0100 Subject: [PATCH 148/149] perl-Test-Simple: 1.302062 -> 1.302067 --- 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 7eb64c042788..6688483914b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12901,10 +12901,10 @@ let self = _self // overrides; _self = with self; { TestSimple = null; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302062"; + name = "Test-Simple-1.302067"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "6729060d4ab12e2db3a3c6d6376ee6a9fb77c0ba0308b66919365a1e8bf156ea"; + sha256 = "4d43a1ed9cd43a5ad0e6cb206c0cd86d59f118ad6895220688d7bd918016b2a3"; }; meta = { description = "Basic utilities for writing tests"; From 8ebfce0eda627ffa739e16279ac543f4d50cd60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Nov 2016 11:18:01 +0100 Subject: [PATCH 149/149] display-managers module: improve variable quoting Fixes #20713, though I'm certain nixpkgs contains loads of places without proper quoting, as (ba)sh unfortunately encourages that. The only plus side is that most of such problems in nixpkgs aren't actually security problems but mere annoyance to those who are foolish enough to use "weird" characters in critical names. --- nixos/modules/services/x11/display-managers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index ce82af4ca68c..c8a1a2361f7f 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -82,12 +82,12 @@ let # Speed up application start by 50-150ms according to # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html - rm -rf $HOME/.compose-cache - mkdir $HOME/.compose-cache + rm -rf "$HOME/.compose-cache" + mkdir "$HOME/.compose-cache" # Work around KDE errors when a user first logs in and # .local/share doesn't exist yet. - mkdir -p $HOME/.local/share + mkdir -p "$HOME/.local/share" unset _DID_SYSTEMD_CAT @@ -148,7 +148,7 @@ let allowSubstitutes = false; } '' - mkdir -p $out + mkdir -p "$out" ${concatMapStrings (n: '' cat - > "$out/${n}.desktop" << EODESKTOP [Desktop Entry]